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>

31 files changed, 111 insertions, 104 deletions

diff --git a/src/plugins/remotelinux/abstractembeddedlinuxtarget.cpp b/src/plugins/remotelinux/abstractembeddedlinuxtarget.cpp
index 78f7eb775b..dd3f4c1fbb 100644
--- a/src/plugins/remotelinux/abstractembeddedlinuxtarget.cpp
+++ b/src/plugins/remotelinux/abstractembeddedlinuxtarget.cpp
@@ -41,7 +41,7 @@ using namespace Qt4ProjectManager;
 
 namespace RemoteLinux {
 
-AbstractEmbeddedLinuxTarget::AbstractEmbeddedLinuxTarget(Qt4Project *parent, const QString &id) :
+AbstractEmbeddedLinuxTarget::AbstractEmbeddedLinuxTarget(Qt4Project *parent, const Core::Id id) :
     Qt4BaseTarget(parent, id),
     m_buildConfigurationFactory(new Qt4BuildConfigurationFactory(this)),
     m_deploymentInfo(new DeploymentInfo(this)),
diff --git a/src/plugins/remotelinux/abstractembeddedlinuxtarget.h b/src/plugins/remotelinux/abstractembeddedlinuxtarget.h
index f6ff1fe8d7..4f60678d9a 100644
--- a/src/plugins/remotelinux/abstractembeddedlinuxtarget.h
+++ b/src/plugins/remotelinux/abstractembeddedlinuxtarget.h
@@ -53,7 +53,7 @@ class REMOTELINUX_EXPORT AbstractEmbeddedLinuxTarget : public Qt4ProjectManager:
 {
     Q_OBJECT
 public:
-    AbstractEmbeddedLinuxTarget(Qt4ProjectManager::Qt4Project *parent, const QString &id);
+    AbstractEmbeddedLinuxTarget(Qt4ProjectManager::Qt4Project *parent, const Core::Id id);
 
     ProjectExplorer::IBuildConfigurationFactory *buildConfigurationFactory() const;
 
diff --git a/src/plugins/remotelinux/abstractpackagingstep.cpp b/src/plugins/remotelinux/abstractpackagingstep.cpp
index b71c675578..bd6284c440 100644
--- a/src/plugins/remotelinux/abstractpackagingstep.cpp
+++ b/src/plugins/remotelinux/abstractpackagingstep.cpp
@@ -60,7 +60,7 @@ public:
 
 } // namespace Internal
 
-AbstractPackagingStep::AbstractPackagingStep(BuildStepList *bsl, const QString &id)
+AbstractPackagingStep::AbstractPackagingStep(BuildStepList *bsl, const Core::Id id)
     : BuildStep(bsl, id)
 {
     ctor();
diff --git a/src/plugins/remotelinux/abstractpackagingstep.h b/src/plugins/remotelinux/abstractpackagingstep.h
index 3056aea488..50189bbae0 100644
--- a/src/plugins/remotelinux/abstractpackagingstep.h
+++ b/src/plugins/remotelinux/abstractpackagingstep.h
@@ -48,7 +48,7 @@ class REMOTELINUX_EXPORT AbstractPackagingStep : public ProjectExplorer::BuildSt
     Q_OBJECT
 
 public:
-    AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, const QString &id);
+    AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
     AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, AbstractPackagingStep *other);
     ~AbstractPackagingStep();
 
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
index 380ab1092e..68a8f9fc92 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
@@ -52,7 +52,7 @@ public:
 
 } // namespace Internal
 
-AbstractRemoteLinuxDeployStep::AbstractRemoteLinuxDeployStep(BuildStepList *bsl, const QString &id)
+AbstractRemoteLinuxDeployStep::AbstractRemoteLinuxDeployStep(BuildStepList *bsl, const Core::Id id)
     : BuildStep(bsl, id), d(new Internal::AbstractRemoteLinuxDeployStepPrivate)
 {
 }
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
index 0c68d56546..5339c6a834 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
@@ -63,7 +63,7 @@ public:
     virtual AbstractRemoteLinuxDeployService *deployService() const = 0;
 
 protected:
