Use Core::Id in project-related objects

Use Core::Id for all the project related objects in favor of plain
QStrings.

Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

14 files changed, 105 insertions, 97 deletions

diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
index c0146d2896..fb79ca1fb1 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
@@ -84,12 +84,12 @@ QList<ProjectExplorer::Abi> DesktopQtVersion::detectQtAbis() const
     return qtAbisFromLibrary(qtCorePath(versionInfo(), qtVersionString()));
 }
 
-bool DesktopQtVersion::supportsTargetId(const QString &id) const
+bool DesktopQtVersion::supportsTargetId(Core::Id id) const
 {
     using namespace ProjectExplorer;
-    if (id == QLatin1String(Constants::DESKTOP_TARGET_ID))
+    if (id == Core::Id(Constants::DESKTOP_TARGET_ID))
         return true;
-    if (id == QLatin1String("RemoteLinux.EmbeddedLinuxTarget")) {
+    if (id == Core::Id("RemoteLinux.EmbeddedLinuxTarget")) {
         foreach (const Abi &abi, qtAbis()) {
             switch (abi.os()) {
             case Abi::BsdOS: case Abi::LinuxOS: case Abi::MacOS: case Abi::UnixOS:
@@ -102,9 +102,9 @@ bool DesktopQtVersion::supportsTargetId(const QString &id) const
     return false;
 }
 
-QSet<QString> DesktopQtVersion::supportedTargetIds() const
+QSet<Core::Id> DesktopQtVersion::supportedTargetIds() const
 {
-    return QSet<QString>() << QLatin1String(Constants::DESKTOP_TARGET_ID);
+    return QSet<Core::Id>() << Core::Id(Constants::DESKTOP_TARGET_ID);
 }
 
 QString DesktopQtVersion::description() const
diff --git a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.h b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.h
index 491ebcd717..638dd2dac0 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.h
+++ b/src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.h
@@ -53,8 +53,8 @@ public:
 
     QList<ProjectExplorer::Abi> detectQtAbis() const;
 
-    bool supportsTargetId(const QString &id) const;
-    QSet<QString> supportedTargetIds() const;
+    bool supportsTargetId(Core::Id id) const;
+    QSet<Core::Id> supportedTargetIds() const;
 
     QString description() const;
 
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp
index e79bc1c93b..55137a4243 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.cpp
@@ -43,7 +43,7 @@
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
 
-Qt4DesktopTarget::Qt4DesktopTarget(Qt4Project *parent, const QString &id) :
+Qt4DesktopTarget::Qt4DesktopTarget(Qt4Project *parent, const Core::Id id) :
     Qt4BaseTarget(parent, id),
     m_buildConfigurationFactory(new Qt4BuildConfigurationFactory(this))
 {
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.h b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.h
index 3033472958..e572c979df 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.h
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptarget.h
@@ -47,16 +47,15 @@ class Qt4DesktopTarget : public Qt4BaseTarget
     friend class Qt4DesktopTargetFactory;
     Q_OBJECT
 public:
-    explicit Qt4DesktopTarget(Qt4Project *parent, const QString &id);
-    virtual ~Qt4DesktopTarget();
+    Qt4DesktopTarget(Qt4Project *parent, const Core::Id id);
+    ~Qt4DesktopTarget();
 
+    static QString defaultDisplayName();
     ProjectExplorer::IBuildConfigurationFactory *buildConfigurationFactory() const;
 
     void createApplicationProFiles(bool reparse);
     QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Node *n);
 
-    static QString defaultDisplayName();
-
 private:
     Qt4BuildConfigurationFactory *m_buildConfigurationFactory;
 };
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
index 7e49cce939..a4e095e408 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
@@ -64,38 +64,38 @@ Qt4DesktopTargetFactory::~Qt4DesktopTargetFactory()
 {
 }
 
-bool Qt4DesktopTargetFactory::supportsTargetId(const QString &id) const
+bool Qt4DesktopTargetFactory::supportsTargetId(const Core::Id id) const
 {
-    return id == QLatin1String(Constants::DESKTOP_TARGET_ID);
+    return id == Core::Id(Constants::DESKTOP_TARGET_ID);
 }
 
-QStringList Qt4DesktopTargetFactory::supportedTargetIds() const
+QList<Core::Id> Qt4DesktopTargetFactory::supportedTargetIds() const
 {
-    return QStringList(QLatin1String(Constants::DESKTOP_TARGET_ID));
+    return QList<Core::Id>() << Core::Id(Constants::DESKTOP_TARGET_ID);
 }
 
-QString Qt4DesktopTargetFactory::displayNameForId(const QString &id) const
+QString Qt4DesktopTargetFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(Constants::DESKTOP_TARGET_ID))
+    if (id == Core::Id(Constants::DESKTOP_TARGET_ID))
         return Qt4DesktopTarget::defaultDisplayName();
     return QString();
 }
 
-QString Qt4DesktopTargetFactory::buildNameForId(const QString &id) const
+QString Qt4DesktopTargetFactory::buildNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(Constants::DESKTOP_TARGET_ID))
+    if (id == Core::Id(Constants::DESKTOP_TARGET_ID))
         return QLatin1String("desktop");
     return QString();
 }
 
