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()
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);
}
......
......@@ -888,7 +888,7 @@ int BookmarkViewFactory::priority() const
Id BookmarkViewFactory::id() const
{
return Id("Bookmarks");
return "Bookmarks";
}
QKeySequence BookmarkViewFactory::activationSequence() const
......
......@@ -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
......
......@@ -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());
......
......@@ -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
......
......@@ -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();
};
......
......@@ -49,7 +49,7 @@ QStringList SystemEditor::mimeTypes() const
Id SystemEditor::id() const
{
return Id("CorePlugin.OpenWithSystemEditor");
return "CorePlugin.OpenWithSystemEditor";
}
QString SystemEditor::displayName() const
......
......@@ -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(),
......
......@@ -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());
......
......@@ -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));
......
......@@ -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")
......
......@@ -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);
......
......@@ -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);
}
......
......@@ -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));
......
......@@ -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())
......
......@@ -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));
......
This diff is collapsed.
......@@ -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);
......
......@@ -113,7 +113,7 @@ void MaddeQemuStartStep::ctor()
Core::Id MaddeQemuStartStep::stepId()
{
return Core::Id("Madde.MaddeQemuCheckStep");
return "Madde.MaddeQemuCheckStep";
}
QString MaddeQemuStartStep::stepDisplayName()
......
......@@ -143,7 +143,7 @@ bool MaemoUploadAndInstallPackageStep::initInternal(QString *error)
Core::Id MaemoUploadAndInstallPackageStep::stepId()
{
return Core::Id("MaemoUploadAndInstallDpkgPackageStep");
return "MaemoUploadAndInstallDpkgPackageStep";
}
QString MaemoUploadAndInstallPackageStep::displayName()
......
......@@ -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()
......
......@@ -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");
......
......@@ -257,7 +257,7 @@ MaemoDebianPackageCreationStep::MaemoDebianPackageCreationStep(BuildStepList *bs
}
const Core::Id MaemoDebianPackageCreationStep::CreatePackageId
= Core::Id("MaemoDebianPackageCreationStep");
= "MaemoDebianPackageCreationStep";
MaemoDebianPackageCreationStep::MaemoDebianPackageCreationStep(BuildStepList *buildConfig,
MaemoDebianPackageCreationStep *other)
......
......@@ -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)
......
......@@ -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"));
......
......@@ -100,7 +100,7 @@ BuildStepConfigWidget *DeviceCheckBuildStep::createConfigWidget()
Core::Id DeviceCheckBuildStep::stepId()
{
return Core::Id("ProjectExplorer.DeviceCheckBuildStep");
return "ProjectExplorer.DeviceCheckBuildStep";
}
QString DeviceCheckBuildStep::stepDisplayName()
......
......@@ -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"); }
......
......@@ -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
......
......@@ -420,7 +420,7 @@ int ProjectTreeWidgetFactory::priority() const
Id ProjectTreeWidgetFactory::id() const
{
return Id("Projects");
return "Projects";
}
QKeySequence ProjectTreeWidgetFactory::activationSequence() const
......
......@@ -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);