Core::Id: Remove some explicit casts to Core::Id

Change-Id: Ibe505c8331f7d1280fdb8784a00321742f5d94cb
Reviewed-by: hjk <hjk121@nokiamail.com>

40 files changed, 170 insertions, 178 deletions

diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp
index c9cb400645..b36b8b416d 100644
--- a/src/plugins/analyzerbase/analyzermanager.cpp
+++ b/src/plugins/analyzerbase/analyzermanager.cpp
@@ -288,19 +288,19 @@ void AnalyzerManagerPrivate::delayedInit()
     Context analyzerContext(C_ANALYZEMODE);
     ActionContainer *viewsMenu = Core::ActionManager::actionContainer(Id(M_WINDOW_VIEWS));
     Command *cmd = Core::ActionManager::registerAction(m_mainWindow->menuSeparator1(),
-        Id("Analyzer.Views.Separator1"), analyzerContext);
+        "Analyzer.Views.Separator1", analyzerContext);
     cmd->setAttribute(Command::CA_Hide);
     viewsMenu->addAction(cmd, G_DEFAULT_THREE);
     cmd = Core::ActionManager::registerAction(m_mainWindow->toggleLockedAction(),
-        Id("Analyzer.Views.ToggleLocked"), analyzerContext);
+        "Analyzer.Views.ToggleLocked", analyzerContext);
     cmd->setAttribute(Command::CA_Hide);
     viewsMenu->addAction(cmd, G_DEFAULT_THREE);
     cmd = Core::ActionManager::registerAction(m_mainWindow->menuSeparator2(),
-        Id("Analyzer.Views.Separator2"), analyzerContext);
+        "Analyzer.Views.Separator2", analyzerContext);
     cmd->setAttribute(Command::CA_Hide);
     viewsMenu->addAction(cmd, G_DEFAULT_THREE);
     cmd = Core::ActionManager::registerAction(m_mainWindow->resetLayoutAction(),
-        Id("Analyzer.Views.ResetSimple"), analyzerContext);
+        "Analyzer.Views.ResetSimple", analyzerContext);
     cmd->setAttribute(Command::CA_Hide);
     viewsMenu->addAction(cmd, G_DEFAULT_THREE);
 }
diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp
index cedcf1542d..5500625761 100644
--- a/src/plugins/bookmarks/bookmarkmanager.cpp
+++ b/src/plugins/bookmarks/bookmarkmanager.cpp
@@ -888,7 +888,7 @@ int BookmarkViewFactory::priority() const
 
 Id BookmarkViewFactory::id() const
 {
-    return Id("Bookmarks");
+    return "Bookmarks";
 }
 
 QKeySequence BookmarkViewFactory::activationSequence() const
diff --git a/src/plugins/classview/classviewnavigationwidgetfactory.cpp b/src/plugins/classview/classviewnavigationwidgetfactory.cpp
index b85a9213c6..39f8b15afb 100644
--- a/src/plugins/classview/classviewnavigationwidgetfactory.cpp
+++ b/src/plugins/classview/classviewnavigationwidgetfactory.cpp
@@ -89,7 +89,7 @@ int NavigationWidgetFactory::priority() const
 
 Core::Id NavigationWidgetFactory::id() const
 {
-    return Core::Id("Class View");
+    return "Class View";
 }
 
 QKeySequence NavigationWidgetFactory::activationSequence() const
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index cc05999661..b58c88499e 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -207,7 +207,7 @@ bool CMakeProject::parseCMakeLists()
     CMakeBuildConfiguration *activeBC = static_cast<CMakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration());
     foreach (Core::IDocument *document, Core::EditorManager::documentModel()->openedDocuments())
         if (isProjectFile(document->filePath()))
-            document->infoBar()->removeInfo(Core::Id("CMakeEditor.RunCMake"));
+            document->infoBar()->removeInfo("CMakeEditor.RunCMake");
 
     // Find cbp file
     QString cbpFile = CMakeManager::findCbpFile(activeBC->buildDirectory().toString());
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
index e869482903..9d73aea3f4 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
@@ -237,9 +237,9 @@ int OpenEditorsViewFactory::priority() const
     return 200;
 }
 
-Core::Id OpenEditorsViewFactory::id() const
+Id OpenEditorsViewFactory::id() const
 {
-    return Core::Id("Open Documents");
+    return "Open Documents";
 }
 
 QKeySequence OpenEditorsViewFactory::activationSequence() const
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.h b/src/plugins/coreplugin/editormanager/openeditorsview.h
index f4dade594d..311080f463 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.h
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.h
@@ -113,7 +113,7 @@ public:
     ~OpenEditorsViewFactory();
     QString displayName() const;
     int priority() const;
-    Core::Id id() const;
+    Id id() const;
     QKeySequence activationSequence() const;
     Core::NavigationView createWidget();
 };
diff --git a/src/plugins/coreplugin/editormanager/systemeditor.cpp b/src/plugins/coreplugin/editormanager/systemeditor.cpp
index f2424f359c..ef9cb8fec9 100644
--- a/src/plugins/coreplugin/editormanager/systemeditor.cpp
+++ b/src/plugins/coreplugin/editormanager/systemeditor.cpp
@@ -49,7 +49,7 @@ QStringList SystemEditor::mimeTypes() const
 
 Id SystemEditor::id() const
 {
-    return Id("CorePlugin.OpenWithSystemEditor");
+    return "CorePlugin.OpenWithSystemEditor";
 }
 
 QString SystemEditor::displayName() const
diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp
index 67e5ef8e02..2cd7cf88c6 100644
--- a/src/plugins/coreplugin/externaltool.cpp
+++ b/src/plugins/coreplugin/externaltool.cpp
@@ -805,7 +805,7 @@ void ExternalToolManager::setToolsByCategory(const QMap<QString, QList<Internal:
     }
     qDeleteAll(m_tools);
     QMapIterator<QString, QAction *> remainingActions(m_actions);
-    const Id externalToolsPrefix = Id("Tools.External.");
+    const Id externalToolsPrefix = "Tools.External.";
     while (remainingActions.hasNext()) {
         remainingActions.next();
         ActionManager::unregisterAction(remainingActions.value(),
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index d619077181..180e42dc10 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -348,7 +348,7 @@ void NavigationWidget::restoreSettings(QSettings *settings)
 
     if (d->m_subWidgets.isEmpty())
         // Make sure we have at least the projects widget
-        insertSubItem(0, qMax(0, factoryIndex(Id("Projects"))));
+        insertSubItem(0, qMax(0, factoryIndex("Projects")));
 
     setShown(settings->value(QLatin1String("Navigation/Visible"), true).toBool());
 
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index cd105414ca..2d3a647825 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -242,7 +242,7 @@ void OutputPaneManager::init()
     const int n = m_panes.size();
 
     int shortcutNumber = 1;
-    const Id baseId = Id("QtCreator.Pane.");
+    const Id baseId = "QtCreator.Pane.";
     for (int i = 0; i != n; ++i) {
         IOutputPane *outPane = m_panes.at(i);
         const int idx = m_outputWidgetPane->addWidget(outPane->outputWidget(this));
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
index 24bbd6a245..70265d4d5f 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
@@ -334,7 +334,7 @@ void ProgressManagerPrivate::init()
     p.fill(Qt::transparent);
     toggleProgressView->setIcon(QIcon(p));
     Command *cmd = ActionManager::registerAction(toggleProgressView,
-                                                 Id("QtCreator.ToggleProgressDetails"),
+                                                 "QtCreator.ToggleProgressDetails",
                                                  Context(Constants::C_GLOBAL));
     cmd->setDefaultKeySequence(QKeySequence(Utils::HostOsInfo::isMacHost()
                                                ? tr("Ctrl+Shift+0")
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index aa4313fd61..48af5c1c0b 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -155,7 +155,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMe
         Core::ActionManager::actionContainer(Core::Constants::M_TOOLS);
 
     Core::ActionContainer *cpContainer =
-        Core::ActionManager::createMenu(Core::Id("CodePaster"));
+        Core::ActionManager::createMenu("CodePaster");
     cpContainer->menu()->setTitle(tr("&Code Pasting"));
     toolsContainer->addMenu(cpContainer);
 
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 2795368e29..076a9159c2 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -322,25 +322,24 @@ void DebuggerMainWindowPrivate::createViewsMenuItems()
     // Add menu items
     Command *cmd = 0;
     cmd = Core::ActionManager::registerAction(openMemoryEditorAction,
-        Core::Id("Debugger.Views.OpenMemoryEditor"),
-        debugcontext);
+        "Debugger.Views.OpenMemoryEditor", debugcontext);
     cmd->setAttribute(Command::CA_Hide);
     m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
 
     cmd = Core::ActionManager::registerAction(q->menuSeparator1(),
-        Core::Id("Debugger.Views.Separator1"), debugcontext);
+        "Debugger.Views.Separator1", debugcontext);
     cmd->setAttribute(Command::CA_Hide);
     m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
     cmd = Core::ActionManager::registerAction(q->toggleLockedAction(),
-        Core::Id("Debugger.Views.ToggleLocked"), debugcontext);
+        "Debugger.Views.ToggleLocked", debugcontext);
     cmd->setAttribute(Command::CA_Hide);
     m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
     cmd = Core::ActionManager::registerAction(q->menuSeparator2(),
-        Core::Id("Debugger.Views.Separator2"), debugcontext);
+        "Debugger.Views.Separator2", debugcontext);
     cmd->setAttribute(Command::CA_Hide);
     m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
     cmd = Core::ActionManager::registerAction(q->resetLayoutAction(),
-        Core::Id("Debugger.Views.ResetSimple"), debugcontext);
+        "Debugger.Views.ResetSimple", debugcontext);
     cmd->setAttribute(Command::CA_Hide);
     m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
 }