-    AbstractRemoteLinuxDeployStep(ProjectExplorer::BuildStepList *bsl, const QString &id);
+    AbstractRemoteLinuxDeployStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
     AbstractRemoteLinuxDeployStep(ProjectExplorer::BuildStepList *bsl,
         AbstractRemoteLinuxDeployStep *other);
 
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
index 024938c441..164aea8836 100644
--- a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
+++ b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp
@@ -74,14 +74,14 @@ QList<ProjectExplorer::Abi> EmbeddedLinuxQtVersion::detectQtAbis() const
     return qtAbisFromLibrary(qtCorePath(versionInfo(), qtVersionString()));
 }
 
-bool EmbeddedLinuxQtVersion::supportsTargetId(const QString &id) const
+bool EmbeddedLinuxQtVersion::supportsTargetId(Core::Id id) const
 {
-    return id == QLatin1String(Constants::EMBEDDED_LINUX_TARGET_ID);
+    return id == Core::Id(Constants::EMBEDDED_LINUX_TARGET_ID);
 }
 
-QSet<QString> EmbeddedLinuxQtVersion::supportedTargetIds() const
+QSet<Core::Id> EmbeddedLinuxQtVersion::supportedTargetIds() const
 {
-    return QSet<QString>() << QLatin1String(Constants::EMBEDDED_LINUX_TARGET_ID);
+    return QSet<Core::Id>() << Core::Id(Constants::EMBEDDED_LINUX_TARGET_ID);
 }
 
 QString EmbeddedLinuxQtVersion::description() const
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.h b/src/plugins/remotelinux/embeddedlinuxqtversion.h
index 2820b48447..1e2aadf4be 100644
--- a/src/plugins/remotelinux/embeddedlinuxqtversion.h
+++ b/src/plugins/remotelinux/embeddedlinuxqtversion.h
@@ -52,8 +52,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/remotelinux/embeddedlinuxtargetfactory.cpp b/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp
index 7a9b05c92f..ce4474918e 100644
--- a/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp
+++ b/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp
@@ -57,22 +57,23 @@ EmbeddedLinuxTargetFactory::EmbeddedLinuxTargetFactory(QObject *parent) :
 EmbeddedLinuxTargetFactory::~EmbeddedLinuxTargetFactory()
 { }
 
-QIcon EmbeddedLinuxTargetFactory::iconForId(const QString &id) const
+QIcon EmbeddedLinuxTargetFactory::iconForId(const Core::Id id) const
 {
-    if (id == QLatin1String(Constants::EMBEDDED_LINUX_TARGET_ID))
+    if (id == Core::Id(Constants::EMBEDDED_LINUX_TARGET_ID))
         return QIcon(":/remotelinux/images/embeddedtarget.png");
     return QIcon();
 }
 
-QString EmbeddedLinuxTargetFactory::buildNameForId(const QString &id) const
+QString EmbeddedLinuxTargetFactory::buildNameForId(const Core::Id id) const
 {
     if (supportsTargetId(id))
         return tr("embedded");
     return QString();
 }
 
-QSet<QString> EmbeddedLinuxTargetFactory::targetFeatures(const QString & /*id*/) const
+QSet<QString> EmbeddedLinuxTargetFactory::targetFeatures(const Core::Id id) const
 {
+    Q_UNUSED(id);
     QSet<QString> features;
     features << Qt4ProjectManager::Constants::MOBILE_TARGETFEATURE_ID;
     features << Qt4ProjectManager::Constants::SHADOWBUILD_TARGETFEATURE_ID;
@@ -80,19 +81,19 @@ QSet<QString> EmbeddedLinuxTargetFactory::targetFeatures(const QString & /*id*/)
     return features;
 }
 
-QStringList EmbeddedLinuxTargetFactory::supportedTargetIds() const
+QList<Core::Id> EmbeddedLinuxTargetFactory::supportedTargetIds() const
 {
-    return QStringList() << QLatin1String(RemoteLinux::Constants::EMBEDDED_LINUX_TARGET_ID);
+    return QList<Core::Id>() << Core::Id(RemoteLinux::Constants::EMBEDDED_LINUX_TARGET_ID);
 }
 
-bool EmbeddedLinuxTargetFactory::supportsTargetId(const QString &id) const
+bool EmbeddedLinuxTargetFactory::supportsTargetId(const Core::Id id) const
 {
-    return id == RemoteLinux::Constants::EMBEDDED_LINUX_TARGET_ID;
+    return id == Core::Id(RemoteLinux::Constants::EMBEDDED_LINUX_TARGET_ID);
 }
 