-QIcon Qt4DesktopTargetFactory::iconForId(const QString &id) const
+QIcon Qt4DesktopTargetFactory::iconForId(const Core::Id id) const
 {
-    if (id == QLatin1String(Constants::DESKTOP_TARGET_ID))
+    if (id == Core::Id(Constants::DESKTOP_TARGET_ID))
         return qApp->style()->standardIcon(QStyle::SP_ComputerIcon);
     return QIcon();
 }
 
-bool Qt4DesktopTargetFactory::canCreate(ProjectExplorer::Project *parent, const QString &id) const
+bool Qt4DesktopTargetFactory::canCreate(ProjectExplorer::Project *parent, const Core::Id id) const
 {
     if (!qobject_cast<Qt4Project *>(parent))
         return false;
@@ -115,7 +115,7 @@ ProjectExplorer::Target  *Qt4DesktopTargetFactory::restore(ProjectExplorer::Proj
         return 0;
 
     Qt4Project *qt4project = static_cast<Qt4Project *>(parent);
-    Qt4DesktopTarget *target = new Qt4DesktopTarget(qt4project, QLatin1String("transient ID"));
+    Qt4DesktopTarget *target = new Qt4DesktopTarget(qt4project, idFromMap(map));
 
     if (target->fromMap(map))
         return target;
@@ -123,7 +123,7 @@ ProjectExplorer::Target  *Qt4DesktopTargetFactory::restore(ProjectExplorer::Proj
     return 0;
 }
 
-Qt4TargetSetupWidget *Qt4DesktopTargetFactory::createTargetSetupWidget(const QString &id, const QString &proFilePath,
+Qt4TargetSetupWidget *Qt4DesktopTargetFactory::createTargetSetupWidget(const Core::Id id, const QString &proFilePath,
                                                                        const QtSupport::QtVersionNumber &minimumQtVersion,
                                                                        const QtSupport::QtVersionNumber &maximumQtVersion,
                                                                        const Core::FeatureSet &requiredFeatures,
@@ -145,7 +145,7 @@ Qt4TargetSetupWidget *Qt4DesktopTargetFactory::createTargetSetupWidget(const QSt
     return widget;
 }
 
-ProjectExplorer::Target *Qt4DesktopTargetFactory::create(ProjectExplorer::Project *parent, const QString &id)
+ProjectExplorer::Target *Qt4DesktopTargetFactory::create(ProjectExplorer::Project *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -164,8 +164,9 @@ ProjectExplorer::Target *Qt4DesktopTargetFactory::create(ProjectExplorer::Projec
     return create(parent, id, infos);
 }
 
-QSet<QString> Qt4DesktopTargetFactory::targetFeatures(const QString & /*id*/) const
+QSet<QString> Qt4DesktopTargetFactory::targetFeatures(const Core::Id id) const
 {
+    Q_UNUSED(id);
     QSet<QString> features;
     features << QLatin1String(Constants::DESKTOP_TARGETFEATURE_ID);
     features << QLatin1String(Constants::SHADOWBUILD_TARGETFEATURE_ID);
@@ -173,7 +174,7 @@ QSet<QString> Qt4DesktopTargetFactory::targetFeatures(const QString & /*id*/) co
     return features;
 }
 
-ProjectExplorer::Target *Qt4DesktopTargetFactory::create(ProjectExplorer::Project *parent, const QString &id, const QList<BuildConfigurationInfo> &infos)
+ProjectExplorer::Target *Qt4DesktopTargetFactory::create(ProjectExplorer::Project *parent, const Core::Id id, const QList<BuildConfigurationInfo> &infos)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -186,7 +187,7 @@ ProjectExplorer::Target *Qt4DesktopTargetFactory::create(ProjectExplorer::Projec
                                     info.version(), info.buildConfig,
                                     info.additionalArguments, info.directory, info.importing);
 
-    t->addDeployConfiguration(t->createDeployConfiguration(QLatin1String(ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID)));
+    t->addDeployConfiguration(t->createDeployConfiguration(Core::Id(ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID)));
 
     t->createApplicationProFiles(false);
 
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
index 4ad88fa13f..be5ced77fa 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
@@ -44,26 +44,27 @@ public:
     Qt4DesktopTargetFactory(QObject *parent = 0);
     ~Qt4DesktopTargetFactory();
 
-    QStringList supportedTargetIds() const;
-    QString displayNameForId(const QString &id) const;
-    QIcon iconForId(const QString &id) const;
+    QList<Core::Id> supportedTargetIds() const;
+    QString displayNameForId(const Core::Id id) const;
+    QIcon iconForId(const Core::Id id) const;
 
-    bool canCreate(ProjectExplorer::Project *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::Project *parent, const Core::Id id) const;
     bool canRestore(ProjectExplorer::Project *parent, const QVariantMap &map) const;
     ProjectExplorer::Target  *restore(ProjectExplorer::Project *parent, const QVariantMap &map);
 
-    virtual bool supportsTargetId(const QString &id) const;
+    virtual bool supportsTargetId(const Core::Id id) const;
 
-    Qt4TargetSetupWidget *createTargetSetupWidget(const QString &id, const QString &proFilePath,
+    Qt4TargetSetupWidget *createTargetSetupWidget(const Core::Id id, const QString &proFilePath,
                                                   const QtSupport::QtVersionNumber &minimumQtVersion,
                                                   const QtSupport::QtVersionNumber &maximumQtVersion,
                                                   const Core::FeatureSet &requiredFeatures,
                                                   bool importEnabled, QList<BuildConfigurationInfo> importInfos);
-    QString buildNameForId(const QString &id) const;
-    QSet<QString> targetFeatures(const QString &id) const;
+    QString buildNameForId(const Core::Id id) const;
+    QSet<QString> targetFeatures(const Core::Id id) const;
 
-    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id);
-    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id, const QList<BuildConfigurationInfo> &infos);
+    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const Core::Id id);
+    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const Core::Id id,
+                                    const QList<BuildConfigurationInfo> &infos);
 };
 }
 }
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index cc61c89869..d706a46efc 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -87,11 +87,13 @@ const char * const USER_ENVIRONMENT_CHANGES_KEY("Qt4ProjectManager.Qt4RunConfigu
 const char * const BASE_ENVIRONMENT_BASE_KEY("Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase");
 const char * const USER_WORKING_DIRECTORY_KEY("Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory");
 
-QString pathFromId(const QString &id)
+QString pathFromId(Core::Id id)
 {
-    if (!id.startsWith(QLatin1String(QT4_RC_PREFIX)))
+    QString idstr = QString::fromUtf8(id.name());
+    const QString prefix = QLatin1String(QT4_RC_PREFIX);
+    if (!idstr.startsWith(prefix))
         return QString();
-    return id.mid(QString::fromLatin1(QT4_RC_PREFIX).size());
+    return idstr.mid(prefix.size());
 }
 
 } // namespace