diff --git a/src/plugins/debugger/lldblib/lldboptionspage.cpp b/src/plugins/debugger/lldblib/lldboptionspage.cpp
index e774b9581f..5ce79b33ad 100644
--- a/src/plugins/debugger/lldblib/lldboptionspage.cpp
+++ b/src/plugins/debugger/lldblib/lldboptionspage.cpp
@@ -70,7 +70,7 @@ void LldbOptionsPageWidget::load()
 LldbOptionsPage::LldbOptionsPage()
 {
     //    m_options->fromSettings(Core::ICore::settings());
-    setId(Core::Id("F.Lldb"));
+    setId("F.Lldb");
     setDisplayName(tr("LLDB"));
     setCategory(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY);
     setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY));
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 554774e6cc..869fe3faed 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -423,7 +423,7 @@ void FormEditorW::setupActions()
     // the 'Delete' key by event filter. Setting a shortcut triggers
     // buggy behaviour on Mac (Pressing Delete in QLineEdit removing the widget).
     Command *command;
-    command = ActionManager::registerAction(m_fwm->actionDelete(), Id("FormEditor.Edit.Delete"), m_contexts);
+    command = ActionManager::registerAction(m_fwm->actionDelete(), "FormEditor.Edit.Delete", m_contexts);
     bindShortcut(command, m_fwm->actionDelete());
     command->setAttribute(Command::CA_Hide);
     medit->addAction(command, Core::Constants::G_EDIT_COPYPASTE);
@@ -434,74 +434,71 @@ void FormEditorW::setupActions()
 
     medit->addSeparator(m_contexts, Core::Constants::G_EDIT_OTHER);
 
-    m_toolActionIds.push_back(Id("FormEditor.WidgetEditor"));
+    m_toolActionIds.push_back("FormEditor.WidgetEditor");
     createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
                          tr("Edit Widgets"), m_toolActionIds.back(),
                          EditModeWidgetEditor, QLatin1String("widgettool.png"), tr("F3"));
 
-    m_toolActionIds.push_back(Id("FormEditor.SignalsSlotsEditor"));
+    m_toolActionIds.push_back("FormEditor.SignalsSlotsEditor");
     createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
                          tr("Edit Signals/Slots"), m_toolActionIds.back(),
                          EditModeSignalsSlotEditor, QLatin1String("signalslottool.png"), tr("F4"));
 
-    m_toolActionIds.push_back(Id("FormEditor.BuddyEditor"));
+    m_toolActionIds.push_back("FormEditor.BuddyEditor");
     createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
                          tr("Edit Buddies"), m_toolActionIds.back(),
                          EditModeBuddyEditor, QLatin1String("buddytool.png"));
 
-    m_toolActionIds.push_back(Id("FormEditor.TabOrderEditor"));
+    m_toolActionIds.push_back("FormEditor.TabOrderEditor");
     createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
                          tr("Edit Tab Order"),  m_toolActionIds.back(),
                          EditModeTabOrderEditor, QLatin1String("tabordertool.png"));
 
     //tool actions
-    m_toolActionIds.push_back(Id("FormEditor.LayoutHorizontally"));
+    m_toolActionIds.push_back("FormEditor.LayoutHorizontally");
     const QString horizLayoutShortcut = UseMacShortcuts ? tr("Meta+Shift+H") : tr("Ctrl+H");
     addToolAction(m_fwm->actionHorizontalLayout(), m_contexts,
                   m_toolActionIds.back(), mformtools, horizLayoutShortcut);
 
-    m_toolActionIds.push_back(Id("FormEditor.LayoutVertically"));
+    m_toolActionIds.push_back("FormEditor.LayoutVertically");
     const QString vertLayoutShortcut = UseMacShortcuts ? tr("Meta+L") : tr("Ctrl+L");
     addToolAction(m_fwm->actionVerticalLayout(), m_contexts,
                   m_toolActionIds.back(),  mformtools, vertLayoutShortcut);
 
-    m_toolActionIds.push_back(Id("FormEditor.SplitHorizontal"));
+    m_toolActionIds.push_back("FormEditor.SplitHorizontal");
     addToolAction(m_fwm->actionSplitHorizontal(), m_contexts,
                   m_toolActionIds.back(), mformtools);
 
-    m_toolActionIds.push_back(Id("FormEditor.SplitVertical"));
+    m_toolActionIds.push_back("FormEditor.SplitVertical");
     addToolAction(m_fwm->actionSplitVertical(), m_contexts,
                   m_toolActionIds.back(), mformtools);
 
-    m_toolActionIds.push_back(Id("FormEditor.LayoutForm"));
+    m_toolActionIds.push_back("FormEditor.LayoutForm");
     addToolAction(m_fwm->actionFormLayout(), m_contexts,
                   m_toolActionIds.back(),  mformtools);
 
-    m_toolActionIds.push_back(Id("FormEditor.LayoutGrid"));
+    m_toolActionIds.push_back("FormEditor.LayoutGrid");
     const QString gridShortcut = UseMacShortcuts ? tr("Meta+Shift+G") : tr("Ctrl+G");
     addToolAction(m_fwm->actionGridLayout(), m_contexts,
                   m_toolActionIds.back(),  mformtools, gridShortcut);
 
-    m_toolActionIds.push_back(Id("FormEditor.LayoutBreak"));
+    m_toolActionIds.push_back("FormEditor.LayoutBreak");
     addToolAction(m_fwm->actionBreakLayout(), m_contexts,
                   m_toolActionIds.back(), mformtools);
 
-    m_toolActionIds.push_back(Id("FormEditor.LayoutAdjustSize"));
+    m_toolActionIds.push_back("FormEditor.LayoutAdjustSize");
     const QString adjustShortcut = UseMacShortcuts ? tr("Meta+J") : tr("Ctrl+J");
     addToolAction(m_fwm->actionAdjustSize(), m_contexts,
                   m_toolActionIds.back(),  mformtools, adjustShortcut);
 