-QString EmbeddedLinuxTargetFactory::displayNameForId(const QString &id) const
+QString EmbeddedLinuxTargetFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == RemoteLinux::Constants::EMBEDDED_LINUX_TARGET_ID)
+    if (id == Core::Id(RemoteLinux::Constants::EMBEDDED_LINUX_TARGET_ID))
         return tr("Embedded Linux");
     return QString();
 }
@@ -106,8 +107,8 @@ ProjectExplorer::Target *EmbeddedLinuxTargetFactory::restore(ProjectExplorer::Pr
 {
     Q_ASSERT(canRestore(parent, map));
 
-    GenericEmbeddedLinuxTarget *t = new GenericEmbeddedLinuxTarget(static_cast<Qt4ProjectManager::Qt4Project *>(parent),
-                                                     Constants::EMBEDDED_LINUX_TARGET_ID);
+    GenericEmbeddedLinuxTarget *t =
+            new GenericEmbeddedLinuxTarget(static_cast<Qt4ProjectManager::Qt4Project *>(parent), Core::Id());
     if (t->fromMap(map))
         return t;
 
@@ -115,7 +116,7 @@ ProjectExplorer::Target *EmbeddedLinuxTargetFactory::restore(ProjectExplorer::Pr
     return 0;
 }
 
-bool EmbeddedLinuxTargetFactory::canCreate(ProjectExplorer::Project *parent, const QString &id) const
+bool EmbeddedLinuxTargetFactory::canCreate(ProjectExplorer::Project *parent, const Core::Id id) const
 {
     Qt4ProjectManager::Qt4Project *project = qobject_cast<Qt4ProjectManager::Qt4Project *>(parent);
     if (!project)
@@ -128,7 +129,7 @@ bool EmbeddedLinuxTargetFactory::canCreate(ProjectExplorer::Project *parent, con
 }
 
 ProjectExplorer::Target *EmbeddedLinuxTargetFactory::create(ProjectExplorer::Project *parent,
-                                                            const QString &id)
+                                                            const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -148,7 +149,7 @@ ProjectExplorer::Target *EmbeddedLinuxTargetFactory::create(ProjectExplorer::Pro
 }
 
 ProjectExplorer::Target *EmbeddedLinuxTargetFactory::create(ProjectExplorer::Project *parent,
-                                                            const QString &id,
+                                                            const Core::Id id,
                                                             const QList<Qt4ProjectManager::BuildConfigurationInfo> &infos)
 {
     if (!canCreate(parent, id) || infos.isEmpty())
diff --git a/src/plugins/remotelinux/embeddedlinuxtargetfactory.h b/src/plugins/remotelinux/embeddedlinuxtargetfactory.h
index 1f6709ced6..77f4d80803 100644
--- a/src/plugins/remotelinux/embeddedlinuxtargetfactory.h
+++ b/src/plugins/remotelinux/embeddedlinuxtargetfactory.h
@@ -46,22 +46,22 @@ public:
     explicit EmbeddedLinuxTargetFactory(QObject *parent = 0);
     ~EmbeddedLinuxTargetFactory();
 
-    QIcon iconForId(const QString &id) const;
-    QString buildNameForId(const QString &id) const;
+    QIcon iconForId(const Core::Id id) const;
+    QString buildNameForId(const Core::Id id) const;
 
-    QSet<QString> targetFeatures(const QString &id) const;
+    QSet<QString> targetFeatures(const Core::Id id) const;
 
-    QStringList supportedTargetIds() const;
-    bool supportsTargetId(const QString &id) const;
+    QList<Core::Id> supportedTargetIds() const;
+    bool supportsTargetId(const Core::Id id) const;
 
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
     bool canRestore(ProjectExplorer::Project *parent, const QVariantMap &map) const;
     ProjectExplorer::Target *restore(ProjectExplorer::Project *parent, const QVariantMap &map);
 
-    bool canCreate(ProjectExplorer::Project *parent, const QString &id) const;
-    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id);
-    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id,
+    bool canCreate(ProjectExplorer::Project *parent, 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<Qt4ProjectManager::BuildConfigurationInfo> &infos);
 };
 
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index fe15607c92..58ba03ebf4 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -87,7 +87,7 @@ public:
 
 } // namespace Internal
 
-GenericDirectUploadStep::GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, const QString &id)
+GenericDirectUploadStep::GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id)
     : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     ctor();
