aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/macros/actionmacrohandler.cpp
diff options
context:
space:
mode:
authorhjk <[email protected]>2011-11-10 11:36:51 +0100
committerhjk <[email protected]>2011-11-10 15:57:09 +0100
commit82f5573626c8e952653c091eceed21ff23677834 (patch)
treeb4c884f581be2686495418c950c02c4fc3d09740 /src/plugins/macros/actionmacrohandler.cpp
parentcfc9b71ecb4b5f0d630996d4e60aea04cd8d5aad (diff)
more Id type fixes
Diffstat (limited to 'src/plugins/macros/actionmacrohandler.cpp')
-rw-r--r--src/plugins/macros/actionmacrohandler.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp
index 174a7300542..72bb8c494bd 100644
--- a/src/plugins/macros/actionmacrohandler.cpp
+++ b/src/plugins/macros/actionmacrohandler.cpp
@@ -89,7 +89,7 @@ bool ActionMacroHandler::executeEvent(const MacroEvent &macroEvent)
const Core::ICore *core = Core::ICore::instance();
const Core::ActionManager *am = core->actionManager();
- QAction *action = am->command(macroEvent.value(ACTIONNAME).toString())->action();
+ QAction *action = am->command(Core::Id(macroEvent.value(ACTIONNAME).toString()))->action();
if (!action)
return false;
@@ -104,7 +104,7 @@ void ActionMacroHandler::addActionEvent(const QString &id)
const Core::ICore *core = Core::ICore::instance();
const Core::ActionManager *am = core->actionManager();
- const Core::Command *cmd = am->command(id);
+ const Core::Command *cmd = am->command(Core::Id(id));
if (cmd->isScriptable(cmd->context())) {
MacroEvent e;
e.setId(EVENTNAME);
@@ -119,13 +119,13 @@ void ActionMacroHandler::registerCommand(const QString &id)
m_commandIds.insert(id);
const Core::ICore *core = Core::ICore::instance();
const Core::ActionManager *am = core->actionManager();
- QAction* action = am->command(id)->action();
+ QAction* action = am->command(Core::Id(id))->action();
if (action) {
connect(action, SIGNAL(triggered()), m_mapper, SLOT(map()));
m_mapper->setMapping(action, id);
return;
}
- QShortcut* shortcut = am->command(id)->shortcut();
+ QShortcut* shortcut = am->command(Core::Id(id))->shortcut();
if (shortcut) {
connect(shortcut, SIGNAL(activated()), m_mapper, SLOT(map()));
m_mapper->setMapping(shortcut, id);
@@ -137,6 +137,6 @@ void ActionMacroHandler::addCommand(const QString &id)
{
const Core::ICore *core = Core::ICore::instance();
const Core::ActionManager *am = core->actionManager();
- if (am->command(id)->isScriptable())
+ if (am->command(Core::Id(id))->isScriptable())
registerCommand(id);
}