-    m_toolActionIds.push_back(Id("FormEditor.SimplifyLayout"));
+    m_toolActionIds.push_back("FormEditor.SimplifyLayout");
     addToolAction(m_fwm->actionSimplifyLayout(), m_contexts,
                   m_toolActionIds.back(),  mformtools);
 
     mformtools->addSeparator(m_contexts);
 
-    addToolAction(m_fwm->actionLower(), m_contexts,
-                  Id("FormEditor.Lower"), mformtools);
-
-    addToolAction(m_fwm->actionRaise(), m_contexts,
-                  Id("FormEditor.Raise"), mformtools);
+    addToolAction(m_fwm->actionLower(), m_contexts, "FormEditor.Lower", mformtools);
+    addToolAction(m_fwm->actionRaise(), m_contexts, "FormEditor.Raise", mformtools);
 
     // Commands that do not go into the editor toolbar
     mformtools->addSeparator(m_contexts);
@@ -512,8 +509,7 @@ void FormEditorW::setupActions()
     m_actionPreview = m_fwm->actionDefaultPreview();
 #endif
     QTC_ASSERT(m_actionPreview, return);
-    addToolAction(m_actionPreview, m_contexts,
-                   Id("FormEditor.Preview"), mformtools, tr("Alt+Shift+R"));
+    addToolAction(m_actionPreview, m_contexts, "FormEditor.Preview", mformtools, tr("Alt+Shift+R"));
 
     // Preview in style...
 #if QT_VERSION >= 0x050000
@@ -538,8 +534,7 @@ void FormEditorW::setupActions()
     // Switch form/source in editor/design contexts.
     Context switchContexts = m_contexts;
     switchContexts.add(Core::Constants::C_EDITORMANAGER);
-    addToolAction(m_actionSwitchSource, switchContexts, Id("FormEditor.FormSwitchSource"), mformtools,
-                  tr("Shift+F4"));
+    addToolAction(m_actionSwitchSource, switchContexts, "FormEditor.FormSwitchSource", mformtools, tr("Shift+F4"));
 
     mformtools->addSeparator(m_contexts);
 #if QT_VERSION >= 0x050000
@@ -547,13 +542,12 @@ void FormEditorW::setupActions()
 #else
     QAction *actionFormSettings = m_fwm->actionShowFormWindowSettingsDialog();
 #endif
-    addToolAction(actionFormSettings, m_contexts, Id("FormEditor.FormSettings"), mformtools);
+    addToolAction(actionFormSettings, m_contexts, "FormEditor.FormSettings", mformtools);
 
     mformtools->addSeparator(m_contexts);
     m_actionAboutPlugins = new QAction(tr("About Qt Designer Plugins..."), this);
     m_actionAboutPlugins->setMenuRole(QAction::NoRole);
-    addToolAction(m_actionAboutPlugins, m_contexts,
-                   Id("FormEditor.AboutPlugins"), mformtools);
+    addToolAction(m_actionAboutPlugins, m_contexts, "FormEditor.AboutPlugins", mformtools);
     connect(m_actionAboutPlugins,  SIGNAL(triggered()), m_fwm,
 #if QT_VERSION >= 0x050000
             SLOT(showPluginDialog())
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index ab3bc866ed..a0a8c16846 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -1087,7 +1087,7 @@ bool FakeVimPluginPrivate::initialize()
         ActionManager::actionContainer(Core::Constants::M_EDIT_ADVANCED);
     advancedMenu->addAction(cmd, Core::Constants::G_EDIT_EDITOR);
 
-    const Id base = Id("FakeVim.UserAction");
+    const Id base = "FakeVim.UserAction";
     for (int i = 1; i < 10; ++i) {
         QAction *act = new QAction(this);
         act->setText(tr("Execute User Action #%1").arg(i));
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 35d8e89fe2..05a0f5f0fb 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -309,27 +309,27 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     m_menuAction = gitContainer->menu()->menuAction();
 
     /*  "Current File" menu */
-    Core::ActionContainer *currentFileMenu = Core::ActionManager::createMenu(Core::Id("Git.CurrentFileMenu"));
+    Core::ActionContainer *currentFileMenu = Core::ActionManager::createMenu("Git.CurrentFileMenu");
     currentFileMenu->menu()->setTitle(tr("Current &File"));
     gitContainer->addMenu(currentFileMenu);
 
     ParameterActionCommandPair parameterActionCommand
             = createFileAction(currentFileMenu,
                                tr("Diff Current File"), tr("Diff of \"%1\""),
-                               Core::Id("Git.Diff"), globalcontext, true,
+                               "Git.Diff", globalcontext, true,
                                SLOT(diffCurrentFile()));
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+D") : tr("Alt+G,Alt+D")));
 
     parameterActionCommand
             = createFileAction(currentFileMenu,
                                tr("Log Current File"), tr("Log of \"%1\""),
-                               Core::Id("Git.Log"), globalcontext, true, SLOT(logFile()));
+                               "Git.Log", globalcontext, true, SLOT(logFile()));
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+L") : tr("Alt+G,Alt+L")));
 
     parameterActionCommand
                 = createFileAction(currentFileMenu,
                                    tr("Blame Current File"), tr("Blame for \"%1\""),
-                                   Core::Id("Git.Blame"),
+                                   "Git.Blame",
                                    globalcontext, true, SLOT(blameFile()));
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+B") : tr("Alt+G,Alt+B")));
 
@@ -339,24 +339,24 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     parameterActionCommand
             = createFileAction(currentFileMenu,
                                tr("Stage File for Commit"), tr("Stage \"%1\" for Commit"),
-                               Core::Id("Git.Stage"), globalcontext, true, SLOT(stageFile()));
+                               "Git.Stage", globalcontext, true, SLOT(stageFile()));
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+A") : tr("Alt+G,Alt+A")));
 
     parameterActionCommand
             = createFileAction(currentFileMenu,
                                tr("Unstage File from Commit"), tr("Unstage \"%1\" from Commit"),
-                               Core::Id("Git.Unstage"), globalcontext, true, SLOT(unstageFile()));
+                               "Git.Unstage", globalcontext, true, SLOT(unstageFile()));
 
     parameterActionCommand
             = createFileAction(currentFileMenu,
                                tr("Undo Unstaged Changes"), tr("Undo Unstaged Changes for \"%1\""),
-                               Core::Id("Git.UndoUnstaged"), globalcontext,
+                               "Git.UndoUnstaged", globalcontext,
                                true, SLOT(undoUnstagedFileChanges()));
 
     parameterActionCommand
             = createFileAction(currentFileMenu,
                                tr("Undo Uncommitted Changes"), tr("Undo Uncommitted Changes for \"%1\""),
-                               Core::Id("Git.Undo"), globalcontext,
+                               "Git.Undo", globalcontext,
                                true, SLOT(undoFileChanges()));
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+U") : tr("Alt+G,Alt+U")));
 
@@ -365,29 +365,28 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     // ------------
 
     /*  "Current Project" menu */
-    Core::ActionContainer *currentProjectMenu = Core::ActionManager::createMenu(Core::Id("Git.CurrentProjectMenu"));
+    Core::ActionContainer *currentProjectMenu = Core::ActionManager::createMenu("Git.CurrentProjectMenu");
     currentProjectMenu->menu()->setTitle(tr("Current &Project"));
     gitContainer->addMenu(currentProjectMenu);
 
     parameterActionCommand
             = createProjectAction(currentProjectMenu,
                                   tr("Diff Current Project"), tr("Diff Project \"%1\""),
-                                  Core::Id("Git.DiffProject"),
-                                  globalcontext, true,
+                                  "Git.DiffProject", globalcontext, true,
                                   SLOT(diffCurrentProject()));
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+Shift+D") : tr("Alt+G,Alt+Shift+D")));
 
     parameterActionCommand
             = createProjectAction(currentProjectMenu,
                                   tr("Log Project"), tr("Log Project \"%1\""),
-                                  Core::Id("Git.LogProject"), globalcontext, true,
+                                  "Git.LogProject", globalcontext, true,
                                   SLOT(logProject()));
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+K") : tr("Alt+G,Alt+K")));
 
     parameterActionCommand
                 = createProjectAction(currentProjectMenu,
                                       tr("Clean Project..."), tr("Clean Project \"%1\"..."),
-                                      Core::Id("Git.CleanProject"), globalcontext,
+                                      "Git.CleanProject", globalcontext,
                                       true, SLOT(cleanProject()));
 
     /* \"Current Project" menu */