@@ -157,9 +157,9 @@ bool GenericDirectUploadStep::incrementalDeployment() const
     return d->incremental;
 }
 
-QString GenericDirectUploadStep::stepId()
+Core::Id GenericDirectUploadStep::stepId()
 {
-    return QLatin1String("RemoteLinux.DirectUploadStep");
+    return Core::Id("RemoteLinux.DirectUploadStep");
 }
 
 QString GenericDirectUploadStep::displayName()
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.h b/src/plugins/remotelinux/genericdirectuploadstep.h
index 36c0ee3274..aca0960119 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.h
+++ b/src/plugins/remotelinux/genericdirectuploadstep.h
@@ -46,7 +46,7 @@ class REMOTELINUX_EXPORT GenericDirectUploadStep : public AbstractRemoteLinuxDep
     Q_OBJECT
 
 public:
-    GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, const QString &id);
+    GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
     GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, GenericDirectUploadStep *other);
     ~GenericDirectUploadStep();
 
@@ -56,7 +56,7 @@ public:
     void setIncrementalDeployment(bool incremental);
     bool incrementalDeployment() const;
 
-    static QString stepId();
+    static Core::Id stepId();
     static QString displayName();
 
 private:
diff --git a/src/plugins/remotelinux/genericembeddedlinuxtarget.cpp b/src/plugins/remotelinux/genericembeddedlinuxtarget.cpp
index db0371b7a2..39e600d164 100644
--- a/src/plugins/remotelinux/genericembeddedlinuxtarget.cpp
+++ b/src/plugins/remotelinux/genericembeddedlinuxtarget.cpp
@@ -48,7 +48,8 @@ namespace RemoteLinux {
 namespace Internal {
 
 GenericEmbeddedLinuxTarget::GenericEmbeddedLinuxTarget(Qt4ProjectManager::Qt4Project *parent,
-        const QString &id) : AbstractEmbeddedLinuxTarget(parent, id)
+                                                       const Core::Id id) :
+    AbstractEmbeddedLinuxTarget(parent, id)
 {
     setDisplayName(tr("Embedded Linux"));
 }
@@ -95,7 +96,7 @@ void GenericEmbeddedLinuxTarget::createApplicationProFiles(bool reparse)
     // Only add new runconfigurations if there are none.
     foreach (const QString &path, pathes) {
         RemoteLinuxRunConfiguration *qt4rc =
-            new RemoteLinuxRunConfiguration(this, RemoteLinuxRunConfiguration::Id, path);
+            new RemoteLinuxRunConfiguration(this, Core::Id(RemoteLinuxRunConfiguration::Id), path);
         addRunConfiguration(qt4rc);
     }
 
diff --git a/src/plugins/remotelinux/genericembeddedlinuxtarget.h b/src/plugins/remotelinux/genericembeddedlinuxtarget.h
index cdb52f2034..fe84489b02 100644
--- a/src/plugins/remotelinux/genericembeddedlinuxtarget.h
+++ b/src/plugins/remotelinux/genericembeddedlinuxtarget.h
@@ -45,7 +45,7 @@ class GenericEmbeddedLinuxTarget : public AbstractEmbeddedLinuxTarget
     Q_OBJECT
 
 public:
-    GenericEmbeddedLinuxTarget(Qt4ProjectManager::Qt4Project *parent, const QString &id);
+    GenericEmbeddedLinuxTarget(Qt4ProjectManager::Qt4Project *parent, const Core::Id id);
 
     void createApplicationProFiles(bool reparse);
     QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Node *n);