@@ -101,7 +103,7 @@ QString pathFromId(const QString &id)
 //
 
 Qt4RunConfiguration::Qt4RunConfiguration(Qt4BaseTarget *parent, const QString &proFilePath) :
-    LocalApplicationRunConfiguration(parent, QLatin1String(QT4_RC_ID)),
+    LocalApplicationRunConfiguration(parent, Core::Id(QT4_RC_ID)),
     m_proFilePath(proFilePath),
     m_runMode(Gui),
     m_isUsingDyldImageSuffix(false),
@@ -246,7 +248,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
     m_useTerminalCheck = new QCheckBox(tr("Run in terminal"), this);
     m_useTerminalCheck->setChecked(m_qt4RunConfiguration->runMode() == ProjectExplorer::LocalApplicationRunConfiguration::Console);
     toplayout->addRow(QString(), m_useTerminalCheck);
-    m_useTerminalCheck->setVisible(qt4RunConfiguration->target()->id() != QLatin1String(Constants::QT_SIMULATOR_TARGET_ID));
+    m_useTerminalCheck->setVisible(qt4RunConfiguration->target()->id() != Core::Id(Constants::QT_SIMULATOR_TARGET_ID));
 
 #ifdef Q_OS_MAC
     m_usingDyldImageSuffix = new QCheckBox(tr("Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)"), this);