@@ -395,111 +394,111 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     // --------------
 
     /*  "Local Repository" menu */
-    Core::ActionContainer *localRepositoryMenu = Core::ActionManager::createMenu(Core::Id("Git.LocalRepositoryMenu"));
+    Core::ActionContainer *localRepositoryMenu = Core::ActionManager::createMenu("Git.LocalRepositoryMenu");
     localRepositoryMenu->menu()->setTitle(tr("&Local Repository"));
     gitContainer->addMenu(localRepositoryMenu);
 
     createRepositoryAction(localRepositoryMenu,
-                           tr("Diff"), Core::Id("Git.DiffRepository"),
+                           tr("Diff"), "Git.DiffRepository",
                            globalcontext, true, SLOT(diffRepository()));
 
     createRepositoryAction(localRepositoryMenu,
-                           tr("Log"), Core::Id("Git.LogRepository"),
+                           tr("Log"), "Git.LogRepository",
                            globalcontext, true,
                            SLOT(logRepository()));
 
     createRepositoryAction(localRepositoryMenu,
-                           tr("Reflog"), Core::Id("Git.ReflogRepository"),
+                           tr("Reflog"), "Git.ReflogRepository",
                            globalcontext, true,
                            SLOT(reflogRepository()));
 
     createRepositoryAction(localRepositoryMenu,
-                           tr("Clean..."), Core::Id("Git.CleanRepository"),
+                           tr("Clean..."), "Git.CleanRepository",
                            globalcontext, true, SLOT(cleanRepository()));
 
     createRepositoryAction(localRepositoryMenu,
-                           tr("Status"), Core::Id("Git.StatusRepository"),
+                           tr("Status"), "Git.StatusRepository",
                            globalcontext, true, &GitClient::status);
 
     // --------------
     localRepositoryMenu->addSeparator(globalcontext);
 
     ActionCommandPair actionCommand = createRepositoryAction(localRepositoryMenu,
-                                                             tr("Commit..."), Core::Id("Git.Commit"),
+                                                             tr("Commit..."), "Git.Commit",
                                                              globalcontext, true, SLOT(startCommit()));
     actionCommand.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+C") : tr("Alt+G,Alt+C")));
 
     createRepositoryAction(localRepositoryMenu,
-                           tr("Amend Last Commit..."), Core::Id("Git.AmendCommit"),
+                           tr("Amend Last Commit..."), "Git.AmendCommit",
                            globalcontext, true, SLOT(startAmendCommit()));
 
     m_fixupCommitAction =
             createRepositoryAction(localRepositoryMenu,
-                                   tr("Fixup Previous Commit..."), Core::Id("Git.FixupCommit"),
+                                   tr("Fixup Previous Commit..."), "Git.FixupCommit",
                                    globalcontext, true, SLOT(startFixupCommit())).first;
     // --------------
     localRepositoryMenu->addSeparator(globalcontext);
 
     createRepositoryAction(localRepositoryMenu,
-                           tr("Reset..."), Core::Id("Git.Reset"),
+                           tr("Reset..."), "Git.Reset",
                            globalcontext, true, SLOT(resetRepository()));
 
     m_interactiveRebaseAction =
             createRepositoryAction(localRepositoryMenu,
-                                   tr("Interactive Rebase..."), Core::Id("Git.InteractiveRebase"),
+                                   tr("Interactive Rebase..."), "Git.InteractiveRebase",
                                    globalcontext, true, SLOT(startRebase())).first;
 
     m_submoduleUpdateAction =
             createRepositoryAction(localRepositoryMenu,
-                                   tr("Update Submodules"), Core::Id("Git.SubmoduleUpdate"),
+                                   tr("Update Submodules"), "Git.SubmoduleUpdate",
                                    globalcontext, true, SLOT(updateSubmodules())).first;
     m_abortMergeAction =
             createRepositoryAction(localRepositoryMenu,
-                                   tr("Abort Merge"), Core::Id("Git.MergeAbort"),
+                                   tr("Abort Merge"), "Git.MergeAbort",
                                    globalcontext, true, SLOT(continueOrAbortCommand())).first;
 
     m_abortRebaseAction =
             createRepositoryAction(localRepositoryMenu,
-                                   tr("Abort Rebase"), Core::Id("Git.RebaseAbort"),
+                                   tr("Abort Rebase"), "Git.RebaseAbort",
                                    globalcontext, true, SLOT(continueOrAbortCommand())).first;
 
     m_abortCherryPickAction =
             createRepositoryAction(localRepositoryMenu,
-                                   tr("Abort Cherry Pick"), Core::Id("Git.CherryPickAbort"),
+                                   tr("Abort Cherry Pick"), "Git.CherryPickAbort",
                                    globalcontext, true, SLOT(continueOrAbortCommand())).first;
 
     m_abortRevertAction =
             createRepositoryAction(localRepositoryMenu,
-                                   tr("Abort Revert"), Core::Id("Git.RevertAbort"),
+                                   tr("Abort Revert"), "Git.RevertAbort",
                                    globalcontext, true, SLOT(continueOrAbortCommand())).first;
 
     m_continueRebaseAction =
             createRepositoryAction(localRepositoryMenu,
-                                   tr("Continue Rebase"), Core::Id("Git.RebaseContinue"),
+                                   tr("Continue Rebase"), "Git.RebaseContinue",
                                    globalcontext, true, SLOT(continueOrAbortCommand())).first;
 
     m_continueCherryPickAction =
             createRepositoryAction(localRepositoryMenu,
-                                   tr("Continue Cherry Pick"), Core::Id("Git.CherryPickContinue"),
+                                   tr("Continue Cherry Pick"), "Git.CherryPickContinue",
                                    globalcontext, true, SLOT(continueOrAbortCommand())).first;
 
     m_continueRevertAction =
             createRepositoryAction(localRepositoryMenu,
-                                   tr("Continue Revert"), Core::Id("Git.RevertContinue"),
+                                   tr("Continue Revert"), "Git.RevertContinue",
                                    globalcontext, true, SLOT(continueOrAbortCommand())).first;
 
     // --------------
     localRepositoryMenu->addSeparator(globalcontext);
 
     createRepositoryAction(localRepositoryMenu,
-                           tr("Branches..."), Core::Id("Git.BranchList"),
+                           tr("Branches..."), "Git.BranchList",
                            globalcontext, true, SLOT(branchList()));
 
     // --------------
     localRepositoryMenu->addSeparator(globalcontext);
 
     // "Patch" menu
-    Core::ActionContainer *patchMenu = Core::ActionManager::createMenu(Core::Id("Git.PatchMenu"));
+    Core::ActionContainer *patchMenu = Core::ActionManager::createMenu("Git.PatchMenu");
     patchMenu->menu()->setTitle(tr("&Patch"));
     localRepositoryMenu->addMenu(patchMenu);
 
@@ -507,41 +506,41 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     parameterActionCommand =
             createParameterAction(patchMenu,
                                   tr("Apply from Editor"), tr("Apply \"%1\""),
-                                  Core::Id("Git.ApplyCurrentFilePatch"),
+                                  "Git.ApplyCurrentFilePatch",
                                   globalcontext, true);
     m_applyCurrentFilePatchAction = parameterActionCommand.first;
     connect(m_applyCurrentFilePatchAction, SIGNAL(triggered()), this,
             SLOT(applyCurrentFilePatch()));
 
     createRepositoryAction(patchMenu,
-                           tr("Apply from File..."), Core::Id("Git.ApplyPatch"),
+                           tr("Apply from File..."), "Git.ApplyPatch",
                            globalcontext, true, SLOT(promptApplyPatch()));
 
     // "Stash" menu
