diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index 5508254919c..274d14e0f65 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -254,7 +254,7 @@ Command *ActionManager::registerAction(QAction *action, Id id, const Context &co if (a) { a->addOverrideAction(action, context, scriptable); emit m_instance->commandListChanged(); - emit m_instance->commandAdded(id.toString()); + emit m_instance->commandAdded(id); } return a; } diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h index 3f83b81018b..3f0dc846e4c 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager.h @@ -73,7 +73,7 @@ public: signals: void commandListChanged(); - void commandAdded(const QString &id); + void commandAdded(Core::Id id); private: ActionManager(QObject *parent = 0); diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp index 8c3c0f194d2..a6bbde5cc9d 100644 --- a/src/plugins/macros/actionmacrohandler.cpp +++ b/src/plugins/macros/actionmacrohandler.cpp @@ -59,8 +59,8 @@ ActionMacroHandler::ActionMacroHandler(): connect(m_mapper, SIGNAL(mapped(QString)), this, SLOT(addActionEvent(QString))); - connect(ActionManager::instance(), SIGNAL(commandAdded(QString)), - this, SLOT(addCommand(QString))); + connect(ActionManager::instance(), &ActionManager::commandAdded, + this, &ActionMacroHandler::addCommand); // Register all existing scriptable actions QList commands = ActionManager::commands(); @@ -113,9 +113,8 @@ void ActionMacroHandler::registerCommand(Id id) } } -void ActionMacroHandler::addCommand(const QString &name) +void ActionMacroHandler::addCommand(Id id) { - const Id id = Id::fromString(name); const Command *command = ActionManager::command(id); if (command->isScriptable()) registerCommand(id); diff --git a/src/plugins/macros/actionmacrohandler.h b/src/plugins/macros/actionmacrohandler.h index 4e83525a90e..7af20c3dc00 100644 --- a/src/plugins/macros/actionmacrohandler.h +++ b/src/plugins/macros/actionmacrohandler.h @@ -55,13 +55,13 @@ public: bool canExecuteEvent(const MacroEvent ¯oEvent); bool executeEvent(const MacroEvent ¯oEvent); +private slots: + void addActionEvent(const QString &id); + private: void registerCommand(Core::Id id); Core::Command *command(const QString &id); - -private slots: - void addCommand(const QString &id); - void addActionEvent(const QString &id); + void addCommand(Core::Id id); private: QSet m_commandIds;