diff --git a/CommandPlugin.cpp b/CommandPlugin.cpp index 6b11c2b..c4b84c0 100644 --- a/CommandPlugin.cpp +++ b/CommandPlugin.cpp @@ -4,7 +4,7 @@ CommandPlugin *CommandPlugin::instance = nullptr; -std::shared_ptr CommandPlugin::GetKernel() +std::unique_ptr CommandPlugin::CreateKernel() { return nullptr; } diff --git a/CommandPlugin.hpp b/CommandPlugin.hpp index e44e767..ec926ae 100644 --- a/CommandPlugin.hpp +++ b/CommandPlugin.hpp @@ -35,7 +35,7 @@ class CommandPlugin }; } // - std::shared_ptr GetKernel() override; + std::unique_ptr CreateKernel() override; std::shared_ptr GetSerializer() override; std::shared_ptr GetEventHandler() override; std::unique_ptr GetEditorWidget(UI_TYPE) override; diff --git a/core/EventHandler.cpp b/core/EventHandler.cpp index 0aabd9f..f773811 100644 --- a/core/EventHandler.cpp +++ b/core/EventHandler.cpp @@ -20,22 +20,22 @@ QvPlugin_EventHandler(SimpleEventHandler, Connectivity) QStringList actions; switch (pluginEvent.eventType) { - case Events::Connectivity::QvConnecticity_Connected: + case Events::Connectivity::Connected: { actions << settings.afterConnection.split(QRegExp("[\r\n]"), QString::SkipEmptyParts); break; } - case Events::Connectivity::QvConnecticity_Connecting: + case Events::Connectivity::Connecting: { actions << settings.beforeConnection.split(QRegExp("[\r\n]"), QString::SkipEmptyParts); break; } - case Events::Connectivity::QvConnecticity_Disconnected: + case Events::Connectivity::Disconnected: { actions << settings.afterDisConnection.split(QRegExp("[\r\n]"), QString::SkipEmptyParts); break; } - case Events::Connectivity::QvConnecticity_Disconnecting: + case Events::Connectivity::Disconnecting: { actions << settings.beforeDisConnection.split(QRegExp("[\r\n]"), QString::SkipEmptyParts); break; @@ -76,12 +76,12 @@ QvPlugin_EventHandler(SimpleEventHandler, SystemProxy) QStringList actions; switch (pluginEvent.systemProxyState) { - case Events::SystemProxy::SystemProxyState_SetProxy: + case Events::SystemProxy::SetProxy: { actions << settings.setSystemProxy.split(QRegExp("[\r\n]"), QString::SkipEmptyParts); break; } - case Events::SystemProxy::SystemProxyState_ClearProxy: + case Events::SystemProxy::ClearProxy: { actions << settings.clearSystemProxy.split(QRegExp("[\r\n]"), QString::SkipEmptyParts); break; @@ -119,26 +119,31 @@ QvPlugin_EventHandler(SimpleEventHandler, ConnectionEntry) QStringList actions; switch (pluginEvent.eventType) { - case Events::ConnectionEntry::ConnectionEvent_Created: + case Events::ConnectionEntry::Created: { actions << settings.connectionCreated.split(QRegExp("[\r\n]"), QString::SkipEmptyParts); break; } - case Events::ConnectionEntry::ConnectionEvent_Deleted: + case Events::ConnectionEntry::FullyRemoved: + case Events::ConnectionEntry::RemovedFromGroup: { actions << settings.connectionDeleted.split(QRegExp("[\r\n]"), QString::SkipEmptyParts); break; } - case Events::ConnectionEntry::ConnectionEvent_Renamed: + case Events::ConnectionEntry::Renamed: { actions << settings.connectionRenamed.split(QRegExp("[\r\n]"), QString::SkipEmptyParts); break; } - case Events::ConnectionEntry::ConnectionEvent_Updated: + case Events::ConnectionEntry::Edited: { actions << settings.connectionUpdated.split(QRegExp("[\r\n]"), QString::SkipEmptyParts); break; } + case Events::ConnectionEntry::LinkedWithGroup: + { + break; + } } for (const auto &action : actions) { diff --git a/interface b/interface index d37c7ea..4dc6f64 160000 --- a/interface +++ b/interface @@ -1 +1 @@ -Subproject commit d37c7ea9459956dc459610e98b821d4a790cb6e8 +Subproject commit 4dc6f64ecee55729f017e0b2dd82170476aa6886