-    Core::ActionContainer *stashMenu = Core::ActionManager::createMenu(Core::Id("Git.StashMenu"));
+    Core::ActionContainer *stashMenu = Core::ActionManager::createMenu("Git.StashMenu");
     stashMenu->menu()->setTitle(tr("&Stash"));
     localRepositoryMenu->addMenu(stashMenu);
 
     createRepositoryAction(stashMenu,
-                           tr("Stashes..."), Core::Id("Git.StashList"),
+                           tr("Stashes..."), "Git.StashList",
                            globalcontext, false, SLOT(stashList()));
 
     stashMenu->addSeparator(globalcontext);
 
     actionCommand = createRepositoryAction(stashMenu,
-                                           tr("Stash"), Core::Id("Git.Stash"),
+                                           tr("Stash"), "Git.Stash",
                                            globalcontext, true, SLOT(stash()));
     actionCommand.first->setToolTip(tr("Saves the current state of your work and resets the repository."));
 
     actionCommand = createRepositoryAction(stashMenu,
-                                           tr("Take Snapshot..."), Core::Id("Git.StashSnapshot"),
+                                           tr("Take Snapshot..."), "Git.StashSnapshot",
                                            globalcontext, true, SLOT(stashSnapshot()));
     actionCommand.first->setToolTip(tr("Saves the current state of your work."));
 
     stashMenu->addSeparator(globalcontext);
 
     actionCommand = createRepositoryAction(stashMenu,
-                                           tr("Stash Pop"), Core::Id("Git.StashPop"),
+                                           tr("Stash Pop"), "Git.StashPop",
                                            globalcontext, true, &GitClient::stashPop);
     actionCommand.first->setToolTip(tr("Restores changes saved to the stash list using \"Stash\"."));
 
@@ -551,43 +550,43 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     // --------------
 
     /*  "Remote Repository" menu */
-    Core::ActionContainer *remoteRepositoryMenu = Core::ActionManager::createMenu(Core::Id("Git.RemoteRepositoryMenu"));
+    Core::ActionContainer *remoteRepositoryMenu = Core::ActionManager::createMenu("Git.RemoteRepositoryMenu");
     remoteRepositoryMenu->menu()->setTitle(tr("&Remote Repository"));
     gitContainer->addMenu(remoteRepositoryMenu);
 
     createRepositoryAction(remoteRepositoryMenu,
-                           tr("Fetch"), Core::Id("Git.Fetch"),
+                           tr("Fetch"), "Git.Fetch",
                            globalcontext, true, SLOT(fetch()));
 
     createRepositoryAction(remoteRepositoryMenu,
-                           tr("Pull"), Core::Id("Git.Pull"),
+                           tr("Pull"), "Git.Pull",
                            globalcontext, true, SLOT(pull()));
 
     actionCommand = createRepositoryAction(remoteRepositoryMenu,
-                                           tr("Push"), Core::Id("Git.Push"),
+                                           tr("Push"), "Git.Push",
                                            globalcontext, true, SLOT(push()));
 
     // --------------
     remoteRepositoryMenu->addSeparator(globalcontext);
 
     // "Subversion" menu
-    Core::ActionContainer *subversionMenu = Core::ActionManager::createMenu(Core::Id("Git.Subversion"));
+    Core::ActionContainer *subversionMenu = Core::ActionManager::createMenu("Git.Subversion");
     subversionMenu->menu()->setTitle(tr("&Subversion"));
     remoteRepositoryMenu->addMenu(subversionMenu);
 
     createRepositoryAction(subversionMenu,
-                           tr("Log"), Core::Id("Git.Subversion.Log"),
+                           tr("Log"), "Git.Subversion.Log",
                            globalcontext, false, &GitClient::subversionLog);
 
     createRepositoryAction(subversionMenu,
-                           tr("Fetch"), Core::Id("Git.Subversion.Fetch"),
+                           tr("Fetch"), "Git.Subversion.Fetch",
                            globalcontext, false, &GitClient::synchronousSubversionFetch);
 
     // --------------
     remoteRepositoryMenu->addSeparator(globalcontext);
 
     createRepositoryAction(remoteRepositoryMenu,
-                           tr("Manage Remotes..."), Core::Id("Git.RemoteList"),
+                           tr("Manage Remotes..."), "Git.RemoteList",
                            globalcontext, false, SLOT(remoteList()));
 
     /* \"Remote Repository" menu */
@@ -595,22 +594,22 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     // --------------
 
     /*  Actions only in locator */