@@ -708,18 +710,18 @@ Qt4RunConfigurationFactory::~Qt4RunConfigurationFactory()
 {
 }
 
-bool Qt4RunConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const QString &id) const
+bool Qt4RunConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const Core::Id id) const
 {
     Qt4BaseTarget *t = qobject_cast<Qt4BaseTarget *>(parent);
     if (!t)
         return false;
-    if (t->id() != QLatin1String(Constants::DESKTOP_TARGET_ID)
-            && t->id() != QLatin1String(Constants::QT_SIMULATOR_TARGET_ID))
+    if (t->id() != Core::Id(Constants::DESKTOP_TARGET_ID)
+            && t->id() != Core::Id(Constants::QT_SIMULATOR_TARGET_ID))
         return false;
     return t->qt4Project()->hasApplicationProFile(pathFromId(id));
 }
 
-ProjectExplorer::RunConfiguration *Qt4RunConfigurationFactory::create(ProjectExplorer::Target *parent, const QString &id)
+ProjectExplorer::RunConfiguration *Qt4RunConfigurationFactory::create(ProjectExplorer::Target *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -731,10 +733,10 @@ bool Qt4RunConfigurationFactory::canRestore(ProjectExplorer::Target *parent, con
 {
     if (!qobject_cast<Qt4BaseTarget *>(parent))
         return false;
-    if (parent->id() != QLatin1String(Constants::DESKTOP_TARGET_ID)
-            && parent->id() != QLatin1String(Constants::QT_SIMULATOR_TARGET_ID))
+    if (parent->id() != Core::Id(Constants::DESKTOP_TARGET_ID)
+            && parent->id() != Core::Id(Constants::QT_SIMULATOR_TARGET_ID))
         return false;
-    QString id(ProjectExplorer::idFromMap(map));
+    QString id = QString::fromLatin1(ProjectExplorer::idFromMap(map).name());
     return id.startsWith(QLatin1String(QT4_RC_ID));
 }
 
@@ -765,18 +767,22 @@ ProjectExplorer::RunConfiguration *Qt4RunConfigurationFactory::clone(ProjectExpl
     return new Qt4RunConfiguration(t, old);
 }
 
-QStringList Qt4RunConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
+QList<Core::Id> Qt4RunConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
 {
+    QList<Core::Id> result;
     Qt4BaseTarget *t = qobject_cast<Qt4BaseTarget *>(parent);
     if (!t)
-        return QStringList();
-    if (t->id() != QLatin1String(Constants::DESKTOP_TARGET_ID)
-        && t->id() != QLatin1String(Constants::QT_SIMULATOR_TARGET_ID))
-        return QStringList();
-    return t->qt4Project()->applicationProFilePathes(QLatin1String(QT4_RC_PREFIX));
+        return result;
+    if (t->id() != Core::Id(Constants::DESKTOP_TARGET_ID)
+            && t->id() != Core::Id(Constants::QT_SIMULATOR_TARGET_ID))
+        return result;
+    QStringList proFiles = t->qt4Project()->applicationProFilePathes(QLatin1String(QT4_RC_PREFIX));
+    foreach (const QString &pf, proFiles)
+        result << Core::Id(pf.toUtf8().constData());
+    return result;
 }
 
-QString Qt4RunConfigurationFactory::displayNameForId(const QString &id) const
+QString Qt4RunConfigurationFactory::displayNameForId(const Core::Id id) const
 {
     return QFileInfo(pathFromId(id)).completeBaseName();
 }
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
index 062b013d4f..bc8dd4c332 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.h
@@ -213,15 +213,15 @@ public:
     explicit Qt4RunConfigurationFactory(QObject *parent = 0);
     virtual ~Qt4RunConfigurationFactory();
 
-    virtual bool canCreate(ProjectExplorer::Target *parent, const QString &id) const;
-    virtual ProjectExplorer::RunConfiguration *create(ProjectExplorer::Target *parent, const QString &id);
+    virtual bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
+    virtual ProjectExplorer::RunConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id);
     virtual bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
     virtual ProjectExplorer::RunConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map);
     virtual bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const;
     virtual ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source);
 
-    QStringList availableCreationIds(ProjectExplorer::Target *parent) const;
-    QString displayNameForId(const QString &id) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
+    QString displayNameForId(const Core::Id id) const;
 };
 
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp
index dbf820d06c..0c695af87c 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.cpp
@@ -48,7 +48,7 @@ using namespace Qt4ProjectManager::Internal;
 // Qt4Target
 // -------------------------------------------------------------------------
 