diff --git a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp
index 4840158396..961c7fc19b 100644
--- a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp
+++ b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp
@@ -50,9 +50,9 @@ GenericRemoteLinuxDeployStepFactory::GenericRemoteLinuxDeployStepFactory(QObject
 {
 }
 
-QStringList GenericRemoteLinuxDeployStepFactory::availableCreationIds(BuildStepList *parent) const
+QList<Core::Id> GenericRemoteLinuxDeployStepFactory::availableCreationIds(BuildStepList *parent) const
 {
-    QStringList ids;
+    QList<Core::Id> ids;
     const DeployConfiguration * const dc = qobject_cast<DeployConfiguration *>(parent->parent());
     if (!dc || dc->id() != RemoteLinuxDeployConfigurationFactory::genericDeployConfigurationId())
         return ids;
@@ -62,7 +62,7 @@ QStringList GenericRemoteLinuxDeployStepFactory::availableCreationIds(BuildStepL
     return ids;
 }
 
-QString GenericRemoteLinuxDeployStepFactory::displayNameForId(const QString &id) const
+QString GenericRemoteLinuxDeployStepFactory::displayNameForId(const Core::Id id) const
 {
     if (id == TarPackageCreationStep::stepId())
         return TarPackageCreationStep::displayName();
@@ -75,12 +75,12 @@ QString GenericRemoteLinuxDeployStepFactory::displayNameForId(const QString &id)
     return QString();
 }
 
-bool GenericRemoteLinuxDeployStepFactory::canCreate(BuildStepList *parent, const QString &id) const
+bool GenericRemoteLinuxDeployStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
 {
     return availableCreationIds(parent).contains(id);
 }
 
-BuildStep *GenericRemoteLinuxDeployStepFactory::create(BuildStepList *parent, const QString &id)
+BuildStep *GenericRemoteLinuxDeployStepFactory::create(BuildStepList *parent, const Core::Id id)
 {
     Q_ASSERT(canCreate(parent, id));
 
diff --git a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h
index 7c4150e0f8..3498743757 100644
--- a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h
+++ b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h
@@ -43,10 +43,10 @@ class GenericRemoteLinuxDeployStepFactory : public ProjectExplorer::IBuildStepFa
 public:
     GenericRemoteLinuxDeployStepFactory(QObject *parent = 0);
 
-    QStringList availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
-    QString displayNameForId(const QString &id) const;
-    bool canCreate(ProjectExplorer::BuildStepList *parent, const QString &id) const;
-    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const QString &id);
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
+    QString displayNameForId(const Core::Id id) const;
+    bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
     bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
     ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
         const QVariantMap &map);
diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
index 7fa49dbb9d..18f17e9b29 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
@@ -96,7 +96,7 @@ using namespace Internal;
 
 
 AbstractRemoteLinuxCustomCommandDeploymentStep::AbstractRemoteLinuxCustomCommandDeploymentStep(BuildStepList *bsl,
-        const QString &id)
+        const Core::Id id)
     : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     ctor();
@@ -185,9 +185,9 @@ RemoteLinuxCustomCommandDeployService *GenericRemoteLinuxCustomCommandDeployment
     return &d->service;
 }
 
-QString GenericRemoteLinuxCustomCommandDeploymentStep::stepId()
+Core::Id GenericRemoteLinuxCustomCommandDeploymentStep::stepId()
 {
-    return QLatin1String("RemoteLinux.GenericRemoteLinuxCustomCommandDeploymentStep");
+    return Core::Id("RemoteLinux.GenericRemoteLinuxCustomCommandDeploymentStep");
 }
 
 QString GenericRemoteLinuxCustomCommandDeploymentStep::stepDisplayName()
diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h
index bf0591ad2f..57e9d00531 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h
@@ -56,8 +56,7 @@ public:
     QString commandLine() const;
 
 protected:
-    AbstractRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl,
-        const QString &id);
+    AbstractRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
     AbstractRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl,
         AbstractRemoteLinuxCustomCommandDeploymentStep *other);
 
@@ -83,7 +82,7 @@ public:
         GenericRemoteLinuxCustomCommandDeploymentStep *other);
     ~GenericRemoteLinuxCustomCommandDeploymentStep();
 
-    static QString stepId();
+    static Core::Id stepId();
     static QString stepDisplayName();
 
 private:
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
index edf5ae3016..fdca61f8f0 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
@@ -60,7 +60,7 @@ public:
 using namespace Internal;
 
 RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target,