-    createRepositoryAction(0, tr("Show..."), Core::Id("Git.Show"),
+    createRepositoryAction(0, tr("Show..."), "Git.Show",
                            globalcontext, true, SLOT(startChangeRelatedAction()));
 
-    createRepositoryAction(0, tr("Revert..."), Core::Id("Git.Revert"),
+    createRepositoryAction(0, tr("Revert..."), "Git.Revert",
                            globalcontext, true, SLOT(startChangeRelatedAction()));
 
-    createRepositoryAction(0, tr("Cherry Pick..."), Core::Id("Git.CherryPick"),
+    createRepositoryAction(0, tr("Cherry Pick..."), "Git.CherryPick",
                            globalcontext, true, SLOT(startChangeRelatedAction()));
 
-    createRepositoryAction(0, tr("Checkout..."), Core::Id("Git.Checkout"),
+    createRepositoryAction(0, tr("Checkout..."), "Git.Checkout",
                            globalcontext, true, SLOT(startChangeRelatedAction()));
 
-    createRepositoryAction(0, tr("Rebase..."), Core::Id("Git.Rebase"),
+    createRepositoryAction(0, tr("Rebase..."), "Git.Rebase",
                            globalcontext, true, SLOT(branchList()));
 
-    createRepositoryAction(0, tr("Merge..."), Core::Id("Git.Merge"),
+    createRepositoryAction(0, tr("Merge..."), "Git.Merge",
                            globalcontext, true, SLOT(branchList()));
 
     /*  \Actions only in locator */
@@ -618,28 +617,28 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     // --------------
 
     /*  "Git Tools" menu */
-    Core::ActionContainer *gitToolsMenu = Core::ActionManager::createMenu(Core::Id("Git.GitToolsMenu"));
+    Core::ActionContainer *gitToolsMenu = Core::ActionManager::createMenu("Git.GitToolsMenu");
     gitToolsMenu->menu()->setTitle(tr("Git &Tools"));
     gitContainer->addMenu(gitToolsMenu);
 
     createRepositoryAction(gitToolsMenu,
-                           tr("Gitk"), Core::Id("Git.LaunchGitK"),
+                           tr("Gitk"), "Git.LaunchGitK",
                            globalcontext, true, &GitClient::launchGitK);
 
     parameterActionCommand
             = createFileAction(gitToolsMenu,
                                tr("Gitk Current File"), tr("Gitk of \"%1\""),
-                               Core::Id("Git.GitkFile"), globalcontext, true, SLOT(gitkForCurrentFile()));
+                               "Git.GitkFile", globalcontext, true, SLOT(gitkForCurrentFile()));
 
     parameterActionCommand
             = createFileAction(gitToolsMenu,
                                tr("Gitk for folder of Current File"), tr("Gitk for folder of \"%1\""),
-                               Core::Id("Git.GitkFolder"), globalcontext, true, SLOT(gitkForCurrentFolder()));
+                               "Git.GitkFolder", globalcontext, true, SLOT(gitkForCurrentFolder()));
 
     // --------------
     gitToolsMenu->addSeparator(globalcontext);
 
-    createRepositoryAction(gitToolsMenu, tr("Git Gui"), Core::Id("Git.GitGui"),
+    createRepositoryAction(gitToolsMenu, tr("Git Gui"), "Git.GitGui",
                            globalcontext, true, SLOT(gitGui()));
 
     // --------------
@@ -647,12 +646,12 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 
     m_repositoryBrowserAction
             = createRepositoryAction(gitToolsMenu,
-                                     tr("Repository Browser"), Core::Id("Git.LaunchRepositoryBrowser"),
+                                     tr("Repository Browser"), "Git.LaunchRepositoryBrowser",
                                      globalcontext, true, &GitClient::launchRepositoryBrowser).first;
 
     m_mergeToolAction =
             createRepositoryAction(gitToolsMenu,
-                                   tr("Merge Tool"), Core::Id("Git.MergeTool"),
+                                   tr("Merge Tool"), "Git.MergeTool",
                                    globalcontext, true, SLOT(startMergeTool())).first;
 
     /* \"Git Tools" menu */
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index a4d259832d..09a650542c 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -1048,10 +1048,10 @@ Utils::StyledBar *HelpPlugin::createIconToolBar(bool external)
             tr("Add Bookmark"), toolBar);
         connect(bookmark, SIGNAL(triggered()), this, SLOT(addBookmark()));
     } else {
-        home = Core::ActionManager::command(Core::Id("Help.Home"))->action();
-        back = Core::ActionManager::command(Core::Id("Help.Previous"))->action();
-        next = Core::ActionManager::command(Core::Id("Help.Next"))->action();
-        bookmark = Core::ActionManager::command(Core::Id("Help.AddBookmark"))->action();
+        home = Core::ActionManager::command("Help.Home")->action();
+        back = Core::ActionManager::command("Help.Previous")->action();
+        next = Core::ActionManager::command("Help.Next")->action();
+        bookmark = Core::ActionManager::command("Help.AddBookmark")->action();
     }
 
     setupNavigationMenus(back, next, toolBar);
diff --git a/src/plugins/madde/maddeqemustartstep.cpp b/src/plugins/madde/maddeqemustartstep.cpp
index 5d0ee6df12..1226fbc560 100644
--- a/src/plugins/madde/maddeqemustartstep.cpp
+++ b/src/plugins/madde/maddeqemustartstep.cpp
@@ -113,7 +113,7 @@ void MaddeQemuStartStep::ctor()
 
 Core::Id MaddeQemuStartStep::stepId()
 {
-    return Core::Id("Madde.MaddeQemuCheckStep");
+    return "Madde.MaddeQemuCheckStep";
 }
 
 QString MaddeQemuStartStep::stepDisplayName()
diff --git a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
index 5d7c2edd89..6d3f5d29dc 100644
--- a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
+++ b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
@@ -143,7 +143,7 @@ bool MaemoUploadAndInstallPackageStep::initInternal(QString *error)
 
 Core::Id MaemoUploadAndInstallPackageStep::stepId()
 {
-    return Core::Id("MaemoUploadAndInstallDpkgPackageStep");
+    return "MaemoUploadAndInstallDpkgPackageStep";
 }
 
 QString MaemoUploadAndInstallPackageStep::displayName()
diff --git a/src/plugins/madde/maemodeploybymountsteps.cpp b/src/plugins/madde/maemodeploybymountsteps.cpp
index 9ff045826e..b0089ff746 100644
--- a/src/plugins/madde/maemodeploybymountsteps.cpp
+++ b/src/plugins/madde/maemodeploybymountsteps.cpp
@@ -410,7 +410,7 @@ bool MaemoInstallPackageViaMountStep::initInternal(QString *error)
 
 Core::Id MaemoInstallPackageViaMountStep::stepId()
 {
-    return Core::Id("MaemoMountAndInstallDeployStep");
+    return "MaemoMountAndInstallDeployStep";
 }
 
 QString MaemoInstallPackageViaMountStep::displayName()
@@ -451,7 +451,7 @@ bool MaemoCopyFilesViaMountStep::initInternal(QString *error)
 
 Core::Id MaemoCopyFilesViaMountStep::stepId()
 {
-    return Core::Id("MaemoMountAndCopyDeployStep");
+    return "MaemoMountAndCopyDeployStep";
 }
 
 QString MaemoCopyFilesViaMountStep::displayName()
diff --git a/src/plugins/madde/maemoinstalltosysrootstep.cpp b/src/plugins/madde/maemoinstalltosysrootstep.cpp
index 8352b29195..85daa541e7 100644
--- a/src/plugins/madde/maemoinstalltosysrootstep.cpp
+++ b/src/plugins/madde/maemoinstalltosysrootstep.cpp
@@ -242,7 +242,7 @@ QStringList MaemoInstallDebianPackageToSysrootStep::madArguments() const
 }
 
 const Core::Id MaemoInstallDebianPackageToSysrootStep::Id
-    = Core::Id("MaemoInstallDebianPackageToSysrootStep");
+    = "MaemoInstallDebianPackageToSysrootStep";
 
 QString MaemoInstallDebianPackageToSysrootStep::displayName()
 {
@@ -317,7 +317,7 @@ BuildStepConfigWidget *MaemoCopyToSysrootStep::createConfigWidget()
 }
 
 const Core::Id MaemoCopyToSysrootStep::Id
-    = Core::Id("MaemoCopyToSysrootStep");
+    = "MaemoCopyToSysrootStep";
 QString MaemoCopyToSysrootStep::displayName()
 {
     return tr("Copy files to sysroot");
@@ -376,7 +376,7 @@ BuildStepConfigWidget *MaemoMakeInstallToSysrootStep::createConfigWidget()
 }
 
 const Core::Id MaemoMakeInstallToSysrootStep::Id
-    = Core::Id("MaemoMakeInstallToSysrootStep");
+    = "MaemoMakeInstallToSysrootStep";
 QString MaemoMakeInstallToSysrootStep::displayName()
 {
     return tr("Copy files to sysroot");
diff --git a/src/plugins/madde/maemopackagecreationstep.cpp b/src/plugins/madde/maemopackagecreationstep.cpp
index ef120b7bea..254d0ea6be 100644
--- a/src/plugins/madde/maemopackagecreationstep.cpp
+++ b/src/plugins/madde/maemopackagecreationstep.cpp
@@ -257,7 +257,7 @@ MaemoDebianPackageCreationStep::MaemoDebianPackageCreationStep(BuildStepList *bs
 }
 
 const Core::Id MaemoDebianPackageCreationStep::CreatePackageId
-    = Core::Id("MaemoDebianPackageCreationStep");
+    = "MaemoDebianPackageCreationStep";
 
 MaemoDebianPackageCreationStep::MaemoDebianPackageCreationStep(BuildStepList *buildConfig,
     MaemoDebianPackageCreationStep *other)
diff --git a/src/plugins/madde/qt4maemodeployconfiguration.cpp b/src/plugins/madde/qt4maemodeployconfiguration.cpp
index adec54f79b..d423c206cd 100644
--- a/src/plugins/madde/qt4maemodeployconfiguration.cpp
+++ b/src/plugins/madde/qt4maemodeployconfiguration.cpp
@@ -87,17 +87,17 @@ Qt4MaemoDeployConfiguration::~Qt4MaemoDeployConfiguration() {}
 
 Core::Id Qt4MaemoDeployConfiguration::fremantleWithPackagingId()
 {
-    return Core::Id("DeployToFremantleWithPackaging");
+    return "DeployToFremantleWithPackaging";
 }
 
 Core::Id Qt4MaemoDeployConfiguration::fremantleWithoutPackagingId()
 {
-    return Core::Id("DeployToFremantleWithoutPackaging");
+    return "DeployToFremantleWithoutPackaging";
 }
 
 Core::Id Qt4MaemoDeployConfiguration::harmattanId()
 {
-    return Core::Id("DeployToHarmattan");
+    return "DeployToHarmattan";
 }
 
 void Qt4MaemoDeployConfiguration::debianDirChanged(const Utils::FileName &dir)
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index b4f5b33813..abd529c2ad 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -180,7 +180,7 @@ void MercurialPlugin::createMenu()
     Core::Context context(Core::Constants::C_GLOBAL);
 
     // Create menu item for Mercurial
-    mercurialContainer = Core::ActionManager::createMenu(Core::Id("Mercurial.MercurialMenu"));
+    mercurialContainer = Core::ActionManager::createMenu("Mercurial.MercurialMenu");
     QMenu *menu = mercurialContainer->menu();
     menu->setTitle(tr("Me&rcurial"));
 
diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp
index 1c9554755e..d50477dd23 100644
--- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp
@@ -100,7 +100,7 @@ BuildStepConfigWidget *DeviceCheckBuildStep::createConfigWidget()
 
 Core::Id DeviceCheckBuildStep::stepId()
 {
-    return Core::Id("ProjectExplorer.DeviceCheckBuildStep");
+    return "ProjectExplorer.DeviceCheckBuildStep";
 }
 
 QString DeviceCheckBuildStep::stepDisplayName()
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index 4e9f139ba6..fb2fb914af 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -426,7 +426,7 @@ public:
     TestDevice()
         : IDevice(testTypeId(), AutoDetected, Hardware, Core::Id::fromString(QUuid::createUuid().toString())) {}
 
-    static Core::Id testTypeId() { return Core::Id("TestType"); }
+    static Core::Id testTypeId() { return "TestType"; }
 private:
     TestDevice(const TestDevice &other) : IDevice(other) {}
     QString displayType() const { return QLatin1String("blubb"); }
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp
index 09a069eae4..5cad564139 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.cpp
+++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp
@@ -410,7 +410,7 @@ int FolderNavigationWidgetFactory::priority() const
 
 Core::Id FolderNavigationWidgetFactory::id() const
 {
-    return Core::Id("File System");
+    return "File System";
 }
 
 QKeySequence FolderNavigationWidgetFactory::activationSequence() const
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index 0022587e0c..e7e72265f4 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -420,7 +420,7 @@ int ProjectTreeWidgetFactory::priority() const
 
 Id ProjectTreeWidgetFactory::id() const
 {
-    return Id("Projects");
+    return "Projects";
 }
 
 QKeySequence ProjectTreeWidgetFactory::activationSequence() const
diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp
index 2b4911d83e..62ed25db68 100644
--- a/src/plugins/projectexplorer/settingsaccessor.cpp
+++ b/src/plugins/projectexplorer/settingsaccessor.cpp
@@ -2414,36 +2414,36 @@ QVariantMap Version11Handler::update(Project *project, const QVariantMap &map)
 
             if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.AndroidDeviceTarget")) {
                 tmpKit->setIconPath(FileName::fromString(QLatin1String(":/android/images/QtAndroid.png")));
-                tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Desktop"));
-                tmpKit->setValue(Core::Id("PE.Profile.Device"), QString());
+                tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Desktop"));
+                tmpKit->setValue("PE.Profile.Device", QString());
             } else if (oldTargetId == QLatin1String("RemoteLinux.EmbeddedLinuxTarget")) {
                 tmpKit->setIconPath(FileName::fromString(QLatin1String(":///DESKTOP///")));
-                tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("GenericLinuxOsType"));
-                tmpKit->setValue(Core::Id("PE.Profile.Device"), QString());
+                tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("GenericLinuxOsType"));
+                tmpKit->setValue("PE.Profile.Device", QString());
             } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.HarmattanDeviceTarget")) {
                 tmpKit->setIconPath(FileName::fromString(QLatin1String(":/projectexplorer/images/MaemoDevice.png")));