-Qt4SimulatorTarget::Qt4SimulatorTarget(Qt4Project *parent, const QString &id) :
+Qt4SimulatorTarget::Qt4SimulatorTarget(Qt4Project *parent, const Core::Id id) :
     Qt4BaseTarget(parent, id),
     m_buildConfigurationFactory(new Qt4BuildConfigurationFactory(this))
 {
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.h b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.h
index e3a43b56df..0815c724fc 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.h
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortarget.h
@@ -47,8 +47,8 @@ class Qt4SimulatorTarget : public Qt4BaseTarget
     friend class Qt4SimulatorTargetFactory;
     Q_OBJECT
 public:
-    explicit Qt4SimulatorTarget(Qt4Project *parent, const QString &id);
-    virtual ~Qt4SimulatorTarget();
+    Qt4SimulatorTarget(Qt4Project *parent, const Core::Id id);
+    ~Qt4SimulatorTarget();
 
     ProjectExplorer::IBuildConfigurationFactory *buildConfigurationFactory() const;
 
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
index 0f70c0aa38..3daacc4e57 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
@@ -64,38 +64,38 @@ Qt4SimulatorTargetFactory::~Qt4SimulatorTargetFactory()
 {
 }
 
-bool Qt4SimulatorTargetFactory::supportsTargetId(const QString &id) const
+bool Qt4SimulatorTargetFactory::supportsTargetId(const Core::Id id) const
 {
-    return id == QLatin1String(Constants::QT_SIMULATOR_TARGET_ID);
+    return id == Core::Id(Constants::QT_SIMULATOR_TARGET_ID);
 }
 
-QStringList Qt4SimulatorTargetFactory::supportedTargetIds() const
+QList<Core::Id> Qt4SimulatorTargetFactory::supportedTargetIds() const
 {
-    return QStringList() << QLatin1String(Constants::QT_SIMULATOR_TARGET_ID);
+    return QList<Core::Id>() << Core::Id(Constants::QT_SIMULATOR_TARGET_ID);
 }
 
-QString Qt4SimulatorTargetFactory::displayNameForId(const QString &id) const
+QString Qt4SimulatorTargetFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(Constants::QT_SIMULATOR_TARGET_ID))
+    if (id == Core::Id(Constants::QT_SIMULATOR_TARGET_ID))
         return Qt4SimulatorTarget::defaultDisplayName();
     return QString();
 }
 
-QIcon Qt4SimulatorTargetFactory::iconForId(const QString &id) const
+QIcon Qt4SimulatorTargetFactory::iconForId(const Core::Id id) const
 {
-    if (id == QLatin1String(Constants::QT_SIMULATOR_TARGET_ID))
+    if (id == Core::Id(Constants::QT_SIMULATOR_TARGET_ID))
         return QIcon(QLatin1String(":/projectexplorer/images/SymbianEmulator.png"));
     return QIcon();
 }
 
-QString Qt4SimulatorTargetFactory::buildNameForId(const QString &id) const
+QString Qt4SimulatorTargetFactory::buildNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(Constants::QT_SIMULATOR_TARGET_ID))
+    if (id == Core::Id(Constants::QT_SIMULATOR_TARGET_ID))
         return QLatin1String("simulator");
     return QString();
 }
 