-        const QString &id, const QString &defaultDisplayName)
+        const Core::Id id, const QString &defaultDisplayName)
     : DeployConfiguration(target, id), d(new RemoteLinuxDeployConfigurationPrivate)
 {
     setDefaultDisplayName(defaultDisplayName);
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
index a5f662a7e1..740a79b856 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
@@ -56,7 +56,7 @@ class REMOTELINUX_EXPORT RemoteLinuxDeployConfiguration
     Q_OBJECT
     Q_DISABLE_COPY(RemoteLinuxDeployConfiguration)
 public:
-    RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target, const QString &id,
+    RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target, const Core::Id id,
         const QString &defaultDisplayName);
     RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target,
         RemoteLinuxDeployConfiguration *source);
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
index 7402794d6c..1e61adf65a 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
@@ -51,28 +51,28 @@ RemoteLinuxDeployConfigurationFactory::RemoteLinuxDeployConfigurationFactory(QOb
     : DeployConfigurationFactory(parent)
 { }
 
-QStringList RemoteLinuxDeployConfigurationFactory::availableCreationIds(Target *parent) const
+QList<Core::Id> RemoteLinuxDeployConfigurationFactory::availableCreationIds(Target *parent) const
 {
-    QStringList ids;
+    QList<Core::Id> ids;
     if (qobject_cast<GenericEmbeddedLinuxTarget *>(parent))
         ids << genericDeployConfigurationId();
     return ids;
 }
 
-QString RemoteLinuxDeployConfigurationFactory::displayNameForId(const QString &id) const
+QString RemoteLinuxDeployConfigurationFactory::displayNameForId(Core::Id id) const
 {
     if (id == genericDeployConfigurationId())
         return genericLinuxDisplayName();
     return QString();
 }
 
-bool RemoteLinuxDeployConfigurationFactory::canCreate(Target *parent, const QString &id) const
+bool RemoteLinuxDeployConfigurationFactory::canCreate(Target *parent, Core::Id id) const
 {
     return availableCreationIds(parent).contains(id);
 }
 
 DeployConfiguration *RemoteLinuxDeployConfigurationFactory::create(Target *parent,
-    const QString &id)
+    Core::Id id)
 {
     Q_ASSERT(canCreate(parent, id));
 
@@ -93,7 +93,7 @@ DeployConfiguration *RemoteLinuxDeployConfigurationFactory::restore(Target *pare
 {
     if (!canRestore(parent, map))
         return 0;
-    QString id = idFromMap(map);
+    Core::Id id = idFromMap(map);
     RemoteLinuxDeployConfiguration * const dc = new RemoteLinuxDeployConfiguration(parent, id,
         genericLinuxDisplayName());
     if (!dc->fromMap(map)) {
@@ -112,9 +112,9 @@ DeployConfiguration *RemoteLinuxDeployConfigurationFactory::clone(Target *parent
         qobject_cast<RemoteLinuxDeployConfiguration *>(product));
 }
 
-QString RemoteLinuxDeployConfigurationFactory::genericDeployConfigurationId()
+Core::Id RemoteLinuxDeployConfigurationFactory::genericDeployConfigurationId()
 {
-    return QLatin1String("DeployToGenericLinux");
+    return Core::Id("DeployToGenericLinux");
 }
 
 } // namespace Internal
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h
index b2a4960b85..082aaacf8c 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h
@@ -44,16 +44,16 @@ class RemoteLinuxDeployConfigurationFactory : public ProjectExplorer::DeployConf
 public:
     explicit RemoteLinuxDeployConfigurationFactory(QObject *parent = 0);
 
-    QStringList availableCreationIds(ProjectExplorer::Target *parent) const;
-    QString displayNameForId(const QString &id) const;
-    bool canCreate(ProjectExplorer::Target *parent, const QString &id) const;
-    ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, const QString &id);
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
+    QString displayNameForId(Core::Id id) const;
+    bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const;
+    ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id);
     bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
     ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map);
     ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent,
                                                 ProjectExplorer::DeployConfiguration *product);
 
-    static QString genericDeployConfigurationId();
+    static Core::Id genericDeployConfigurationId();
 };
 
 } // namespace Internal
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 67392b4cd6..cd624e2dc1 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -109,7 +109,7 @@ public:
 
 using namespace Internal;
 
-RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Qt4BaseTarget *parent, const QString &id,
+RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Qt4BaseTarget *parent, const Core::Id id,
         const QString &proFilePath)
     : RunConfiguration(parent, id),
       d(new RemoteLinuxRunConfigurationPrivate(proFilePath, parent))
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
index 29b4656877..77ad9b16e3 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
@@ -73,7 +73,7 @@ public:
 
     enum DebuggingType { DebugCppOnly, DebugQmlOnly, DebugCppAndQml };
 