-                tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("HarmattanOsType"));
-                tmpKit->setValue(Core::Id("PE.Profile.Device"), QString());
+                tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("HarmattanOsType"));
+                tmpKit->setValue("PE.Profile.Device", QString());
             } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.MaemoDeviceTarget")) {
                 tmpKit->setIconPath(FileName::fromString(QLatin1String(":/projectexplorer/images/MaemoDevice.png")));
-                tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Maemo5OsType"));
-                tmpKit->setValue(Core::Id("PE.Profile.Device"), QString());
+                tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Maemo5OsType"));
+                tmpKit->setValue("PE.Profile.Device", QString());
             } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.MeegoDeviceTarget")) {
                 tmpKit->setIconPath(FileName::fromString(QLatin1String(":/projectexplorer/images/MaemoDevice.png")));
-                tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("MeegoOsType"));
-                tmpKit->setValue(Core::Id("PE.Profile.Device"), QString());
+                tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("MeegoOsType"));
+                tmpKit->setValue("PE.Profile.Device", QString());
             } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.S60DeviceTarget")) {
                 tmpKit->setIconPath(FileName::fromString(QLatin1String(":/projectexplorer/images/SymbianDevice.png")));
-                tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Qt4ProjectManager.SymbianDevice"));
-                tmpKit->setValue(Core::Id("PE.Profile.Device"), QString::fromLatin1("Symbian Device"));
+                tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Qt4ProjectManager.SymbianDevice"));
+                tmpKit->setValue("PE.Profile.Device", QString::fromLatin1("Symbian Device"));
             } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.QtSimulatorTarget")) {
                 tmpKit->setIconPath(FileName::fromString(QLatin1String(":/projectexplorer/images/Simulator.png")));
-                tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Desktop"));
-                tmpKit->setValue(Core::Id("PE.Profile.Device"), QString::fromLatin1("Desktop Device"));
+                tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Desktop"));
+                tmpKit->setValue("PE.Profile.Device", QString::fromLatin1("Desktop Device"));
             } else {
                 tmpKit->setIconPath(FileName::fromString(QLatin1String(":///DESKTOP///")));
-                tmpKit->setValue(Core::Id("PE.Profile.DeviceType"), QString::fromLatin1("Desktop"));
-                tmpKit->setValue(Core::Id("PE.Profile.Device"), QString::fromLatin1("Desktop Device"));
+                tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Desktop"));
+                tmpKit->setValue("PE.Profile.Device", QString::fromLatin1("Desktop Device"));
             }
 
             // Tool chain
@@ -2481,11 +2481,11 @@ QVariantMap Version11Handler::update(Project *project, const QVariantMap &map)
                     }
                 }
             }
-            tmpKit->setValue(Core::Id("PE.Profile.ToolChain"), tcId);
+            tmpKit->setValue("PE.Profile.ToolChain", tcId);
 
             // QtVersion
             int qtVersionId = bc.value(QLatin1String("Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId"), -1).toInt();
-            tmpKit->setValue(Core::Id("QtSupport.QtInformation"), qtVersionId);
+            tmpKit->setValue("QtSupport.QtInformation", qtVersionId);
 
             // Debugger + mkspec
             QVariantMap debugger;
@@ -2500,11 +2500,11 @@ QVariantMap Version11Handler::update(Project *project, const QVariantMap &map)
             }
             debugger.insert(QLatin1String("EngineType"), debuggerEngine);
             debugger.insert(QLatin1String("Binary"), debuggerPath);
-            tmpKit->setValue(Core::Id("Debugger.Information"), debugger);
-            tmpKit->setValue(Core::Id("QtPM4.mkSpecInformation"), mkspec);
+            tmpKit->setValue("Debugger.Information", debugger);
+            tmpKit->setValue("QtPM4.mkSpecInformation", mkspec);
 
             // SysRoot