-bool Qt4SimulatorTargetFactory::canCreate(ProjectExplorer::Project *parent, const QString &id) const
+bool Qt4SimulatorTargetFactory::canCreate(ProjectExplorer::Project *parent, const Core::Id id) const
 {
     if (!qobject_cast<Qt4Project *>(parent))
         return false;
@@ -115,14 +115,14 @@ ProjectExplorer::Target *Qt4SimulatorTargetFactory::restore(ProjectExplorer::Pro
         return 0;
 
     Qt4Project *qt4project = static_cast<Qt4Project *>(parent);
-    Qt4SimulatorTarget *target = new Qt4SimulatorTarget(qt4project, QLatin1String("transient ID"));
+    Qt4SimulatorTarget *target = new Qt4SimulatorTarget(qt4project, idFromMap(map));
     if (target->fromMap(map))
         return target;
     delete target;
     return 0;
 }
 
-QSet<QString> Qt4SimulatorTargetFactory::targetFeatures(const QString & /*id*/) const
+QSet<QString> Qt4SimulatorTargetFactory::targetFeatures(const Core::Id /*id*/) const
 {
     QSet<QString> features;
 
@@ -132,7 +132,7 @@ QSet<QString> Qt4SimulatorTargetFactory::targetFeatures(const QString & /*id*/)
     return features;
 }
 
-ProjectExplorer::Target *Qt4SimulatorTargetFactory::create(ProjectExplorer::Project *parent, const QString &id)
+ProjectExplorer::Target *Qt4SimulatorTargetFactory::create(ProjectExplorer::Project *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -150,7 +150,8 @@ ProjectExplorer::Target *Qt4SimulatorTargetFactory::create(ProjectExplorer::Proj
     return create(parent, id, infos);
 }
 
-ProjectExplorer::Target *Qt4SimulatorTargetFactory::create(ProjectExplorer::Project *parent, const QString &id, const QList<BuildConfigurationInfo> &infos)
+ProjectExplorer::Target *Qt4SimulatorTargetFactory::create(ProjectExplorer::Project *parent, const Core::Id id,
+                                                           const QList<BuildConfigurationInfo> &infos)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -162,7 +163,7 @@ ProjectExplorer::Target *Qt4SimulatorTargetFactory::create(ProjectExplorer::Proj
         t->addQt4BuildConfiguration(msgBuildConfigurationName(info), QString(), info.version(), info.buildConfig,
                                     info.additionalArguments, info.directory, info.importing);
 
-    t->addDeployConfiguration(t->createDeployConfiguration(QLatin1String(ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID)));
+    t->addDeployConfiguration(t->createDeployConfiguration(Core::Id(ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID)));
 
     t->createApplicationProFiles(false);
 
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
index 200ea73c2a..8c0f96f9e2 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
@@ -45,22 +45,22 @@ public:
     Qt4SimulatorTargetFactory(QObject *parent = 0);
     ~Qt4SimulatorTargetFactory();
 
-    bool supportsTargetId(const QString &id);
+    bool supportsTargetId(const Core::Id id) const;
 
-    QStringList supportedTargetIds() const;
-    QString displayNameForId(const QString &id) const;
-    QIcon iconForId(const QString &id) const;
+    QList<Core::Id> supportedTargetIds() const;
+    QString displayNameForId(const Core::Id id) const;
+    QIcon iconForId(const Core::Id id) const;
 
-    bool canCreate(ProjectExplorer::Project *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::Project *parent, const Core::Id id) const;
     bool canRestore(ProjectExplorer::Project *parent, const QVariantMap &map) const;
     ProjectExplorer::Target *restore(ProjectExplorer::Project *parent, const QVariantMap &map);
 
-    bool supportsTargetId(const QString &id) const;
-    QSet<QString> targetFeatures(const QString &id) const;
+    QSet<QString> targetFeatures(const Core::Id id) const;
 
-    QString buildNameForId(const QString &id) const;
-    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id);
-    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id, const QList<BuildConfigurationInfo> &infos);
+    QString buildNameForId(const Core::Id id) const;
+    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const Core::Id id);
+    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const Core::Id id,
+                                    const QList<BuildConfigurationInfo> &infos);
 };
 
 }
diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
index ed8eaf2dc6..0223785ff6 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
@@ -85,14 +85,14 @@ QList<ProjectExplorer::Abi> SimulatorQtVersion::detectQtAbis() const
     return qtAbisFromLibrary(qtCorePath(versionInfo(), qtVersionString()));
 }
 
-bool SimulatorQtVersion::supportsTargetId(const QString &id) const
+bool SimulatorQtVersion::supportsTargetId(Core::Id id) const
 {
-    return id == QLatin1String(Constants::QT_SIMULATOR_TARGET_ID);
+    return id == Core::Id(Constants::QT_SIMULATOR_TARGET_ID);
 }
 
-QSet<QString> SimulatorQtVersion::supportedTargetIds() const
+QSet<Core::Id> SimulatorQtVersion::supportedTargetIds() const
 {
-    return QSet<QString>() << QLatin1String(Constants::QT_SIMULATOR_TARGET_ID);
+    return QSet<Core::Id>() << Core::Id(Constants::QT_SIMULATOR_TARGET_ID);
 }
 
 QString SimulatorQtVersion::description() const
diff --git a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h
index 06c9d3a166..eea7ea91a1 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h
+++ b/src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h
@@ -53,8 +53,8 @@ public:
 
     QList<ProjectExplorer::Abi> detectQtAbis() const;
 
-    bool supportsTargetId(const QString &id) const;
-    QSet<QString> supportedTargetIds() const;
+    bool supportsTargetId(Core::Id id) const;
+    QSet<Core::Id> supportedTargetIds() const;
 
     QString description() const;