Commit d18b61b8 authored by Tobias Hunger's avatar Tobias Hunger Committed by hjk

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

Change-Id: Ibe505c8331f7d1280fdb8784a00321742f5d94cb
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 480d014b
...@@ -288,19 +288,19 @@ void AnalyzerManagerPrivate::delayedInit() ...@@ -288,19 +288,19 @@ void AnalyzerManagerPrivate::delayedInit()
Context analyzerContext(C_ANALYZEMODE); Context analyzerContext(C_ANALYZEMODE);
ActionContainer *viewsMenu = Core::ActionManager::actionContainer(Id(M_WINDOW_VIEWS)); ActionContainer *viewsMenu = Core::ActionManager::actionContainer(Id(M_WINDOW_VIEWS));
Command *cmd = Core::ActionManager::registerAction(m_mainWindow->menuSeparator1(), Command *cmd = Core::ActionManager::registerAction(m_mainWindow->menuSeparator1(),
Id("Analyzer.Views.Separator1"), analyzerContext); "Analyzer.Views.Separator1", analyzerContext);
cmd->setAttribute(Command::CA_Hide); cmd->setAttribute(Command::CA_Hide);
viewsMenu->addAction(cmd, G_DEFAULT_THREE); viewsMenu->addAction(cmd, G_DEFAULT_THREE);
cmd = Core::ActionManager::registerAction(m_mainWindow->toggleLockedAction(), cmd = Core::ActionManager::registerAction(m_mainWindow->toggleLockedAction(),
Id("Analyzer.Views.ToggleLocked"), analyzerContext); "Analyzer.Views.ToggleLocked", analyzerContext);
cmd->setAttribute(Command::CA_Hide); cmd->setAttribute(Command::CA_Hide);
viewsMenu->addAction(cmd, G_DEFAULT_THREE); viewsMenu->addAction(cmd, G_DEFAULT_THREE);
cmd = Core::ActionManager::registerAction(m_mainWindow->menuSeparator2(), cmd = Core::ActionManager::registerAction(m_mainWindow->menuSeparator2(),
Id("Analyzer.Views.Separator2"), analyzerContext); "Analyzer.Views.Separator2", analyzerContext);
cmd->setAttribute(Command::CA_Hide); cmd->setAttribute(Command::CA_Hide);
viewsMenu->addAction(cmd, G_DEFAULT_THREE); viewsMenu->addAction(cmd, G_DEFAULT_THREE);
cmd = Core::ActionManager::registerAction(m_mainWindow->resetLayoutAction(), cmd = Core::ActionManager::registerAction(m_mainWindow->resetLayoutAction(),
Id("Analyzer.Views.ResetSimple"), analyzerContext); "Analyzer.Views.ResetSimple", analyzerContext);
cmd->setAttribute(Command::CA_Hide); cmd->setAttribute(Command::CA_Hide);
viewsMenu->addAction(cmd, G_DEFAULT_THREE); viewsMenu->addAction(cmd, G_DEFAULT_THREE);
} }
......
...@@ -888,7 +888,7 @@ int BookmarkViewFactory::priority() const ...@@ -888,7 +888,7 @@ int BookmarkViewFactory::priority() const
Id BookmarkViewFactory::id() const Id BookmarkViewFactory::id() const
{ {
return Id("Bookmarks"); return "Bookmarks";
} }
QKeySequence BookmarkViewFactory::activationSequence() const QKeySequence BookmarkViewFactory::activationSequence() const
......
...@@ -89,7 +89,7 @@ int NavigationWidgetFactory::priority() const ...@@ -89,7 +89,7 @@ int NavigationWidgetFactory::priority() const
Core::Id NavigationWidgetFactory::id() const Core::Id NavigationWidgetFactory::id() const
{ {
return Core::Id("Class View"); return "Class View";
} }
QKeySequence NavigationWidgetFactory::activationSequence() const QKeySequence NavigationWidgetFactory::activationSequence() const
......
...@@ -207,7 +207,7 @@ bool CMakeProject::parseCMakeLists() ...@@ -207,7 +207,7 @@ bool CMakeProject::parseCMakeLists()
CMakeBuildConfiguration *activeBC = static_cast<CMakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration()); CMakeBuildConfiguration *activeBC = static_cast<CMakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration());
foreach (Core::IDocument *document, Core::EditorManager::documentModel()->openedDocuments()) foreach (Core::IDocument *document, Core::EditorManager::documentModel()->openedDocuments())
if (isProjectFile(document->filePath())) if (isProjectFile(document->filePath()))
document->infoBar()->removeInfo(Core::Id("CMakeEditor.RunCMake")); document->infoBar()->removeInfo("CMakeEditor.RunCMake");
// Find cbp file // Find cbp file
QString cbpFile = CMakeManager::findCbpFile(activeBC->buildDirectory().toString()); QString cbpFile = CMakeManager::findCbpFile(activeBC->buildDirectory().toString());
......
...@@ -237,9 +237,9 @@ int OpenEditorsViewFactory::priority() const ...@@ -237,9 +237,9 @@ int OpenEditorsViewFactory::priority() const
return 200; return 200;
} }
Core::Id OpenEditorsViewFactory::id() const Id OpenEditorsViewFactory::id() const
{ {
return Core::Id("Open Documents"); return "Open Documents";
} }
QKeySequence OpenEditorsViewFactory::activationSequence() const QKeySequence OpenEditorsViewFactory::activationSequence() const
......
...@@ -113,7 +113,7 @@ public: ...@@ -113,7 +113,7 @@ public:
~OpenEditorsViewFactory(); ~OpenEditorsViewFactory();
QString displayName() const; QString displayName() const;
int priority() const; int priority() const;
Core::Id id() const; Id id() const;
QKeySequence activationSequence() const; QKeySequence activationSequence() const;
Core::NavigationView createWidget(); Core::NavigationView createWidget();
}; };
......
...@@ -49,7 +49,7 @@ QStringList SystemEditor::mimeTypes() const ...@@ -49,7 +49,7 @@ QStringList SystemEditor::mimeTypes() const
Id SystemEditor::id() const Id SystemEditor::id() const
{ {
return Id("CorePlugin.OpenWithSystemEditor"); return "CorePlugin.OpenWithSystemEditor";
} }
QString SystemEditor::displayName() const QString SystemEditor::displayName() const
......
...@@ -805,7 +805,7 @@ void ExternalToolManager::setToolsByCategory(const QMap<QString, QList<Internal: ...@@ -805,7 +805,7 @@ void ExternalToolManager::setToolsByCategory(const QMap<QString, QList<Internal:
} }
qDeleteAll(m_tools); qDeleteAll(m_tools);
QMapIterator<QString, QAction *> remainingActions(m_actions); QMapIterator<QString, QAction *> remainingActions(m_actions);
const Id externalToolsPrefix = Id("Tools.External."); const Id externalToolsPrefix = "Tools.External.";
while (remainingActions.hasNext()) { while (remainingActions.hasNext()) {
remainingActions.next(); remainingActions.next();
ActionManager::unregisterAction(remainingActions.value(), ActionManager::unregisterAction(remainingActions.value(),
......
...@@ -348,7 +348,7 @@ void NavigationWidget::restoreSettings(QSettings *settings) ...@@ -348,7 +348,7 @@ void NavigationWidget::restoreSettings(QSettings *settings)
if (d->m_subWidgets.isEmpty()) if (d->m_subWidgets.isEmpty())
// Make sure we have at least the projects widget // 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()); setShown(settings->value(QLatin1String("Navigation/Visible"), true).toBool());
......
...@@ -242,7 +242,7 @@ void OutputPaneManager::init() ...@@ -242,7 +242,7 @@ void OutputPaneManager::init()
const int n = m_panes.size(); const int n = m_panes.size();
int shortcutNumber = 1; int shortcutNumber = 1;
const Id baseId = Id("QtCreator.Pane."); const Id baseId = "QtCreator.Pane.";
for (int i = 0; i != n; ++i) { for (int i = 0; i != n; ++i) {
IOutputPane *outPane = m_panes.at(i); IOutputPane *outPane = m_panes.at(i);
const int idx = m_outputWidgetPane->addWidget(outPane->outputWidget(this)); const int idx = m_outputWidgetPane->addWidget(outPane->outputWidget(this));
......
...@@ -334,7 +334,7 @@ void ProgressManagerPrivate::init() ...@@ -334,7 +334,7 @@ void ProgressManagerPrivate::init()
p.fill(Qt::transparent); p.fill(Qt::transparent);
toggleProgressView->setIcon(QIcon(p)); toggleProgressView->setIcon(QIcon(p));
Command *cmd = ActionManager::registerAction(toggleProgressView, Command *cmd = ActionManager::registerAction(toggleProgressView,
Id("QtCreator.ToggleProgressDetails"), "QtCreator.ToggleProgressDetails",
Context(Constants::C_GLOBAL)); Context(Constants::C_GLOBAL));
cmd->setDefaultKeySequence(QKeySequence(Utils::HostOsInfo::isMacHost() cmd->setDefaultKeySequence(QKeySequence(Utils::HostOsInfo::isMacHost()
? tr("Ctrl+Shift+0") ? tr("Ctrl+Shift+0")
......
...@@ -155,7 +155,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMe ...@@ -155,7 +155,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMe
Core::ActionManager::actionContainer(Core::Constants::M_TOOLS); Core::ActionManager::actionContainer(Core::Constants::M_TOOLS);
Core::ActionContainer *cpContainer = Core::ActionContainer *cpContainer =
Core::ActionManager::createMenu(Core::Id("CodePaster")); Core::ActionManager::createMenu("CodePaster");
cpContainer->menu()->setTitle(tr("&Code Pasting")); cpContainer->menu()->setTitle(tr("&Code Pasting"));
toolsContainer->addMenu(cpContainer); toolsContainer->addMenu(cpContainer);
......
...@@ -322,25 +322,24 @@ void DebuggerMainWindowPrivate::createViewsMenuItems() ...@@ -322,25 +322,24 @@ void DebuggerMainWindowPrivate::createViewsMenuItems()
// Add menu items // Add menu items
Command *cmd = 0; Command *cmd = 0;
cmd = Core::ActionManager::registerAction(openMemoryEditorAction, cmd = Core::ActionManager::registerAction(openMemoryEditorAction,
Core::Id("Debugger.Views.OpenMemoryEditor"), "Debugger.Views.OpenMemoryEditor", debugcontext);
debugcontext);
cmd->setAttribute(Command::CA_Hide); cmd->setAttribute(Command::CA_Hide);
m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE); m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
cmd = Core::ActionManager::registerAction(q->menuSeparator1(), cmd = Core::ActionManager::registerAction(q->menuSeparator1(),
Core::Id("Debugger.Views.Separator1"), debugcontext); "Debugger.Views.Separator1", debugcontext);
cmd->setAttribute(Command::CA_Hide); cmd->setAttribute(Command::CA_Hide);
m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE); m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
cmd = Core::ActionManager::registerAction(q->toggleLockedAction(), cmd = Core::ActionManager::registerAction(q->toggleLockedAction(),
Core::Id("Debugger.Views.ToggleLocked"), debugcontext); "Debugger.Views.ToggleLocked", debugcontext);
cmd->setAttribute(Command::CA_Hide); cmd->setAttribute(Command::CA_Hide);
m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE); m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
cmd = Core::ActionManager::registerAction(q->menuSeparator2(), cmd = Core::ActionManager::registerAction(q->menuSeparator2(),
Core::Id("Debugger.Views.Separator2"), debugcontext); "Debugger.Views.Separator2", debugcontext);
cmd->setAttribute(Command::CA_Hide); cmd->setAttribute(Command::CA_Hide);
m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE); m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
cmd = Core::ActionManager::registerAction(q->resetLayoutAction(), cmd = Core::ActionManager::registerAction(q->resetLayoutAction(),
Core::Id("Debugger.Views.ResetSimple"), debugcontext); "Debugger.Views.ResetSimple", debugcontext);
cmd->setAttribute(Command::CA_Hide); cmd->setAttribute(Command::CA_Hide);
m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE); m_viewsMenu->addAction(cmd, Core::Constants::G_DEFAULT_THREE);
} }
......
...@@ -70,7 +70,7 @@ void LldbOptionsPageWidget::load() ...@@ -70,7 +70,7 @@ void LldbOptionsPageWidget::load()
LldbOptionsPage::LldbOptionsPage() LldbOptionsPage::LldbOptionsPage()
{ {
// m_options->fromSettings(Core::ICore::settings()); // m_options->fromSettings(Core::ICore::settings());
setId(Core::Id("F.Lldb")); setId("F.Lldb");
setDisplayName(tr("LLDB")); setDisplayName(tr("LLDB"));
setCategory(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY); setCategory(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY));
......
...@@ -423,7 +423,7 @@ void FormEditorW::setupActions() ...@@ -423,7 +423,7 @@ void FormEditorW::setupActions()
// the 'Delete' key by event filter. Setting a shortcut triggers // the 'Delete' key by event filter. Setting a shortcut triggers
// buggy behaviour on Mac (Pressing Delete in QLineEdit removing the widget). // buggy behaviour on Mac (Pressing Delete in QLineEdit removing the widget).
Command *command; 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()); bindShortcut(command, m_fwm->actionDelete());
command->setAttribute(Command::CA_Hide); command->setAttribute(Command::CA_Hide);
medit->addAction(command, Core::Constants::G_EDIT_COPYPASTE); medit->addAction(command, Core::Constants::G_EDIT_COPYPASTE);
...@@ -434,74 +434,71 @@ void FormEditorW::setupActions() ...@@ -434,74 +434,71 @@ void FormEditorW::setupActions()
medit->addSeparator(m_contexts, Core::Constants::G_EDIT_OTHER); 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, createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
tr("Edit Widgets"), m_toolActionIds.back(), tr("Edit Widgets"), m_toolActionIds.back(),
EditModeWidgetEditor, QLatin1String("widgettool.png"), tr("F3")); 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, createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
tr("Edit Signals/Slots"), m_toolActionIds.back(), tr("Edit Signals/Slots"), m_toolActionIds.back(),
EditModeSignalsSlotEditor, QLatin1String("signalslottool.png"), tr("F4")); 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, createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
tr("Edit Buddies"), m_toolActionIds.back(), tr("Edit Buddies"), m_toolActionIds.back(),
EditModeBuddyEditor, QLatin1String("buddytool.png")); EditModeBuddyEditor, QLatin1String("buddytool.png"));
m_toolActionIds.push_back(Id("FormEditor.TabOrderEditor")); m_toolActionIds.push_back("FormEditor.TabOrderEditor");
createEditModeAction(m_actionGroupEditMode, m_contexts, medit, createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
tr("Edit Tab Order"), m_toolActionIds.back(), tr("Edit Tab Order"), m_toolActionIds.back(),
EditModeTabOrderEditor, QLatin1String("tabordertool.png")); EditModeTabOrderEditor, QLatin1String("tabordertool.png"));
//tool actions //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"); const QString horizLayoutShortcut = UseMacShortcuts ? tr("Meta+Shift+H") : tr("Ctrl+H");
addToolAction(m_fwm->actionHorizontalLayout(), m_contexts, addToolAction(m_fwm->actionHorizontalLayout(), m_contexts,
m_toolActionIds.back(), mformtools, horizLayoutShortcut); 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"); const QString vertLayoutShortcut = UseMacShortcuts ? tr("Meta+L") : tr("Ctrl+L");
addToolAction(m_fwm->actionVerticalLayout(), m_contexts, addToolAction(m_fwm->actionVerticalLayout(), m_contexts,
m_toolActionIds.back(), mformtools, vertLayoutShortcut); m_toolActionIds.back(), mformtools, vertLayoutShortcut);
m_toolActionIds.push_back(Id("FormEditor.SplitHorizontal")); m_toolActionIds.push_back("FormEditor.SplitHorizontal");
addToolAction(m_fwm->actionSplitHorizontal(), m_contexts, addToolAction(m_fwm->actionSplitHorizontal(), m_contexts,
m_toolActionIds.back(), mformtools); m_toolActionIds.back(), mformtools);
m_toolActionIds.push_back(Id("FormEditor.SplitVertical")); m_toolActionIds.push_back("FormEditor.SplitVertical");
addToolAction(m_fwm->actionSplitVertical(), m_contexts, addToolAction(m_fwm->actionSplitVertical(), m_contexts,
m_toolActionIds.back(), mformtools); m_toolActionIds.back(), mformtools);
m_toolActionIds.push_back(Id("FormEditor.LayoutForm")); m_toolActionIds.push_back("FormEditor.LayoutForm");
addToolAction(m_fwm->actionFormLayout(), m_contexts, addToolAction(m_fwm->actionFormLayout(), m_contexts,
m_toolActionIds.back(), mformtools); 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"); const QString gridShortcut = UseMacShortcuts ? tr("Meta+Shift+G") : tr("Ctrl+G");
addToolAction(m_fwm->actionGridLayout(), m_contexts, addToolAction(m_fwm->actionGridLayout(), m_contexts,
m_toolActionIds.back(), mformtools, gridShortcut); m_toolActionIds.back(), mformtools, gridShortcut);
m_toolActionIds.push_back(Id("FormEditor.LayoutBreak")); m_toolActionIds.push_back("FormEditor.LayoutBreak");
addToolAction(m_fwm->actionBreakLayout(), m_contexts, addToolAction(m_fwm->actionBreakLayout(), m_contexts,
m_toolActionIds.back(), mformtools); 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"); const QString adjustShortcut = UseMacShortcuts ? tr("Meta+J") : tr("Ctrl+J");
addToolAction(m_fwm->actionAdjustSize(), m_contexts, addToolAction(m_fwm->actionAdjustSize(), m_contexts,
m_toolActionIds.back(), mformtools, adjustShortcut); m_toolActionIds.back(), mformtools, adjustShortcut);
m_toolActionIds.push_back(Id("FormEditor.SimplifyLayout")); m_toolActionIds.push_back("FormEditor.SimplifyLayout");
addToolAction(m_fwm->actionSimplifyLayout(), m_contexts, addToolAction(m_fwm->actionSimplifyLayout(), m_contexts,
m_toolActionIds.back(), mformtools); m_toolActionIds.back(), mformtools);
mformtools->addSeparator(m_contexts); mformtools->addSeparator(m_contexts);
addToolAction(m_fwm->actionLower(), m_contexts, addToolAction(m_fwm->actionLower(), m_contexts, "FormEditor.Lower", mformtools);
Id("FormEditor.Lower"), mformtools); addToolAction(m_fwm->actionRaise(), m_contexts, "FormEditor.Raise", mformtools);
addToolAction(m_fwm->actionRaise(), m_contexts,
Id("FormEditor.Raise"), mformtools);
// Commands that do not go into the editor toolbar // Commands that do not go into the editor toolbar
mformtools->addSeparator(m_contexts); mformtools->addSeparator(m_contexts);
...@@ -512,8 +509,7 @@ void FormEditorW::setupActions() ...@@ -512,8 +509,7 @@ void FormEditorW::setupActions()
m_actionPreview = m_fwm->actionDefaultPreview(); m_actionPreview = m_fwm->actionDefaultPreview();
#endif #endif
QTC_ASSERT(m_actionPreview, return); QTC_ASSERT(m_actionPreview, return);
addToolAction(m_actionPreview, m_contexts, addToolAction(m_actionPreview, m_contexts, "FormEditor.Preview", mformtools, tr("Alt+Shift+R"));
Id("FormEditor.Preview"), mformtools, tr("Alt+Shift+R"));
// Preview in style... // Preview in style...
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
...@@ -538,8 +534,7 @@ void FormEditorW::setupActions() ...@@ -538,8 +534,7 @@ void FormEditorW::setupActions()
// Switch form/source in editor/design contexts. // Switch form/source in editor/design contexts.
Context switchContexts = m_contexts; Context switchContexts = m_contexts;
switchContexts.add(Core::Constants::C_EDITORMANAGER); switchContexts.add(Core::Constants::C_EDITORMANAGER);
addToolAction(m_actionSwitchSource, switchContexts, Id("FormEditor.FormSwitchSource"), mformtools, addToolAction(m_actionSwitchSource, switchContexts, "FormEditor.FormSwitchSource", mformtools, tr("Shift+F4"));
tr("Shift+F4"));
mformtools->addSeparator(m_contexts); mformtools->addSeparator(m_contexts);
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
...@@ -547,13 +542,12 @@ void FormEditorW::setupActions() ...@@ -547,13 +542,12 @@ void FormEditorW::setupActions()
#else #else
QAction *actionFormSettings = m_fwm->actionShowFormWindowSettingsDialog(); QAction *actionFormSettings = m_fwm->actionShowFormWindowSettingsDialog();
#endif #endif
addToolAction(actionFormSettings, m_contexts, Id("FormEditor.FormSettings"), mformtools); addToolAction(actionFormSettings, m_contexts, "FormEditor.FormSettings", mformtools);
mformtools->addSeparator(m_contexts); mformtools->addSeparator(m_contexts);
m_actionAboutPlugins = new QAction(tr("About Qt Designer Plugins..."), this); m_actionAboutPlugins = new QAction(tr("About Qt Designer Plugins..."), this);
m_actionAboutPlugins->setMenuRole(QAction::NoRole); m_actionAboutPlugins->setMenuRole(QAction::NoRole);
addToolAction(m_actionAboutPlugins, m_contexts, addToolAction(m_actionAboutPlugins, m_contexts, "FormEditor.AboutPlugins", mformtools);
Id("FormEditor.AboutPlugins"), mformtools);
connect(m_actionAboutPlugins, SIGNAL(triggered()), m_fwm, connect(m_actionAboutPlugins, SIGNAL(triggered()), m_fwm,
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
SLOT(showPluginDialog()) SLOT(showPluginDialog())
......
...@@ -1087,7 +1087,7 @@ bool FakeVimPluginPrivate::initialize() ...@@ -1087,7 +1087,7 @@ bool FakeVimPluginPrivate::initialize()
ActionManager::actionContainer(Core::Constants::M_EDIT_ADVANCED); ActionManager::actionContainer(Core::Constants::M_EDIT_ADVANCED);
advancedMenu->addAction(cmd, Core::Constants::G_EDIT_EDITOR); 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) { for (int i = 1; i < 10; ++i) {
QAction *act = new QAction(this); QAction *act = new QAction(this);
act->setText(tr("Execute User Action #%1").arg(i)); act->setText(tr("Execute User Action #%1").arg(i));
......
This diff is collapsed.
...@@ -1048,10 +1048,10 @@ Utils::StyledBar *HelpPlugin::createIconToolBar(bool external) ...@@ -1048,10 +1048,10 @@ Utils::StyledBar *HelpPlugin::createIconToolBar(bool external)
tr("Add Bookmark"), toolBar); tr("Add Bookmark"), toolBar);
connect(bookmark, SIGNAL(triggered()), this, SLOT(addBookmark())); connect(bookmark, SIGNAL(triggered()), this, SLOT(addBookmark()));
} else { } else {
home = Core::ActionManager::command(Core::Id("Help.Home"))->action(); home = Core::ActionManager::command("Help.Home")->action();
back = Core::ActionManager::command(Core::Id("Help.Previous"))->action(); back = Core::ActionManager::command("Help.Previous")->action();
next = Core::ActionManager::command(Core::Id("Help.Next"))->action(); next = Core::ActionManager::command("Help.Next")->action();
bookmark = Core::ActionManager::command(Core::Id("Help.AddBookmark"))->action(); bookmark = Core::ActionManager::command("Help.AddBookmark")->action();
} }
setupNavigationMenus(back, next, toolBar); setupNavigationMenus(back, next, toolBar);
......
...@@ -113,7 +113,7 @@ void MaddeQemuStartStep::ctor() ...@@ -113,7 +113,7 @@ void MaddeQemuStartStep::ctor()
Core::Id MaddeQemuStartStep::stepId() Core::Id MaddeQemuStartStep::stepId()
{ {
return Core::Id("Madde.MaddeQemuCheckStep"); return "Madde.MaddeQemuCheckStep";
} }
QString MaddeQemuStartStep::stepDisplayName() QString MaddeQemuStartStep::stepDisplayName()
......
...@@ -143,7 +143,7 @@ bool MaemoUploadAndInstallPackageStep::initInternal(QString *error) ...@@ -143,7 +143,7 @@ bool MaemoUploadAndInstallPackageStep::initInternal(QString *error)
Core::Id MaemoUploadAndInstallPackageStep::stepId() Core::Id MaemoUploadAndInstallPackageStep::stepId()
{ {
return Core::Id("MaemoUploadAndInstallDpkgPackageStep"); return "MaemoUploadAndInstallDpkgPackageStep";
} }
QString MaemoUploadAndInstallPackageStep::displayName() QString MaemoUploadAndInstallPackageStep::displayName()
......
...@@ -410,7 +410,7 @@ bool MaemoInstallPackageViaMountStep::initInternal(QString *error) ...@@ -410,7 +410,7 @@ bool MaemoInstallPackageViaMountStep::initInternal(QString *error)
Core::Id MaemoInstallPackageViaMountStep::stepId() Core::Id MaemoInstallPackageViaMountStep::stepId()
{ {
return Core::Id("MaemoMountAndInstallDeployStep"); return "MaemoMountAndInstallDeployStep";
} }
QString MaemoInstallPackageViaMountStep::displayName() QString MaemoInstallPackageViaMountStep::displayName()
...@@ -451,7 +451,7 @@ bool MaemoCopyFilesViaMountStep::initInternal(QString *error) ...@@ -451,7 +451,7 @@ bool MaemoCopyFilesViaMountStep::initInternal(QString *error)
Core::Id MaemoCopyFilesViaMountStep::stepId() Core::Id MaemoCopyFilesViaMountStep::stepId()
{ {
return Core::Id("MaemoMountAndCopyDeployStep"); return "MaemoMountAndCopyDeployStep";
} }
QString MaemoCopyFilesViaMountStep::displayName() QString MaemoCopyFilesViaMountStep::displayName()
......
...@@ -242,7 +242,7 @@ QStringList MaemoInstallDebianPackageToSysrootStep::madArguments() const ...@@ -242,7 +242,7 @@ QStringList MaemoInstallDebianPackageToSysrootStep::madArguments() const
} }
const Core::Id MaemoInstallDebianPackageToSysrootStep::Id const Core::Id MaemoInstallDebianPackageToSysrootStep::Id
= Core::Id(