Use Id::fromString instead of the constructor.

Change-Id: Ie18714ac2872a085e8c20d445472901cc9f6b6c5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

2 files changed, 9 insertions, 6 deletions

diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp
index 32caf7a2bd..5dc19cb88a 100644
--- a/src/plugins/macros/macromanager.cpp
+++ b/src/plugins/macros/macromanager.cpp
@@ -155,14 +155,18 @@ void MacroManager::MacroManagerPrivate::initialize()
     }
 }
 
+static Core::Id makeId(const QString &name)
+{
+    return Core::Id::fromString(QLatin1String(Constants::PREFIX_MACRO) + name);
+}
+
 void MacroManager::MacroManagerPrivate::addMacro(Macro *macro)
 {
     // Add sortcut
     Core::Context context(TextEditor::Constants::C_TEXTEDITOR);
     QShortcut *shortcut = new QShortcut(Core::ICore::mainWindow());
     shortcut->setWhatsThis(macro->description());
-    const Core::Id macroId(QLatin1String(Constants::PREFIX_MACRO) + macro->displayName());
-    Core::ActionManager::registerShortcut(shortcut, macroId, context);
+    Core::ActionManager::registerShortcut(shortcut, makeId(macro->displayName()), context);
     connect(shortcut, SIGNAL(activated()), mapper, SLOT(map()));
     mapper->setMapping(shortcut, macro->displayName());
 
@@ -175,7 +179,7 @@ void MacroManager::MacroManagerPrivate::removeMacro(const QString &name)
     if (!macros.contains(name))
         return;
     // Remove shortcut
-    Core::ActionManager::unregisterShortcut(Core::Id(QLatin1String(Constants::PREFIX_MACRO) + name));
+    Core::ActionManager::unregisterShortcut(makeId(name));
 
     // Remove macro from the map
     Macro *macro = macros.take(name);
@@ -190,8 +194,7 @@ void MacroManager::MacroManagerPrivate::changeMacroDescription(Macro *macro, con
     macro->save(macro->fileName(), Core::ICore::mainWindow());
 
     // Change shortcut what's this
-    Core::Command *command = Core::ActionManager::command(
-                Core::Id(QLatin1String(Constants::PREFIX_MACRO)+macro->displayName()));
+    Core::Command *command = Core::ActionManager::command(makeId(macro->displayName()));
     if (command && command->shortcut())
         command->shortcut()->setWhatsThis(description);
 }
diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp
index 267d6e1cd0..31847a1974 100644
--- a/src/plugins/macros/macrooptionswidget.cpp
+++ b/src/plugins/macros/macrooptionswidget.cpp
@@ -111,7 +111,7 @@ void MacroOptionsWidget::createTable()
             macroItem->setData(0, WRITE_ROLE, it.value()->isWritable());
 
             Core::Command *command =
-                    Core::ActionManager::command(Core::Id(QLatin1String(Constants::PREFIX_MACRO)
+                    Core::ActionManager::command(Core::Id::fromString(QLatin1String(Constants::PREFIX_MACRO)
                                                           + it.value()->displayName()));
             if (command && command->shortcut())
                 macroItem->setText(2, command->shortcut()->key().toString());