-            tmpKit->setValue(Core::Id("PE.Profile.SysRoot"), m_qtVersionExtras.value(qtVersionId));
+            tmpKit->setValue("PE.Profile.SysRoot", m_qtVersionExtras.value(qtVersionId));
 
             QMapIterator<int, QVariantMap> deployIt(dcs);
             while (deployIt.hasNext()) {
@@ -2517,7 +2517,7 @@ QVariantMap Version11Handler::update(Project *project, const QVariantMap &map)
                     devId = QByteArray("Desktop Device");
                 if (!devId.isEmpty() && !DeviceManager::instance()->find(Core::Id::fromName(devId))) // We do not know that device
                     devId.clear();
-                tmpKit->setValue(Core::Id("PE.Profile.Device"), devId);
+                tmpKit->setValue("PE.Profile.Device", devId);
 
                 // Set display name last:
                 tmpKit->setDisplayName(extraTargetData.value(QLatin1String("ProjectExplorer.ProjectConfiguration.DisplayName")).toString());
@@ -2560,22 +2560,22 @@ QVariantMap Version11Handler::update(Project *project, const QVariantMap &map)
 
 Kit *Version11Handler::uniqueKit(Kit *k)
 {
-    const QString tc = k->value(Core::Id("PE.Profile.ToolChain")).toString();
-    const int qt = k->value(Core::Id("QtSupport.QtInformation")).toInt();
-    const QString debugger = k->value(Core::Id("Debugger.Information")).toString();
-    const QString mkspec = k->value(Core::Id("QtPM4.mkSpecInformation")).toString();
-    const QString deviceType = k->value(Core::Id("PE.Profile.DeviceType")).toString();
-    const QString device = k->value(Core::Id("PE.Profile.Device")).toString();
-    const QString sysroot = k->value(Core::Id("PE.Profile.SysRoot")).toString();
+    const QString tc = k->value("PE.Profile.ToolChain").toString();
+    const int qt = k->value("QtSupport.QtInformation").toInt();
+    const QString debugger = k->value("Debugger.Information").toString();
+    const QString mkspec = k->value("QtPM4.mkSpecInformation").toString();
+    const QString deviceType = k->value("PE.Profile.DeviceType").toString();
+    const QString device = k->value("PE.Profile.Device").toString();
+    const QString sysroot = k->value("PE.Profile.SysRoot").toString();
 
     foreach (Kit *i, m_targets.keys()) {
-        const QString currentTc = i->value(Core::Id("PE.Profile.ToolChain")).toString();
-        const int currentQt = i->value(Core::Id("QtSupport.QtInformation")).toInt();
-        const QString currentDebugger = i->value(Core::Id("Debugger.Information")).toString();
-        const QString currentMkspec = i->value(Core::Id("QtPM4.mkSpecInformation")).toString();
-        const QString currentDeviceType = i->value(Core::Id("PE.Profile.DeviceType")).toString();
-        const QString currentDevice = i->value(Core::Id("PE.Profile.Device")).toString();
-        const QString currentSysroot = i->value(Core::Id("PE.Profile.SysRoot")).toString();
+        const QString currentTc = i->value("PE.Profile.ToolChain").toString();
+        const int currentQt = i->value("QtSupport.QtInformation").toInt();
+        const QString currentDebugger = i->value("Debugger.Information").toString();
+        const QString currentMkspec = i->value("QtPM4.mkSpecInformation").toString();
+        const QString currentDeviceType = i->value("PE.Profile.DeviceType").toString();
+        const QString currentDevice = i->value("PE.Profile.Device").toString();
+        const QString currentSysroot = i->value("PE.Profile.SysRoot").toString();
 
         bool deviceTypeOk = deviceType == currentDeviceType;
         bool deviceOk = device.isEmpty() || currentDevice == device;
diff --git a/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.cpp b/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.cpp
index 50a5ddcce9..911e05631f 100644
--- a/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.cpp
+++ b/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.cpp
@@ -48,7 +48,7 @@ static QString genericQbsDisplayName() {
 
 static Core::Id genericQbsDeployConfigurationId()
 {
-    return Core::Id("Qbs.Deploy");
+    return "Qbs.Deploy";
 }
 
 // --------------------------------------------------------------------
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
index ebd9bb589b..311aa46e03 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
@@ -66,7 +66,7 @@ namespace Internal {
 class QbsFeatureProvider : public Core::IFeatureProvider
 {
     Core::FeatureSet availableFeatures(const QString & /* platform */) const {
-        return Core::FeatureSet(Core::Id("Qbs.QbsSupport"));
+        return Core::FeatureSet("Qbs.QbsSupport");
     }
 
     QStringList availablePlatforms() const { return QStringList(); }
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index ed895cdc87..39e9c6b13c 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -316,7 +316,7 @@ QString QmlProject::displayName() const
 
 Core::Id QmlProject::id() const
 {
-    return Core::Id("QmlProjectManager.QmlProject");
+    return "QmlProjectManager.QmlProject";
 }
 
 Core::IDocument *QmlProject::document() const
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index 70e991cffd..9fe297cd53 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -149,7 +149,7 @@ bool GenericDirectUploadStep::incrementalDeployment() const
 
 Core::Id GenericDirectUploadStep::stepId()
 {
-    return Core::Id("RemoteLinux.DirectUploadStep");
+    return "RemoteLinux.DirectUploadStep";
 }
 
 QString GenericDirectUploadStep::displayName()
diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
index ab0675bdb9..564062db94 100644
--- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
+++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
@@ -176,7 +176,7 @@ AbstractRemoteLinuxDeployService *RemoteLinuxCheckForFreeDiskSpaceStep::deploySe
 
 Core::Id RemoteLinuxCheckForFreeDiskSpaceStep::stepId()
 {
-    return Core::Id("RemoteLinux.CheckForFreeDiskSpaceStep");
+    return "RemoteLinux.CheckForFreeDiskSpaceStep";
 }
 
 QString RemoteLinuxCheckForFreeDiskSpaceStep::stepDisplayName()
diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
index f0e288caf4..50eb359a38 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
@@ -184,7 +184,7 @@ RemoteLinuxCustomCommandDeployService *GenericRemoteLinuxCustomCommandDeployment
 
 Core::Id GenericRemoteLinuxCustomCommandDeploymentStep::stepId()
 {
-    return Core::Id("RemoteLinux.GenericRemoteLinuxCustomCommandDeploymentStep");
+    return "RemoteLinux.GenericRemoteLinuxCustomCommandDeploymentStep";
 }
 
 QString GenericRemoteLinuxCustomCommandDeploymentStep::stepDisplayName()
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
index 9e07ce27fe..ede7d7efd9 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
@@ -126,7 +126,7 @@ DeployConfiguration *RemoteLinuxDeployConfigurationFactory::clone(Target *parent
 
 Core::Id RemoteLinuxDeployConfigurationFactory::genericDeployConfigurationId()
 {
-    return Core::Id("DeployToGenericLinux");
+    return "DeployToGenericLinux";
 }
 
 } // namespace Internal
diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp
index 33be3aa310..d055c95547 100644
--- a/src/plugins/remotelinux/tarpackagecreationstep.cpp
+++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp
@@ -298,7 +298,7 @@ BuildStepConfigWidget *TarPackageCreationStep::createConfigWidget()
 
 Core::Id TarPackageCreationStep::stepId()
 {
-    return Core::Id("MaemoTarPackageCreationStep");
+    return "MaemoTarPackageCreationStep";
 }
 
 QString TarPackageCreationStep::displayName()
diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
index 81ca05f2c3..d1c94e56b8 100644
--- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
+++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
@@ -103,7 +103,7 @@ BuildStepConfigWidget *UploadAndInstallTarPackageStep::createConfigWidget()
 
 Core::Id UploadAndInstallTarPackageStep::stepId()
 {
-    return Core::Id("MaemoUploadAndInstallTarPackageStep");
+    return "MaemoUploadAndInstallTarPackageStep";
 }
 
 QString UploadAndInstallTarPackageStep::displayName()
diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp
index d4c5bbd7d1..4df0013e44 100644
--- a/src/plugins/texteditor/outlinefactory.cpp
+++ b/src/plugins/texteditor/outlinefactory.cpp
@@ -196,7 +196,7 @@ int OutlineFactory::priority() const
 
 Core::Id OutlineFactory::id() const
 {
-    return Core::Id("Outline");
+    return "Outline";
 }
 
 QKeySequence OutlineFactory::activationSequence() const