-    RemoteLinuxRunConfiguration(Qt4ProjectManager::Qt4BaseTarget *parent, const QString &id,
+    RemoteLinuxRunConfiguration(Qt4ProjectManager::Qt4BaseTarget *parent, const Core::Id id,
         const QString &proFilePath);
     virtual ~RemoteLinuxRunConfiguration();
 
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
index ebc07a51a3..921461bf23 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
@@ -50,11 +50,12 @@ namespace RemoteLinux {
 namespace Internal {
 
 namespace {
-QString pathFromId(const QString &id)
+QString pathFromId(Core::Id id)
 {
-    if (!id.startsWith(RemoteLinuxRunConfiguration::Id))
+    QString idStr = QString::fromUtf8(id.name());
+    if (!idStr.startsWith(RemoteLinuxRunConfiguration::Id))
         return QString();
-    return id.mid(RemoteLinuxRunConfiguration::Id.size());
+    return idStr.mid(RemoteLinuxRunConfiguration::Id.size());
 }
 
 } // namespace
@@ -69,9 +70,9 @@ RemoteLinuxRunConfigurationFactory::~RemoteLinuxRunConfigurationFactory()
 }
 
 bool RemoteLinuxRunConfigurationFactory::canCreate(Target *parent,
-    const QString &id) const
+    const Core::Id id) const
 {
-    if (!id.startsWith(RemoteLinuxRunConfiguration::Id))
+    if (!QString::fromUtf8(id.name()).startsWith(RemoteLinuxRunConfiguration::Id))
         return false;
     return qobject_cast<Qt4BaseTarget *>(parent)->qt4Project()
         ->hasApplicationProFile(pathFromId(id));
@@ -80,39 +81,43 @@ bool RemoteLinuxRunConfigurationFactory::canCreate(Target *parent,
 bool RemoteLinuxRunConfigurationFactory::canRestore(Target *parent, const QVariantMap &map) const
 {
     Q_UNUSED(parent);
-    return ProjectExplorer::idFromMap(map).startsWith(RemoteLinuxRunConfiguration::Id);
+    return QString::fromLatin1(ProjectExplorer::idFromMap(map).name()).startsWith(RemoteLinuxRunConfiguration::Id);
 }
 
 bool RemoteLinuxRunConfigurationFactory::canClone(Target *parent, RunConfiguration *source) const
 {
     const RemoteLinuxRunConfiguration * const rlrc
             = qobject_cast<RemoteLinuxRunConfiguration *>(source);
-    return rlrc && canCreate(parent, source->id() + QLatin1Char('.') + rlrc->proFilePath());
+    const QString idStr = QString::fromLatin1(source->id().name()) + QLatin1Char('.') + rlrc->proFilePath();
+    return rlrc && canCreate(parent, Core::Id(idStr.toUtf8().constData()));
 }
 
-QStringList RemoteLinuxRunConfigurationFactory::availableCreationIds(Target *parent) const
+QList<Core::Id> RemoteLinuxRunConfigurationFactory::availableCreationIds(Target *parent) const
 {
+    QList<Core::Id> result;
     const QList<DeployConfiguration *> &depConfs = parent->deployConfigurations();
     foreach (const DeployConfiguration * const dc, depConfs) {
         if (dc->id() == RemoteLinuxDeployConfigurationFactory::genericDeployConfigurationId()) {
-            return qobject_cast<Qt4BaseTarget *>(parent)->qt4Project()
-                ->applicationProFilePathes(RemoteLinuxRunConfiguration::Id);
+            QStringList proFiles = qobject_cast<Qt4BaseTarget *>(parent)->qt4Project()
+                    ->applicationProFilePathes(RemoteLinuxRunConfiguration::Id);
+            foreach (const QString &pf, proFiles)
+                result << Core::Id(pf);
+            return result;
+        }
     }
-    }
-    return QStringList();
+    return result;
 }
 
-QString RemoteLinuxRunConfigurationFactory::displayNameForId(const QString &id) const
+QString RemoteLinuxRunConfigurationFactory::displayNameForId(const Core::Id id) const
 {
     return QFileInfo(pathFromId(id)).completeBaseName()
         + tr(" (on Remote Generic Linux Host)");
 }
 
-RunConfiguration *RemoteLinuxRunConfigurationFactory::create(Target *parent, const QString &id)
+RunConfiguration *RemoteLinuxRunConfigurationFactory::create(Target *parent, const Core::Id id)
 {
     QTC_ASSERT(canCreate(parent, id), return 0);
-    return new RemoteLinuxRunConfiguration(qobject_cast<Qt4BaseTarget *>(parent), id,
-        pathFromId(id));
+    return new RemoteLinuxRunConfiguration(qobject_cast<Qt4BaseTarget *>(parent), id, pathFromId(id));
 }
 
 RunConfiguration *RemoteLinuxRunConfigurationFactory::restore(Target *parent,
@@ -120,7 +125,7 @@ RunConfiguration *RemoteLinuxRunConfigurationFactory::restore(Target *parent,
 {
     QTC_ASSERT(canRestore(parent, map), return 0);
     RemoteLinuxRunConfiguration *rc = new RemoteLinuxRunConfiguration(qobject_cast<Qt4BaseTarget *>(parent),
-        RemoteLinuxRunConfiguration::Id, QString());
+        Core::Id(RemoteLinuxRunConfiguration::Id), QString());
     if (rc->fromMap(map))
         return rc;
 
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h
index 01e94759d6..a2704a23a1 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h
@@ -45,11 +45,11 @@ public:
     explicit RemoteLinuxRunConfigurationFactory(QObject *parent = 0);
     ~RemoteLinuxRunConfigurationFactory();
 
-    QString displayNameForId(const QString &id) const;
-    QStringList availableCreationIds(ProjectExplorer::Target *parent) const;
+    QString displayNameForId(const Core::Id id) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
 
-    bool canCreate(ProjectExplorer::Target *parent, const QString &id) const;
-    ProjectExplorer::RunConfiguration *create(ProjectExplorer::Target *parent, const QString &id);
+    bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
+    ProjectExplorer::RunConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id);
 
     bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
     ProjectExplorer::RunConfiguration *restore(ProjectExplorer::Target *parent,
diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
index 1e9ee52ae4..d33b259edf 100644
--- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
@@ -62,8 +62,9 @@ bool RemoteLinuxRunControlFactory::canRun(RunConfiguration *runConfiguration, Ru
     if (mode != NormalRunMode && mode != DebugRunMode)
         return false;
 
+    const QString idStr = QString::fromLatin1(runConfiguration->id().name());
     if (!runConfiguration->isEnabled()
-            || !runConfiguration->id().startsWith(RemoteLinuxRunConfiguration::Id)) {
+            || !idStr.startsWith(RemoteLinuxRunConfiguration::Id)) {
         return false;
     }
 
diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp
index c3f9b37fc2..3a2f2e10bf 100644
--- a/src/plugins/remotelinux/tarpackagecreationstep.cpp
+++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp
@@ -304,9 +304,9 @@ BuildStepConfigWidget *TarPackageCreationStep::createConfigWidget()
     return new CreateTarStepWidget(this);
 }
 
-QString TarPackageCreationStep::stepId()
+Core::Id TarPackageCreationStep::stepId()
 {
-    return QLatin1String("MaemoTarPackageCreationStep");
+    return Core::Id("MaemoTarPackageCreationStep");
 }
 
 QString TarPackageCreationStep::displayName()
diff --git a/src/plugins/remotelinux/tarpackagecreationstep.h b/src/plugins/remotelinux/tarpackagecreationstep.h
index 02164493cf..6e4d99b619 100644
--- a/src/plugins/remotelinux/tarpackagecreationstep.h
+++ b/src/plugins/remotelinux/tarpackagecreationstep.h
@@ -49,7 +49,7 @@ public:
     TarPackageCreationStep(ProjectExplorer::BuildStepList *bsl);
     TarPackageCreationStep(ProjectExplorer::BuildStepList *bsl, TarPackageCreationStep *other);
 
-    static QString stepId();
+    static Core::Id stepId();
     static QString displayName();
 
     bool init();
diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
index bbcdc6aedb..8024f12a9e 100644
--- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
+++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
@@ -106,9 +106,9 @@ BuildStepConfigWidget *UploadAndInstallTarPackageStep::createConfigWidget()
     return new SimpleBuildStepConfigWidget(this);
 }
 
-QString UploadAndInstallTarPackageStep::stepId()
+Core::Id UploadAndInstallTarPackageStep::stepId()
 {
-    return QLatin1String("MaemoUploadAndInstallTarPackageStep");
+    return Core::Id("MaemoUploadAndInstallTarPackageStep");
 }
 
 QString UploadAndInstallTarPackageStep::displayName()
diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h
index 29e7ff0416..213bca7e39 100644
--- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h
+++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h
@@ -70,7 +70,7 @@ public:
 
     ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
 
-    static QString stepId();
+    static Core::Id stepId();
     static QString displayName();
 
 private: