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>

src/plugins/android/androidconstants.h

@@ -56,7 +56,7 @@ enum AndroidQemuStatus {
 #define ANDROID_BAT_SUFFIX ""
 #endif
 
-static const QLatin1String ANDROID_RC_ID(ANDROID_PREFIX);
+static const char ANDROID_RC_ID[] = ANDROID_PREFIX;
 static const QLatin1String ANDROID_RC_ID_PREFIX(ANDROID_PREFIX ".");
 
 static const QLatin1String AndroidArgumentsKey(ANDROID_PREFIX ".Arguments");

src/plugins/android/androiddeployconfiguration.cpp

@@ -45,7 +45,7 @@
 using namespace Android::Internal;
 
 AndroidDeployConfiguration::AndroidDeployConfiguration(ProjectExplorer::Target *parent)
-    :DeployConfiguration(parent, QLatin1String(ANDROID_DEPLOYCONFIGURATION_ID))
+    :DeployConfiguration(parent, Core::Id(ANDROID_DEPLOYCONFIGURATION_ID))
 {
     setDisplayName(tr("Deploy to Android device"));
     setDefaultDisplayName(displayName());
@@ -66,17 +66,18 @@ AndroidDeployConfigurationFactory::AndroidDeployConfigurationFactory(QObject *pa
     ProjectExplorer::DeployConfigurationFactory(parent)
 { }
 
-bool AndroidDeployConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const QString &id) const
+bool AndroidDeployConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const Core::Id id) const
 {
     AndroidTarget *t = qobject_cast<AndroidTarget *>(parent);
-    if (!t || t->id() != QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
+    if (!t || t->id() != Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
-            || !id.startsWith(QLatin1String(ANDROID_DEPLOYCONFIGURATION_ID)))
+            || !id.toString().startsWith(QLatin1String(ANDROID_DEPLOYCONFIGURATION_ID)))
         return false;
     return true;
 }
 
-ProjectExplorer::DeployConfiguration *AndroidDeployConfigurationFactory::create(ProjectExplorer::Target *parent, const QString &/*id*/)
+ProjectExplorer::DeployConfiguration *AndroidDeployConfigurationFactory::create(ProjectExplorer::Target *parent, const Core::Id id)
 {
+    Q_UNUSED(id);
     AndroidDeployConfiguration *dc = new AndroidDeployConfiguration(parent);
     if (!dc)
         return 0;
@@ -108,7 +109,7 @@ bool AndroidDeployConfigurationFactory::canClone(ProjectExplorer::Target *parent
 {
     if (!qobject_cast<AndroidTarget *>(parent))
         return false;
-    return source->id() == QLatin1String(ANDROID_DEPLOYCONFIGURATION_ID);
+    return source->id() == Core::Id(ANDROID_DEPLOYCONFIGURATION_ID);
 }
 
 ProjectExplorer::DeployConfiguration *AndroidDeployConfigurationFactory::clone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source)
@@ -119,17 +120,20 @@ ProjectExplorer::DeployConfiguration *AndroidDeployConfigurationFactory::clone(P
     return new AndroidDeployConfiguration(t, source);
 }
 
-QStringList AndroidDeployConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
+QList<Core::Id> AndroidDeployConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
 {
     AndroidTarget *target = qobject_cast<AndroidTarget *>(parent);
     if (!target ||
-        target->id() != QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID))
+        target->id() != Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID))
-        return QStringList();
+        return QList<Core::Id>();
 
-    return target->qt4Project()->applicationProFilePathes(QLatin1String(ANDROID_DC_PREFIX));
+    QList<Core::Id> result;
+    foreach (const QString &id, target->qt4Project()->applicationProFilePathes(QLatin1String(ANDROID_DC_PREFIX)))
+        result << Core::Id(id.toUtf8().constData());
+    return result;
 }
 
-QString AndroidDeployConfigurationFactory::displayNameForId(const QString &/*id*/) const
+QString AndroidDeployConfigurationFactory::displayNameForId(const Core::Id/*id*/) const
 {
     return tr("Deploy on Android");
 }

src/plugins/android/androiddeployconfiguration.h

@@ -62,16 +62,16 @@ class AndroidDeployConfigurationFactory : public ProjectExplorer::DeployConfigur
 public:
     explicit AndroidDeployConfigurationFactory(QObject *parent = 0);
 
-    bool canCreate(ProjectExplorer::Target *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
-    ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, const QString &id);
+    ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id);
     bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
     ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map);
     bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source) const;
     ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source);
 
-    QStringList availableCreationIds(ProjectExplorer::Target *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
     // used to translate the ids to names to display to the user
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
 };
 

src/plugins/android/androiddeploystep.cpp

@@ -58,7 +58,7 @@ using namespace Qt4ProjectManager;
 namespace Android {
 namespace Internal {
 
-const QLatin1String AndroidDeployStep::Id("Qt4ProjectManager.AndroidDeployStep");
+const Core::Id AndroidDeployStep::Id("Qt4ProjectManager.AndroidDeployStep");
 
 AndroidDeployStep::AndroidDeployStep(ProjectExplorer::BuildStepList *parent)
     : BuildStep(parent, Id)

src/plugins/android/androiddeploystep.h

@@ -123,7 +123,7 @@ private:
     QString m_runQASIPackagePath;
     AndroidDeployAction m_runDeployAction;
 
-    static const QLatin1String Id;
+    static const Core::Id Id;
 };
 
 } // namespace Internal

src/plugins/android/androiddeploystepfactory.cpp

@@ -51,16 +51,16 @@ AndroidDeployStepFactory::AndroidDeployStepFactory(QObject *parent)
 {
 }
 
-QStringList AndroidDeployStepFactory::availableCreationIds(BuildStepList *parent) const
+QList<Core::Id> AndroidDeployStepFactory::availableCreationIds(BuildStepList *parent) const
 {
-    if (parent->id() == QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
+    if (parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
-            && parent->target()->id() == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
+            && parent->target()->id() == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
             && !parent->contains(AndroidDeployStep::Id))
-        return QStringList() << AndroidDeployStep::Id;
+        return QList<Core::Id>() << AndroidDeployStep::Id;
-    return QStringList();
+    return QList<Core::Id>();
 }
 
-QString AndroidDeployStepFactory::displayNameForId(const QString &id) const
+QString AndroidDeployStepFactory::displayNameForId(const Core::Id id) const
 {
     if (id == AndroidDeployStep::Id)
         return QCoreApplication::translate("Qt4ProjectManager::Internal::AndroidDeployStepFactory",
@@ -68,15 +68,15 @@ QString AndroidDeployStepFactory::displayNameForId(const QString &id) const
     return QString();
 }
 
-bool AndroidDeployStepFactory::canCreate(BuildStepList *parent, const QString &id) const
+bool AndroidDeployStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
 {
-    return parent->id() == QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
+    return parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
-            && id == QLatin1String(AndroidDeployStep::Id)
+            && id == Core::Id(AndroidDeployStep::Id)
-            && parent->target()->id() == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
+            && parent->target()->id() == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
             && !parent->contains(AndroidDeployStep::Id);
 }
 
-BuildStep *AndroidDeployStepFactory::create(BuildStepList *parent, const QString &id)
+BuildStep *AndroidDeployStepFactory::create(BuildStepList *parent, const Core::Id id)
 {
     Q_ASSERT(canCreate(parent, id));
     return new AndroidDeployStep(parent);

src/plugins/android/androiddeploystepfactory.h

@@ -44,24 +44,20 @@ class AndroidDeployStepFactory : public ProjectExplorer::IBuildStepFactory
 public:
     explicit AndroidDeployStepFactory(QObject *parent = 0);
 
-    virtual QStringList availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
-    virtual QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    virtual bool canCreate(ProjectExplorer::BuildStepList *parent,
+    bool canCreate(ProjectExplorer::BuildStepList *parent,
-                           const QString &id) const;
+                   const Core::Id id) const;
-    virtual ProjectExplorer::BuildStep *
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
-            create(ProjectExplorer::BuildStepList *parent, const QString &id);
 
-    virtual bool canRestore(ProjectExplorer::BuildStepList *parent,
+    bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
-                            const QVariantMap &map) const;
+    ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
-    virtual ProjectExplorer::BuildStep *
-            restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
 
-    virtual bool canClone(ProjectExplorer::BuildStepList *parent,
+    bool canClone(ProjectExplorer::BuildStepList *parent,
-                          ProjectExplorer::BuildStep *product) const;
+                  ProjectExplorer::BuildStep *product) const;
-    virtual ProjectExplorer::BuildStep *
+    ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
-            clone(ProjectExplorer::BuildStepList *parent,
+                                      ProjectExplorer::BuildStep *product);
-                  ProjectExplorer::BuildStep *product);
 };
 
 } // namespace Internal

src/plugins/android/androidpackagecreationfactory.cpp

@@ -52,16 +52,16 @@ AndroidPackageCreationFactory::AndroidPackageCreationFactory(QObject *parent)
 {
 }
 
-QStringList AndroidPackageCreationFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
+QList<Core::Id> AndroidPackageCreationFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
 {
-    if (parent->id() == QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
+    if (parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
-        && parent->target()->id() == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
+        && parent->target()->id() == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
         && !parent->contains(AndroidPackageCreationStep::CreatePackageId))
-        return QStringList() << AndroidPackageCreationStep::CreatePackageId;
+        return QList<Core::Id>() << AndroidPackageCreationStep::CreatePackageId;
-    return QStringList();
+    return QList<Core::Id>();
 }
 
-QString AndroidPackageCreationFactory::displayNameForId(const QString &id) const
+QString AndroidPackageCreationFactory::displayNameForId(const Core::Id id) const
 {
     if (id == AndroidPackageCreationStep::CreatePackageId)
         return QCoreApplication::translate("Qt4ProjectManager::Internal::AndroidPackageCreationFactory",
@@ -69,15 +69,15 @@ QString AndroidPackageCreationFactory::displayNameForId(const QString &id) const
     return QString();
 }
 
-bool AndroidPackageCreationFactory::canCreate(ProjectExplorer::BuildStepList *parent, const QString &id) const
+bool AndroidPackageCreationFactory::canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const
 {
-    return parent->id() == QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
+    return parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
-        && id == QLatin1String(AndroidPackageCreationStep::CreatePackageId)
+        && id == Core::Id(AndroidPackageCreationStep::CreatePackageId)
-        && parent->target()->id() == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
+        && parent->target()->id() == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
         && !parent->contains(AndroidPackageCreationStep::CreatePackageId);
 }
 
-BuildStep *AndroidPackageCreationFactory::create(ProjectExplorer::BuildStepList *parent, const QString &id)
+BuildStep *AndroidPackageCreationFactory::create(ProjectExplorer::BuildStepList *parent, const Core::Id id)
 {
     Q_ASSERT(canCreate(parent, id));
     return new AndroidPackageCreationStep(parent);

src/plugins/android/androidpackagecreationfactory.h

@@ -43,24 +43,21 @@ class AndroidPackageCreationFactory : public ProjectExplorer::IBuildStepFactory
 public:
     explicit AndroidPackageCreationFactory(QObject *parent = 0);
 
-    virtual QStringList availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
-    virtual QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    virtual bool canCreate(ProjectExplorer::BuildStepList *parent,
+    bool canCreate(ProjectExplorer::BuildStepList *parent,
-                           const QString &id) const;
+                   const Core::Id id) const;
-    virtual ProjectExplorer::BuildStep *
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
-            create(ProjectExplorer::BuildStepList *parent, const QString &id);
 
-    virtual bool canRestore(ProjectExplorer::BuildStepList *parent,
+    bool canRestore(ProjectExplorer::BuildStepList *parent,
-                            const QVariantMap &map) const;
+                    const QVariantMap &map) const;
-    virtual ProjectExplorer::BuildStep *
+    ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
-            restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
 
-    virtual bool canClone(ProjectExplorer::BuildStepList *parent,
+    bool canClone(ProjectExplorer::BuildStepList *parent,
-                          ProjectExplorer::BuildStep *product) const;
+                  ProjectExplorer::BuildStep *product) const;
-    virtual ProjectExplorer::BuildStep *
+    ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
-            clone(ProjectExplorer::BuildStepList *parent,
+                                      ProjectExplorer::BuildStep *product);
-                  ProjectExplorer::BuildStep *product);
 };
 
 } // namespace Internal

src/plugins/android/androidpackagecreationstep.cpp

@@ -583,7 +583,7 @@ void AndroidPackageCreationStep::raiseError(const QString &shortMsg,
                       TASK_CATEGORY_BUILDSYSTEM));
 }
 
-const QLatin1String AndroidPackageCreationStep::CreatePackageId("Qt4ProjectManager.AndroidPackageCreationStep");
+const Core::Id AndroidPackageCreationStep::CreatePackageId("Qt4ProjectManager.AndroidPackageCreationStep");
 
 } // namespace Internal
 } // namespace Qt4ProjectManager

src/plugins/android/androidpackagecreationstep.h

@@ -107,7 +107,7 @@ private:
     void raiseError(const QString &shortMsg,
                     const QString &detailedMsg = QString());
 
-    static const QLatin1String CreatePackageId;
+    static const Core::Id CreatePackageId;
 
 private:
     QString m_keystorePath;

src/plugins/android/androidpackagecreationwidget.cpp

@@ -328,9 +328,9 @@ void AndroidPackageCreationWidget::setTargetSDK(const QString &target)
 
     qs->setForced(true);
 
-    bm->buildList(bc->stepList(QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)),
+    bm->buildList(bc->stepList(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)),
-                  ProjectExplorer::ProjectExplorerPlugin::displayNameForStepId(QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)));
+                  ProjectExplorer::ProjectExplorerPlugin::displayNameForStepId(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)));
-    bm->appendStep(qs, ProjectExplorer::ProjectExplorerPlugin::displayNameForStepId(QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)));
+    bm->appendStep(qs, ProjectExplorer::ProjectExplorerPlugin::displayNameForStepId(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)));
     bc->setSubNodeBuild(0);
     // Make the buildconfiguration emit a evironmentChanged() signal
     // TODO find a better way

src/plugins/android/androidpackageinstallationfactory.cpp

@@ -51,16 +51,16 @@ AndroidPackageInstallationFactory::AndroidPackageInstallationFactory(QObject *pa
 {
 }
 
-QStringList AndroidPackageInstallationFactory::availableCreationIds(BuildStepList *parent) const
+QList<Core::Id> AndroidPackageInstallationFactory::availableCreationIds(BuildStepList *parent) const
 {
-    if (parent->id() == QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
+    if (parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
-            && parent->target()->id() == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
+            && parent->target()->id() == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
-            && !parent->contains(AndroidPackageInstallationStep::Id))
+            && !parent->contains(Core::Id(AndroidPackageInstallationStep::Id)))
-        return QStringList() << AndroidPackageInstallationStep::Id;
+        return QList<Core::Id>() << Core::Id(AndroidPackageInstallationStep::Id);
-    return QStringList();
+    return QList<Core::Id>();
 }
 
-QString AndroidPackageInstallationFactory::displayNameForId(const QString &id) const
+QString AndroidPackageInstallationFactory::displayNameForId(const Core::Id id) const
 {
     if (id == AndroidPackageInstallationStep::Id)
         return QCoreApplication::translate("Qt4ProjectManager::Internal::AndroidPackageInstallationFactory",
@@ -68,15 +68,15 @@ QString AndroidPackageInstallationFactory::displayNameForId(const QString &id) c
     return QString();
 }
 
-bool AndroidPackageInstallationFactory::canCreate(BuildStepList *parent, const QString &id) const
+bool AndroidPackageInstallationFactory::canCreate(BuildStepList *parent, const Core::Id id) const
 {
-    return parent->id() == QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
+    return parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
-            && id == QLatin1String(AndroidPackageInstallationStep::Id)
+            && id == Core::Id(AndroidPackageInstallationStep::Id)
-            && parent->target()->id() == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
+            && parent->target()->id() == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)
             && !parent->contains(AndroidPackageInstallationStep::Id);
 }
 
-BuildStep *AndroidPackageInstallationFactory::create(BuildStepList *parent, const QString &id)
+BuildStep *AndroidPackageInstallationFactory::create(BuildStepList *parent, const Core::Id id)
 {
     Q_ASSERT(canCreate(parent, id));
     return new AndroidPackageInstallationStep(parent);

src/plugins/android/androidpackageinstallationfactory.h

@@ -43,24 +43,21 @@ class AndroidPackageInstallationFactory: public ProjectExplorer::IBuildStepFacto
 public:
     explicit AndroidPackageInstallationFactory(QObject *parent = 0);
 
-    virtual QStringList availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
-    virtual QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    virtual bool canCreate(ProjectExplorer::BuildStepList *parent,
+    bool canCreate(ProjectExplorer::BuildStepList *parent,
-                           const QString &id) const;
+                   const Core::Id id) const;
-    virtual ProjectExplorer::BuildStep *
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
-            create(ProjectExplorer::BuildStepList *parent, const QString &id);
 
-    virtual bool canRestore(ProjectExplorer::BuildStepList *parent,
+    bool canRestore(ProjectExplorer::BuildStepList *parent,
-                            const QVariantMap &map) const;
+                    const QVariantMap &map) const;
-    virtual ProjectExplorer::BuildStep *
+    ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
-            restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
 
-    virtual bool canClone(ProjectExplorer::BuildStepList *parent,
+    bool canClone(ProjectExplorer::BuildStepList *parent,
-                          ProjectExplorer::BuildStep *product) const;
+                  ProjectExplorer::BuildStep *product) const;
-    virtual ProjectExplorer::BuildStep *
+    ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
-            clone(ProjectExplorer::BuildStepList *parent,
+                                      ProjectExplorer::BuildStep *product);
-                  ProjectExplorer::BuildStep *product);
 };
 
 } // namespace Internal

src/plugins/android/androidpackageinstallationstep.cpp

@@ -39,7 +39,7 @@
 
 using namespace Android::Internal;
 
-const QLatin1String AndroidPackageInstallationStep::Id("Qt4ProjectManager.AndroidPackageInstallationStep");
+const Core::Id AndroidPackageInstallationStep::Id("Qt4ProjectManager.AndroidPackageInstallationStep");
 
 AndroidPackageInstallationStep::AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl) : MakeStep(bsl, Id)
 {

src/plugins/android/androidpackageinstallationstep.h

@@ -50,7 +50,7 @@ private:
         AndroidPackageInstallationStep *other);
 
 private:
-    static const QLatin1String Id;
+    static const Core::Id Id;
 };
 
 } // namespace Internal

src/plugins/android/androidqtversion.cpp

@@ -90,14 +90,14 @@ QList<ProjectExplorer::Abi> AndroidQtVersion::detectQtAbis() const
                                                                  32);
 }
 
-bool AndroidQtVersion::supportsTargetId(const QString &id) const
+bool AndroidQtVersion::supportsTargetId(const Core::Id id) const
 {
-    return id == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID);
+    return id == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID);
 }
 
-QSet<QString> AndroidQtVersion::supportedTargetIds() const
+QSet<Core::Id> AndroidQtVersion::supportedTargetIds() const
 {
-    return QSet<QString>() << QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID);
+    return QSet<Core::Id>() << Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID);
 }
 
 QString AndroidQtVersion::description() const

src/plugins/android/androidqtversion.h

@@ -45,19 +45,19 @@ public:
     ~AndroidQtVersion ();
     AndroidQtVersion *clone() const;
 
-    virtual QString type() const;
+    QString type() const;
 
-    virtual bool isValid() const;
+    bool isValid() const;
-    virtual QString invalidReason() const;
+    QString invalidReason() const;
 
-    virtual QList<ProjectExplorer::Abi> detectQtAbis() const;
+    QList<ProjectExplorer::Abi> detectQtAbis() const;
 
-    virtual bool supportsTargetId(const QString &id) const;
+    bool supportsTargetId(const Core::Id id) const;
-    virtual QSet<QString> supportedTargetIds() const;
+    QSet<Core::Id> supportedTargetIds() const;
 
-    virtual Core::FeatureSet availableFeatures() const;
+    Core::FeatureSet availableFeatures() const;
-    virtual QString platformName() const;
+    QString platformName() const;
-    virtual QString platformDisplayName() const;
+    QString platformDisplayName() const;
 
     QString description() const;
 };

src/plugins/android/androidrunconfiguration.cpp

@@ -52,7 +52,7 @@ using namespace ProjectExplorer;
 
 AndroidRunConfiguration::AndroidRunConfiguration(AndroidTarget *parent,
                                                  const QString &proFilePath)
-    : RunConfiguration(parent, QLatin1String(ANDROID_RC_ID))
+    : RunConfiguration(parent, Core::Id(ANDROID_RC_ID))
     , m_proFilePath(proFilePath)
 {
     init();

src/plugins/android/androidrunfactories.cpp

@@ -53,11 +53,13 @@ using namespace Qt4ProjectManager;
 
 namespace {
 
-QString pathFromId(const QString &id)
+QString pathFromId(const Core::Id id)
 {
-    if (!id.startsWith(ANDROID_RC_ID_PREFIX))
+    QString pathStr = QString::fromUtf8(id.name());
+    const QString prefix = QLatin1String(ANDROID_RC_ID_PREFIX);
+    if (!pathStr.startsWith(prefix))
         return QString();
-    return id.mid(QString(ANDROID_RC_ID_PREFIX).size());
+    return pathStr.mid(prefix.size());
 }
 
 } // namespace
@@ -72,11 +74,11 @@ AndroidRunConfigurationFactory::~AndroidRunConfigurationFactory()
 }
 
 bool AndroidRunConfigurationFactory::canCreate(Target *parent,
-    const QString &/*id*/) const
+    const Core::Id/*id*/) const
 {
     AndroidTarget *target = qobject_cast<AndroidTarget *>(parent);
     if (!target
-            || target->id() != QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)) {
+            || target->id() != Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)) {
         return false;
     }
     return true;
@@ -89,8 +91,8 @@ bool AndroidRunConfigurationFactory::canRestore(Target *parent,
     Q_UNUSED(map)
     if (!qobject_cast<AndroidTarget *>(parent))
         return false;
-    return ProjectExplorer::idFromMap(map)
+    QString id = QString::fromUtf8(ProjectExplorer::idFromMap(map).name());
-            .startsWith(QLatin1String(ANDROID_RC_ID));
+    return id.startsWith(QLatin1String(ANDROID_RC_ID));
 }
 
 bool AndroidRunConfigurationFactory::canClone(Target *parent,
@@ -99,27 +101,27 @@ bool AndroidRunConfigurationFactory::canClone(Target *parent,
     return canCreate(parent, source->id());
 }
 
-QStringList AndroidRunConfigurationFactory::availableCreationIds(Target *parent) const
+QList<Core::Id> AndroidRunConfigurationFactory::availableCreationIds(Target *parent) const
 {
-    QStringList ids;
+    QList<Core::Id> ids;
     if (AndroidTarget *t = qobject_cast<AndroidTarget *>(parent)) {
-        if (t->id() == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)) {
+        if (t->id() == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID)) {
             QList<Qt4ProFileNode *> nodes = t->qt4Project()->allProFiles();
             foreach (Qt4ProFileNode *node, nodes)
                 if (node->projectType() == ApplicationTemplate || node->projectType() == LibraryTemplate)
-                    ids << node->targetInformation().target;
+                    ids << Core::Id(node->targetInformation().target);
         }
     }
     return ids;
 }
 
-QString AndroidRunConfigurationFactory::displayNameForId(const QString &id) const
+QString AndroidRunConfigurationFactory::displayNameForId(const Core::Id id) const
 {
     return QFileInfo(pathFromId(id)).completeBaseName();
 }
 
 RunConfiguration *AndroidRunConfigurationFactory::create(Target *parent,
-    const QString &id)
+    const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;

src/plugins/android/androidrunfactories.h

@@ -59,11 +59,11 @@ public:
     explicit AndroidRunConfigurationFactory(QObject *parent = 0);
     ~AndroidRunConfigurationFactory();
 
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
-    QStringList availableCreationIds(Target *parent) const;
+    QList<Core::Id> availableCreationIds(Target *parent) const;
 
-    bool canCreate(Target *parent, const QString &id) const;
+    bool canCreate(Target *parent, const Core::Id id) const;
-    RunConfiguration *create(Target *parent, const QString &id);
+    RunConfiguration *create(Target *parent, const Core::Id id);
 
     bool canRestore(Target *parent, const QVariantMap &map) const;
     RunConfiguration *restore(Target *parent, const QVariantMap &map);

src/plugins/android/androidtarget.cpp

@@ -78,7 +78,7 @@ namespace {
 namespace Android {
 namespace Internal {
 
-AndroidTarget::AndroidTarget(Qt4Project *parent, const QString &id) :
+AndroidTarget::AndroidTarget(Qt4Project *parent, const Core::Id id) :
     Qt4BaseTarget(parent, id)
   , m_androidFilesWatcher(new QFileSystemWatcher(this))
   , m_buildConfigurationFactory(new Qt4BuildConfigurationFactory(this))

src/plugins/android/androidtarget.h

@@ -89,7 +89,7 @@ public:
         ReleaseBuildSigned
     };
 
-    explicit AndroidTarget(Qt4ProjectManager::Qt4Project *parent, const QString &id);
+    explicit AndroidTarget(Qt4ProjectManager::Qt4Project *parent, const Core::Id id);
     virtual ~AndroidTarget();
 
     Qt4ProjectManager::Qt4BuildConfigurationFactory *buildConfigurationFactory() const;

src/plugins/android/androidtargetfactory.cpp

@@ -65,38 +65,39 @@ AndroidTargetFactory::~AndroidTargetFactory()
 {
 }
 
-bool AndroidTargetFactory::supportsTargetId(const QString &id) const
+bool AndroidTargetFactory::supportsTargetId(const Core::Id id) const
 {
-    return id == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID);
+    return id == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID);
 }
 
-QSet<QString> AndroidTargetFactory::targetFeatures(const QString &/*id*/) const
+QSet<QString> AndroidTargetFactory::targetFeatures(const Core::Id id) const
 {
+    Q_UNUSED(id);
     QSet<QString> features;
     features << QLatin1String(Qt4ProjectManager::Constants::MOBILE_TARGETFEATURE_ID);
     features << QLatin1String(Qt4ProjectManager::Constants::SHADOWBUILD_TARGETFEATURE_ID);
     return features;
 }
 
-QStringList AndroidTargetFactory::supportedTargetIds() const
+QList<Core::Id> AndroidTargetFactory::supportedTargetIds() const
 {
-    return QStringList() << QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID);
+    return QList<Core::Id>() << Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID);
 }
 
-QString AndroidTargetFactory::displayNameForId(const QString &id) const
+QString AndroidTargetFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID))
+    if (id == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID))
         return AndroidTarget::defaultDisplayName();
     return QString();
 }
 
-QIcon AndroidTargetFactory::iconForId(const QString &id) const
+QIcon AndroidTargetFactory::iconForId(const Core::Id id) const
 {
     Q_UNUSED(id)
     return QIcon(QLatin1String(Constants::ANDROID_SETTINGS_CATEGORY_ICON));
 }
 
-bool AndroidTargetFactory::canCreate(ProjectExplorer::Project *parent, const QString &id) const
+bool AndroidTargetFactory::canCreate(ProjectExplorer::Project *parent, const Core::Id id) const
 {
     if (!qobject_cast<Qt4Project *>(parent))
             return false;
@@ -115,18 +116,18 @@ Qt4BaseTarget *AndroidTargetFactory::restore(ProjectExplorer::Project *parent, c
     if (!canRestore(parent, map))
         return 0;
 
-    const QString id = idFromMap(map);
+    const Core::Id id = idFromMap(map);
     AndroidTarget *target = 0;
     Qt4Project *qt4project = static_cast<Qt4Project *>(parent);
-    if (id == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID))
+    if (id == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID))
-        target = new AndroidTarget(qt4project, QLatin1String("transient ID"));
+        target = new AndroidTarget(qt4project, id);
     if (target && target->fromMap(map))
         return target;
     delete target;
     return 0;
 }
 
-Qt4BaseTarget *AndroidTargetFactory::create(ProjectExplorer::Project *parent, const QString &id)
+Qt4BaseTarget *AndroidTargetFactory::create(ProjectExplorer::Project *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -146,14 +147,14 @@ Qt4BaseTarget *AndroidTargetFactory::create(ProjectExplorer::Project *parent, co
     return create(parent, id, infos);
 }
 
-Qt4BaseTarget *AndroidTargetFactory::create(ProjectExplorer::Project *parent,
+Qt4BaseTarget *AndroidTargetFactory::create(ProjectExplorer::Project *parent, const Core::Id id,
-    const QString &id, const QList<Qt4ProjectManager::BuildConfigurationInfo> &infos)
+                                            const QList<Qt4ProjectManager::BuildConfigurationInfo> &infos)
 {
     if (!canCreate(parent, id))
         return 0;
 
     AndroidTarget *target = 0;
-    if (id == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID))
+    if (id == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID))
         target = new AndroidTarget(static_cast<Qt4Project *>(parent), id);
     Q_ASSERT(target);
 
@@ -168,7 +169,7 @@ Qt4BaseTarget *AndroidTargetFactory::create(ProjectExplorer::Project *parent,
                                     info.importing);
     }
 
-    target->addDeployConfiguration(target->createDeployConfiguration(QLatin1String(ANDROID_DEPLOYCONFIGURATION_ID)));
+    target->addDeployConfiguration(target->createDeployConfiguration(Core::Id(ANDROID_DEPLOYCONFIGURATION_ID)));
 
     target->createApplicationProFiles(false);
     if (target->runConfigurations().isEmpty())
@@ -176,9 +177,9 @@ Qt4BaseTarget *AndroidTargetFactory::create(ProjectExplorer::Project *parent,
     return target;
 }
 
-QString AndroidTargetFactory::buildNameForId(const QString &id) const
+QString AndroidTargetFactory::buildNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID))
+    if (id == Core::Id(Qt4ProjectManager::Constants::ANDROID_DEVICE_TARGET_ID))
         return QLatin1String("android");
     return QString();
 }

src/plugins/android/androidtargetfactory.h

@@ -46,22 +46,22 @@ public:
     AndroidTargetFactory(QObject *parent = 0);
     ~AndroidTargetFactory();
 
-    QStringList supportedTargetIds() const;
+    QList<Core::Id> supportedTargetIds() const;
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
-    QIcon iconForId(const QString &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;
     Qt4ProjectManager::Qt4BaseTarget *restore(ProjectExplorer::Project *parent, const QVariantMap &map);
 
-    bool supportsTargetId(const QString &id) const;
+    bool supportsTargetId(const Core::Id id) const;
-    virtual QSet<QString> targetFeatures(const QString &id) const;
+    virtual QSet<QString> targetFeatures(const Core::Id id) const;
 
-    Qt4ProjectManager::Qt4BaseTarget *create(ProjectExplorer::Project *parent, const QString &id);
+    Qt4ProjectManager::Qt4BaseTarget *create(ProjectExplorer::Project *parent, const Core::Id id);
-    Qt4ProjectManager::Qt4BaseTarget *create(ProjectExplorer::Project *parent, const QString &id,
+    Qt4ProjectManager::Qt4BaseTarget *create(ProjectExplorer::Project *parent, const Core::Id id,
                                              const QList<Qt4ProjectManager::BuildConfigurationInfo> &infos);
 
-    QString buildNameForId(const QString &id) const;
+    QString buildNameForId(const Core::Id id) const;
 };
 
 } // namespace Internal

src/plugins/autotoolsprojectmanager/autogenstep.cpp

@@ -65,32 +65,32 @@ AutogenStepFactory::AutogenStepFactory(QObject *parent) :
 {
 }
 
-QStringList AutogenStepFactory::availableCreationIds(BuildStepList *parent) const
+QList<Core::Id> AutogenStepFactory::availableCreationIds(BuildStepList *parent) const
 {
-    if (parent->target()->project()->id() == QLatin1String(Constants::AUTOTOOLS_PROJECT_ID))
+    if (parent->target()->project()->id() == Core::Id(Constants::AUTOTOOLS_PROJECT_ID))
-        return QStringList() << QLatin1String(AUTOGEN_STEP_ID);
+        return QList<Core::Id>() << Core::Id(AUTOGEN_STEP_ID);
-    return QStringList();
+    return QList<Core::Id>();
 }
 
-QString AutogenStepFactory::displayNameForId(const QString &id) const
+QString AutogenStepFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(AUTOGEN_STEP_ID))
+    if (id == Core::Id(AUTOGEN_STEP_ID))
         return tr("Autogen", "Display name for AutotoolsProjectManager::AutogenStep id.");
     return QString();
 }
 
-bool AutogenStepFactory::canCreate(BuildStepList *parent, const QString &id) const
+bool AutogenStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
 {
-    if (parent->target()->project()->id() != QLatin1String(Constants::AUTOTOOLS_PROJECT_ID))
+    if (parent->target()->project()->id() != Core::Id(Constants::AUTOTOOLS_PROJECT_ID))
         return false;
 
-    if (parent->id() != QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_BUILD))
+    if (parent->id() != Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD))
         return false;
 
-    return QLatin1String(AUTOGEN_STEP_ID) == id;
+    return Core::Id(AUTOGEN_STEP_ID) == id;
 }
 
-BuildStep *AutogenStepFactory::create(BuildStepList *parent, const QString &id)
+BuildStep *AutogenStepFactory::create(BuildStepList *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -111,8 +111,7 @@ BuildStep *AutogenStepFactory::clone(BuildStepList *parent, BuildStep *source)
 
 bool AutogenStepFactory::canRestore(BuildStepList *parent, const QVariantMap &map) const
 {
-    QString id = idFromMap(map);
+    return canCreate(parent, idFromMap(map));
-    return canCreate(parent, id);
 }
 
 BuildStep *AutogenStepFactory::restore(BuildStepList *parent, const QVariantMap &map)
@@ -130,13 +129,13 @@ BuildStep *AutogenStepFactory::restore(BuildStepList *parent, const QVariantMap
 // AutogenStep class
 ////////////////////////
 AutogenStep::AutogenStep(BuildStepList *bsl) :
-    AbstractProcessStep(bsl, QLatin1String(AUTOGEN_STEP_ID)),
+    AbstractProcessStep(bsl, Core::Id(AUTOGEN_STEP_ID)),
     m_runAutogen(false)
 {
     ctor();
 }
 
-AutogenStep::AutogenStep(BuildStepList *bsl, const QString &id) :
+AutogenStep::AutogenStep(BuildStepList *bsl, const Core::Id id) :
     AbstractProcessStep(bsl, id)
 {
     ctor();

src/plugins/autotoolsprojectmanager/autogenstep.h

@@ -64,10 +64,10 @@ class AutogenStepFactory : public ProjectExplorer::IBuildStepFactory
 public:
     AutogenStepFactory(QObject *parent = 0);
 
-    QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
-    bool canCreate(ProjectExplorer::BuildStepList *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
-    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const QString &id);
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
     bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const;
     ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source);
     bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
@@ -113,7 +113,7 @@ signals:
 
 protected:
     AutogenStep(ProjectExplorer::BuildStepList *bsl, AutogenStep *bs);
-    AutogenStep(ProjectExplorer::BuildStepList *bsl, const QString &id);
+    AutogenStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
 
     bool fromMap(const QVariantMap &map);
 

src/plugins/autotoolsprojectmanager/autoreconfstep.cpp

@@ -64,32 +64,32 @@ AutoreconfStepFactory::AutoreconfStepFactory(QObject *parent) :
 {
 }
 
-QStringList AutoreconfStepFactory::availableCreationIds(BuildStepList *parent) const
+QList<Core::Id> AutoreconfStepFactory::availableCreationIds(BuildStepList *parent) const
 {
-    if (parent->target()->project()->id() == QLatin1String(Constants::AUTOTOOLS_PROJECT_ID))
+    if (parent->target()->project()->id() == Core::Id(Constants::AUTOTOOLS_PROJECT_ID))
-        return QStringList() << QLatin1String(AUTORECONF_STEP_ID);
+        return QList<Core::Id>() << Core::Id(AUTORECONF_STEP_ID);
-    return QStringList();
+    return QList<Core::Id>();
 }
 
-QString AutoreconfStepFactory::displayNameForId(const QString &id) const
+QString AutoreconfStepFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(AUTORECONF_STEP_ID))
+    if (id == Core::Id(AUTORECONF_STEP_ID))
         return tr("Autoreconf", "Display name for AutotoolsProjectManager::AutoreconfStep id.");
     return QString();
 }
 
-bool AutoreconfStepFactory::canCreate(BuildStepList *parent, const QString &id) const
+bool AutoreconfStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
 {
-    if (parent->target()->project()->id() != QLatin1String(Constants::AUTOTOOLS_PROJECT_ID))
+    if (parent->target()->project()->id() != Core::Id(Constants::AUTOTOOLS_PROJECT_ID))
         return false;
 
-    if (parent->id() != QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_BUILD))
+    if (parent->id() != Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD))
         return false;
 
-    return QLatin1String(AUTORECONF_STEP_ID) == id;
+    return Core::Id(AUTORECONF_STEP_ID) == id;
 }
 
-BuildStep *AutoreconfStepFactory::create(BuildStepList *parent, const QString &id)
+BuildStep *AutoreconfStepFactory::create(BuildStepList *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -110,8 +110,7 @@ BuildStep *AutoreconfStepFactory::clone(BuildStepList *parent, BuildStep *source
 
 bool AutoreconfStepFactory::canRestore(BuildStepList *parent, const QVariantMap &map) const
 {
-    QString id = idFromMap(map);
+    return canCreate(parent, idFromMap(map));
-    return canCreate(parent, id);
 }
 
 BuildStep *AutoreconfStepFactory::restore(BuildStepList *parent, const QVariantMap &map)
@@ -129,13 +128,13 @@ BuildStep *AutoreconfStepFactory::restore(BuildStepList *parent, const QVariantM
 // AutoreconfStep class
 /////////////////////////
 AutoreconfStep::AutoreconfStep(BuildStepList *bsl) :
-    AbstractProcessStep(bsl, QLatin1String(AUTORECONF_STEP_ID)),
+    AbstractProcessStep(bsl, Core::Id(AUTORECONF_STEP_ID)),
     m_runAutoreconf(false)
 {
     ctor();
 }
 
-AutoreconfStep::AutoreconfStep(BuildStepList *bsl, const QString &id) :
+AutoreconfStep::AutoreconfStep(BuildStepList *bsl, const Core::Id id) :
     AbstractProcessStep(bsl, id)
 {
     ctor();

src/plugins/autotoolsprojectmanager/autoreconfstep.h

@@ -63,11 +63,11 @@ class AutoreconfStepFactory : public ProjectExplorer::IBuildStepFactory
 public:
     AutoreconfStepFactory(QObject *parent = 0);
 
-    QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    bool canCreate(ProjectExplorer::BuildStepList *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
-    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const QString &id);
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
     bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const;
     ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source);
     bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
@@ -113,7 +113,7 @@ signals:
 
 protected:
     AutoreconfStep(ProjectExplorer::BuildStepList *bsl, AutoreconfStep *bs);
-    AutoreconfStep(ProjectExplorer::BuildStepList *bsl, const QString &id);
+    AutoreconfStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
 
     bool fromMap(const QVariantMap &map);
 

src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp

@@ -59,12 +59,12 @@ using namespace ProjectExplorer::Constants;
 // AutotoolsBuildConfiguration class
 //////////////////////////////////////
 AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(AutotoolsTarget *parent)
-    : BuildConfiguration(parent, QLatin1String(AUTOTOOLS_BC_ID))
+    : BuildConfiguration(parent, Core::Id(AUTOTOOLS_BC_ID))
 {
     m_buildDirectory = autotoolsTarget()->defaultBuildDirectory();
 }
 
-AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(AutotoolsTarget *parent, const QString &id)
+AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(AutotoolsTarget *parent, const Core::Id id)
     : BuildConfiguration(parent, id)
 {
 }
@@ -126,30 +126,30 @@ AutotoolsBuildConfigurationFactory::AutotoolsBuildConfigurationFactory(QObject *
 {
 }
 
-QStringList AutotoolsBuildConfigurationFactory::availableCreationIds(Target *parent) const
+QList<Core::Id> AutotoolsBuildConfigurationFactory::availableCreationIds(Target *parent) const
 {
     if (!qobject_cast<AutotoolsTarget *>(parent))
-        return QStringList();
+        return QList<Core::Id>();
-    return QStringList() << QLatin1String(AUTOTOOLS_BC_ID);
+    return QList<Core::Id>() << Core::Id(AUTOTOOLS_BC_ID);
 }
 
-QString AutotoolsBuildConfigurationFactory::displayNameForId(const QString &id) const
+QString AutotoolsBuildConfigurationFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(AUTOTOOLS_BC_ID))
+    if (id == Core::Id(AUTOTOOLS_BC_ID))
         return tr("Build");
     return QString();
 }
 
-bool AutotoolsBuildConfigurationFactory::canCreate(Target *parent, const QString &id) const
+bool AutotoolsBuildConfigurationFactory::canCreate(Target *parent, const Core::Id id) const
 {
     if (!qobject_cast<AutotoolsTarget *>(parent))
         return false;
-    if (id == QLatin1String(AUTOTOOLS_BC_ID))
+    if (id == Core::Id(AUTOTOOLS_BC_ID))
         return true;
     return false;
 }
 
-AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::create(Target *parent, const QString &id)
+AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::create(Target *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -170,7 +170,7 @@ AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::create(Target *
     bc->setDisplayName(buildConfigurationName);
 
     t->addBuildConfiguration(bc);
-    t->addDeployConfiguration(t->createDeployConfiguration(QLatin1String(DEFAULT_DEPLOYCONFIGURATION_ID)));
+    t->addDeployConfiguration(t->createDeployConfiguration(Core::Id(DEFAULT_DEPLOYCONFIGURATION_ID)));
     // User needs to choose where the executable file is.
     // TODO: Parse the file in *Anjuta style* to be able to add custom RunConfigurations.
     t->addRunConfiguration(new CustomExecutableRunConfiguration(t));
@@ -181,7 +181,7 @@ AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::create(Target *
 AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::createDefaultConfiguration(AutotoolsTarget *target) const
 {
     AutotoolsBuildConfiguration *bc = new AutotoolsBuildConfiguration(target);
-    BuildStepList *buildSteps = bc->stepList(QLatin1String(BUILDSTEPS_BUILD));
+    BuildStepList *buildSteps = bc->stepList(Core::Id(BUILDSTEPS_BUILD));
 
     // ### Build Steps Build ###
     // autogen.sh or autoreconf
@@ -205,7 +205,7 @@ AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::createDefaultCo
     makeStep->setBuildTarget(QLatin1String("all"),  /*on =*/ true);
 
     // ### Build Steps Clean ###
-    BuildStepList *cleanSteps = bc->stepList(QLatin1String(BUILDSTEPS_CLEAN));
+    BuildStepList *cleanSteps = bc->stepList(Core::Id(BUILDSTEPS_CLEAN));
     MakeStep *cleanMakeStep = new MakeStep(cleanSteps);
     cleanMakeStep->setAdditionalArguments(QLatin1String("clean"));
     cleanMakeStep->setClean(true);
@@ -231,8 +231,7 @@ AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::clone(Target *p
 
 bool AutotoolsBuildConfigurationFactory::canRestore(Target *parent, const QVariantMap &map) const
 {
-    QString id = idFromMap(map);
+    return canCreate(parent, idFromMap(map));
-    return canCreate(parent, id);
 }
 
 AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::restore(Target *parent, const QVariantMap &map)

src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h

@@ -59,7 +59,7 @@ public:
     BuildType buildType() const;
 
 protected:
-    AutotoolsBuildConfiguration(AutotoolsTarget *parent, const QString &id);
+    AutotoolsBuildConfiguration(AutotoolsTarget *parent, const Core::Id id);
     AutotoolsBuildConfiguration(AutotoolsTarget *parent, AutotoolsBuildConfiguration *source);
 
     bool fromMap(const QVariantMap &map);
@@ -75,11 +75,11 @@ class AutotoolsBuildConfigurationFactory : public ProjectExplorer::IBuildConfigu
 public:
     explicit AutotoolsBuildConfigurationFactory(QObject *parent = 0);
 
-    QStringList availableCreationIds(ProjectExplorer::Target *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    bool canCreate(ProjectExplorer::Target *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
-    AutotoolsBuildConfiguration *create(ProjectExplorer::Target *parent, const QString &id);
+    AutotoolsBuildConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id);
     AutotoolsBuildConfiguration *createDefaultConfiguration(AutotoolsTarget *target) const;
     bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) const;
     AutotoolsBuildConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source);

src/plugins/autotoolsprojectmanager/autotoolsproject.cpp

@@ -128,9 +128,9 @@ QString AutotoolsProject::displayName() const
     return m_projectName;
 }
 
-QString AutotoolsProject::id() const
+Core::Id AutotoolsProject::id() const
 {
-    return QLatin1String(Constants::AUTOTOOLS_PROJECT_ID);
+    return Core::Id(Constants::AUTOTOOLS_PROJECT_ID);
 }
 
 Core::IDocument *AutotoolsProject::document() const
@@ -189,7 +189,7 @@ bool AutotoolsProject::fromMap(const QVariantMap &map)
     if (!hasUserFile) {
         AutotoolsTargetFactory *factory =
                 ExtensionSystem::PluginManager::instance()->getObject<AutotoolsTargetFactory>();
-        AutotoolsTarget *t = factory->create(this, QLatin1String(Constants::DEFAULT_AUTOTOOLS_TARGET_ID));
+        AutotoolsTarget *t = factory->create(this, Core::Id(Constants::DEFAULT_AUTOTOOLS_TARGET_ID));
 
         QTC_ASSERT(t, return false);
         QTC_ASSERT(t->activeBuildConfiguration(), return false);

src/plugins/autotoolsprojectmanager/autotoolsproject.h

@@ -77,7 +77,7 @@ public:
     ~AutotoolsProject();
 
     QString displayName() const;
-    QString id() const;
+    Core::Id id() const;
     Core::IDocument *document() const;
     ProjectExplorer::IProjectManager *projectManager() const;
     AutotoolsTarget *activeTarget() const;

src/plugins/autotoolsprojectmanager/autotoolstarget.cpp

@@ -54,9 +54,9 @@ using namespace AutotoolsProjectManager;
 using namespace AutotoolsProjectManager::Internal;
 using namespace ProjectExplorer;
 
-static QString displayNameForId(const QString &id)
+static QString displayNameForId(const Core::Id id)
 {
-    if (id == QLatin1String(AutotoolsProjectManager::Constants::DEFAULT_AUTOTOOLS_TARGET_ID))
+    if (id == Core::Id(AutotoolsProjectManager::Constants::DEFAULT_AUTOTOOLS_TARGET_ID))
         return QApplication::translate("AutotoolsProjectManager::Internal::AutotoolsTarget",
                               "Desktop", "Autotools Default target display name");
     return QString();
@@ -67,7 +67,7 @@ static QString displayNameForId(const QString &id)
 //////////////////////////
 
 AutotoolsTarget::AutotoolsTarget(AutotoolsProject *parent) :
-    Target(parent, QLatin1String(Constants::DEFAULT_AUTOTOOLS_TARGET_ID)),
+    Target(parent, Core::Id(Constants::DEFAULT_AUTOTOOLS_TARGET_ID)),
     m_buildConfigurationFactory(new AutotoolsBuildConfigurationFactory(this))
 {
     setDefaultDisplayName(displayNameForId(id()));
@@ -113,29 +113,29 @@ AutotoolsTargetFactory::AutotoolsTargetFactory(QObject *parent) :
 {
 }
 
-bool AutotoolsTargetFactory::supportsTargetId(const QString &id) const
+bool AutotoolsTargetFactory::supportsTargetId(const Core::Id id) const
 {
-    return id == QLatin1String(Constants::DEFAULT_AUTOTOOLS_TARGET_ID);
+    return id == Core::Id(Constants::DEFAULT_AUTOTOOLS_TARGET_ID);
 }
 
-QStringList AutotoolsTargetFactory::supportedTargetIds() const
+QList<Core::Id> AutotoolsTargetFactory::supportedTargetIds() const
 {
-    return QStringList() << QLatin1String(Constants::DEFAULT_AUTOTOOLS_TARGET_ID);
+    return QList<Core::Id>() << Core::Id(Constants::DEFAULT_AUTOTOOLS_TARGET_ID);
 }
 
-QString AutotoolsTargetFactory::displayNameForId(const QString &id) const
+QString AutotoolsTargetFactory::displayNameForId(const Core::Id id) const
 {
     return ::displayNameForId(id);
 }
 
-bool AutotoolsTargetFactory::canCreate(Project *parent, const QString &id) const
+bool AutotoolsTargetFactory::canCreate(Project *parent, const Core::Id id) const
 {
     if (!qobject_cast<AutotoolsProject *>(parent))
         return false;
-    return id == QLatin1String(Constants::DEFAULT_AUTOTOOLS_TARGET_ID);
+    return id == Core::Id(Constants::DEFAULT_AUTOTOOLS_TARGET_ID);
 }
 
-AutotoolsTarget *AutotoolsTargetFactory::create(Project *parent, const QString &id)
+AutotoolsTarget *AutotoolsTargetFactory::create(Project *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -149,7 +149,7 @@ AutotoolsTarget *AutotoolsTargetFactory::create(Project *parent, const QString &
     bc->setDisplayName(tr("Default Build"));
 
     t->addBuildConfiguration(bc);
-    t->addDeployConfiguration(t->createDeployConfiguration(QLatin1String(ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID)));
+    t->addDeployConfiguration(t->createDeployConfiguration(Core::Id(ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID)));
     // User needs to choose where the executable file is.
     // TODO: Parse the file in *Anjuta style* to be able to add custom RunConfigurations.
     t->addRunConfiguration(new CustomExecutableRunConfiguration(t));

src/plugins/autotoolsprojectmanager/autotoolstarget.h

@@ -82,13 +82,13 @@ class AutotoolsTargetFactory : public ProjectExplorer::ITargetFactory
 public:
     explicit AutotoolsTargetFactory(QObject *parent = 0);
 
-    bool supportsTargetId(const QString &id) const;
+    bool supportsTargetId(const Core::Id id) const;
 
-    QStringList supportedTargetIds() const;
+    QList<Core::Id> supportedTargetIds() const;
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    bool canCreate(ProjectExplorer::Project *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::Project *parent, const Core::Id id) const;
-    AutotoolsTarget *create(ProjectExplorer::Project *parent, const QString &id);
+    AutotoolsTarget *create(ProjectExplorer::Project *parent, const Core::Id id);
     bool canRestore(ProjectExplorer::Project *parent, const QVariantMap &map) const;
     AutotoolsTarget *restore(ProjectExplorer::Project *parent, const QVariantMap &map);
 };

src/plugins/autotoolsprojectmanager/configurestep.cpp

@@ -65,32 +65,32 @@ ConfigureStepFactory::ConfigureStepFactory(QObject *parent) :
 {
 }
 
-QStringList ConfigureStepFactory::availableCreationIds(BuildStepList *parent) const
+QList<Core::Id> ConfigureStepFactory::availableCreationIds(BuildStepList *parent) const
 {
-    if (parent->target()->project()->id() == QLatin1String(Constants::AUTOTOOLS_PROJECT_ID))
+    if (parent->target()->project()->id() == Core::Id(Constants::AUTOTOOLS_PROJECT_ID))
-        return QStringList() << QLatin1String(CONFIGURE_STEP_ID);
+        return QList<Core::Id>() << Core::Id(CONFIGURE_STEP_ID);
-    return QStringList();
+    return QList<Core::Id>();
 }
 
-QString ConfigureStepFactory::displayNameForId(const QString &id) const
+QString ConfigureStepFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(CONFIGURE_STEP_ID))
+    if (id == Core::Id(CONFIGURE_STEP_ID))
         return tr("Configure", "Display name for AutotoolsProjectManager::ConfigureStep id.");
     return QString();
 }
 
-bool ConfigureStepFactory::canCreate(BuildStepList *parent, const QString &id) const
+bool ConfigureStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
 {
-    if (parent->target()->project()->id() != QLatin1String(Constants::AUTOTOOLS_PROJECT_ID))
+    if (parent->target()->project()->id() != Core::Id(Constants::AUTOTOOLS_PROJECT_ID))
         return false;
 
-    if (parent->id() != QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_BUILD))
+    if (parent->id() != Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD))
         return false;
 
-    return QLatin1String(CONFIGURE_STEP_ID) == id;
+    return Core::Id(CONFIGURE_STEP_ID) == id;
 }
 
-BuildStep *ConfigureStepFactory::create(BuildStepList *parent, const QString &id)
+BuildStep *ConfigureStepFactory::create(BuildStepList *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -111,8 +111,7 @@ BuildStep *ConfigureStepFactory::clone(BuildStepList *parent, BuildStep *source)
 
 bool ConfigureStepFactory::canRestore(BuildStepList *parent, const QVariantMap &map) const
 {
-    QString id(idFromMap(map));
+    return canCreate(parent, idFromMap(map));
-    return canCreate(parent, id);
 }
 
 BuildStep *ConfigureStepFactory::restore(BuildStepList *parent, const QVariantMap &map)
@@ -130,13 +129,13 @@ BuildStep *ConfigureStepFactory::restore(BuildStepList *parent, const QVariantMa
 // ConfigureStep class
 ////////////////////////
 ConfigureStep::ConfigureStep(BuildStepList* bsl) :
-    AbstractProcessStep(bsl, QLatin1String(CONFIGURE_STEP_ID)),
+    AbstractProcessStep(bsl, Core::Id(CONFIGURE_STEP_ID)),
     m_runConfigure(false)
 {
     ctor();
 }
 
-ConfigureStep::ConfigureStep(BuildStepList *bsl, const QString &id) :
+ConfigureStep::ConfigureStep(BuildStepList *bsl, const Core::Id id) :
     AbstractProcessStep(bsl, id)
 {
     ctor();

src/plugins/autotoolsprojectmanager/configurestep.h

@@ -63,11 +63,11 @@ class ConfigureStepFactory : public ProjectExplorer::IBuildStepFactory
 public:
     ConfigureStepFactory(QObject *parent = 0);
 
-    QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    bool canCreate(ProjectExplorer::BuildStepList *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
-    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const QString &id);
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
     bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const;
     ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source);
     bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
@@ -112,7 +112,7 @@ signals:
 
 protected:
     ConfigureStep(ProjectExplorer::BuildStepList *bsl, ConfigureStep *bs);
-    ConfigureStep(ProjectExplorer::BuildStepList *bsl, const QString &id);
+    ConfigureStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
 
     bool fromMap(const QVariantMap &map);
 

src/plugins/autotoolsprojectmanager/makestep.cpp

@@ -68,32 +68,32 @@ MakeStepFactory::MakeStepFactory(QObject *parent) :
 {
 }
 
-QStringList MakeStepFactory::availableCreationIds(BuildStepList *parent) const
+QList<Core::Id> MakeStepFactory::availableCreationIds(BuildStepList *parent) const
 {
-    if (parent->target()->project()->id() == QLatin1String(AUTOTOOLS_PROJECT_ID))
+    if (parent->target()->project()->id() == Core::Id(AUTOTOOLS_PROJECT_ID))
-        return QStringList() << QLatin1String(MAKE_STEP_ID);
+        return QList<Core::Id>() << Core::Id(MAKE_STEP_ID);
-    return QStringList();
+    return QList<Core::Id>();
 }
 
-QString MakeStepFactory::displayNameForId(const QString &id) const
+QString MakeStepFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(MAKE_STEP_ID))
+    if (id == Core::Id(MAKE_STEP_ID))
         return tr("Make", "Display name for AutotoolsProjectManager::MakeStep id.");
     return QString();
 }
 
-bool MakeStepFactory::canCreate(BuildStepList *parent, const QString &id) const
+bool MakeStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
 {
-    if (parent->target()->project()->id() != QLatin1String(AUTOTOOLS_PROJECT_ID))
+    if (parent->target()->project()->id() != Core::Id(AUTOTOOLS_PROJECT_ID))
         return false;
 
-    if (parent->id() != QLatin1String(BUILDSTEPS_BUILD))
+    if (parent->id() != Core::Id(BUILDSTEPS_BUILD))
         return false;
 
-    return QLatin1String(MAKE_STEP_ID) == id;
+    return Core::Id(MAKE_STEP_ID) == id;
 }
 
-BuildStep *MakeStepFactory::create(BuildStepList *parent, const QString &id)
+BuildStep *MakeStepFactory::create(BuildStepList *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -114,8 +114,7 @@ BuildStep *MakeStepFactory::clone(BuildStepList *parent, BuildStep *source)
 
 bool MakeStepFactory::canRestore(BuildStepList *parent, const QVariantMap &map) const
 {
-    QString id = idFromMap(map);
+    return canCreate(parent, idFromMap(map));
-    return canCreate(parent, id);
 }
 
 BuildStep *MakeStepFactory::restore(BuildStepList *parent, const QVariantMap &map)
@@ -133,13 +132,13 @@ BuildStep *MakeStepFactory::restore(BuildStepList *parent, const QVariantMap &ma
 // MakeStep class
 /////////////////////
 MakeStep::MakeStep(BuildStepList* bsl) :
-    AbstractProcessStep(bsl, QLatin1String(MAKE_STEP_ID)),
+    AbstractProcessStep(bsl, Core::Id(MAKE_STEP_ID)),
     m_clean(false)
 {
     ctor();
 }
 
-MakeStep::MakeStep(BuildStepList *bsl, const QString &id) :
+MakeStep::MakeStep(BuildStepList *bsl, const Core::Id id) :
     AbstractProcessStep(bsl, id),
     m_clean(false)
 {

src/plugins/autotoolsprojectmanager/makestep.h

@@ -63,11 +63,11 @@ class MakeStepFactory : public ProjectExplorer::IBuildStepFactory
 public:
     MakeStepFactory(QObject *parent = 0);
 
-    QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    bool canCreate(ProjectExplorer::BuildStepList *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
-    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const QString &id);
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
     bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const;
     ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source);
     bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
@@ -114,7 +114,7 @@ signals:
 
 protected:
     MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs);
-    MakeStep(ProjectExplorer::BuildStepList *bsl, const QString &id);
+    MakeStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
 
     bool fromMap(const QVariantMap &map);
 

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

@@ -54,7 +54,7 @@ const char BUILD_DIRECTORY_KEY[] = "CMakeProjectManager.CMakeBuildConfiguration.
 } // namespace
 
 CMakeBuildConfiguration::CMakeBuildConfiguration(CMakeTarget *parent) :
-    BuildConfiguration(parent, QLatin1String(CMAKE_BC_ID))
+    BuildConfiguration(parent, Core::Id(CMAKE_BC_ID))
 {
     m_buildDirectory = cmakeTarget()->defaultBuildDirectory();
 }
@@ -165,30 +165,30 @@ CMakeBuildConfigurationFactory::~CMakeBuildConfigurationFactory()
 {
 }
 
-QStringList CMakeBuildConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
+QList<Core::Id> CMakeBuildConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
 {
     if (!qobject_cast<CMakeTarget *>(parent))
-        return QStringList();
+        return QList<Core::Id>();
-    return QStringList() << QLatin1String(CMAKE_BC_ID);
+    return QList<Core::Id>() << Core::Id(CMAKE_BC_ID);
 }
 
-QString CMakeBuildConfigurationFactory::displayNameForId(const QString &id) const
+QString CMakeBuildConfigurationFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(CMAKE_BC_ID))
+    if (id == Core::Id(CMAKE_BC_ID))
         return tr("Build");
     return QString();
 }
 
-bool CMakeBuildConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const QString &id) const
+bool CMakeBuildConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const Core::Id id) const
 {
     if (!qobject_cast<CMakeTarget *>(parent))
         return false;
-    if (id == QLatin1String(CMAKE_BC_ID))
+    if (id == Core::Id(CMAKE_BC_ID))
         return true;
     return false;
 }
 
-CMakeBuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer::Target *parent, const QString &id)
+CMakeBuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer::Target *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -257,8 +257,7 @@ CMakeBuildConfiguration *CMakeBuildConfigurationFactory::clone(ProjectExplorer::
 
 bool CMakeBuildConfigurationFactory::canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const
 {
-    QString id(ProjectExplorer::idFromMap(map));
+    return canCreate(parent, ProjectExplorer::idFromMap(map));
-    return canCreate(parent, id);
 }
 
 CMakeBuildConfiguration *CMakeBuildConfigurationFactory::restore(ProjectExplorer::Target *parent, const QVariantMap &map)

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h

@@ -86,11 +86,11 @@ public:
     CMakeBuildConfigurationFactory(QObject *parent = 0);
     ~CMakeBuildConfigurationFactory();
 
-    QStringList availableCreationIds(ProjectExplorer::Target *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    bool canCreate(ProjectExplorer::Target *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
-    CMakeBuildConfiguration *create(ProjectExplorer::Target *parent, const QString &id);
+    CMakeBuildConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id);
     bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) const;
     CMakeBuildConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source);
     bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -477,9 +477,9 @@ QString CMakeProject::displayName() const
     return m_projectName;
 }
 
-QString CMakeProject::id() const
+Core::Id CMakeProject::id() const
 {
-    return QLatin1String(Constants::CMAKEPROJECT_ID);
+    return Core::Id(Constants::CMAKEPROJECT_ID);
 }
 
 Core::IDocument *CMakeProject::document() const
@@ -525,7 +525,7 @@ bool CMakeProject::fromMap(const QVariantMap &map)
     if (!hasUserFile) {
         CMakeTargetFactory *factory =
                 ExtensionSystem::PluginManager::instance()->getObject<CMakeTargetFactory>();
-        CMakeTarget *t = factory->create(this, QLatin1String(DEFAULT_CMAKE_TARGET_ID));
+        CMakeTarget *t = factory->create(this, Core::Id(DEFAULT_CMAKE_TARGET_ID));
 
         Q_ASSERT(t);
         Q_ASSERT(t->activeBuildConfiguration());

src/plugins/cmakeprojectmanager/cmakeproject.h

@@ -83,7 +83,7 @@ public:
     ~CMakeProject();
 
     QString displayName() const;
-    QString id() const;
+    Core::Id id() const;
     Core::IDocument *document() const;
     CMakeManager *projectManager() const;
 

src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp

@@ -70,22 +70,24 @@ const char ARGUMENTS_KEY[] = "CMakeProjectManager.CMakeRunConfiguration.Argument
 const char USER_ENVIRONMENT_CHANGES_KEY[] = "CMakeProjectManager.CMakeRunConfiguration.UserEnvironmentChanges";
 const char BASE_ENVIRONMENT_BASE_KEY[] = "CMakeProjectManager.BaseEnvironmentBase";
 
-QString buildTargetFromId(const QString &id)
+QString buildTargetFromId(Core::Id id)
 {
-    if (!id.startsWith(QLatin1String(CMAKE_RC_PREFIX)))
+    QString idstr = QString::fromUtf8(id.name());
+    if (!idstr.startsWith(QLatin1String(CMAKE_RC_PREFIX)))
         return QString();
-    return id.mid(QString::fromLatin1(CMAKE_RC_PREFIX).length());
+    return idstr.mid(QString::fromLatin1(CMAKE_RC_PREFIX).length());
 }
 
-QString idFromBuildTarget(const QString &target)
+Core::Id idFromBuildTarget(const QString &target)
 {
-    return QString::fromLatin1(CMAKE_RC_PREFIX) + target;
+    QString id = QString::fromLatin1(CMAKE_RC_PREFIX) + target;
+    return Core::Id(id.toUtf8().constData());
 }
 
 } // namespace
 
 CMakeRunConfiguration::CMakeRunConfiguration(CMakeTarget *parent, const QString &target, const QString &workingDirectory, const QString &title) :
-    ProjectExplorer::LocalApplicationRunConfiguration(parent, QString::fromLatin1(CMAKE_RC_PREFIX)),
+    ProjectExplorer::LocalApplicationRunConfiguration(parent, Core::Id(CMAKE_RC_PREFIX)),
     m_runMode(Gui),
     m_buildTarget(target),
     m_workingDirectory(workingDirectory),
@@ -502,24 +504,24 @@ CMakeRunConfigurationFactory::~CMakeRunConfigurationFactory()
 }
 
 // used to show the list of possible additons to a project, returns a list of ids
-QStringList CMakeRunConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
+QList<Core::Id> CMakeRunConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
 {
     CMakeTarget *t(qobject_cast<CMakeTarget *>(parent));
     if (!t)
-        return QStringList();
+        return QList<Core::Id>();
-    QStringList allIds;
+    QList<Core::Id> allIds;
     foreach (const QString &buildTarget, t->cmakeProject()->buildTargetTitles())
         allIds << idFromBuildTarget(buildTarget);
     return allIds;
 }
 
 // used to translate the ids to names to display to the user
-QString CMakeRunConfigurationFactory::displayNameForId(const QString &id) const
+QString CMakeRunConfigurationFactory::displayNameForId(const Core::Id id) const
 {
     return buildTargetFromId(id);
 }
 
-bool CMakeRunConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const QString &id) const
+bool CMakeRunConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const Core::Id id) const
 {
     CMakeTarget *t(qobject_cast<CMakeTarget *>(parent));
     if (!t)
@@ -527,7 +529,8 @@ bool CMakeRunConfigurationFactory::canCreate(ProjectExplorer::Target *parent, co
     return t->cmakeProject()->hasBuildTarget(buildTargetFromId(id));
 }
 
-ProjectExplorer::RunConfiguration *CMakeRunConfigurationFactory::create(ProjectExplorer::Target *parent, const QString &id)
+ProjectExplorer::RunConfiguration *CMakeRunConfigurationFactory::create(ProjectExplorer::Target *parent,
+                                                                        const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -542,7 +545,7 @@ bool CMakeRunConfigurationFactory::canClone(ProjectExplorer::Target *parent, Pro
 {
     if (!qobject_cast<CMakeTarget *>(parent))
         return false;
-    return source->id() == QLatin1String(CMAKE_RC_ID);
+    return source->id() == Core::Id(CMAKE_RC_ID);
 }
 
 ProjectExplorer::RunConfiguration *CMakeRunConfigurationFactory::clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration * source)
@@ -558,7 +561,7 @@ bool CMakeRunConfigurationFactory::canRestore(ProjectExplorer::Target *parent, c
 {
     if (!qobject_cast<CMakeTarget *>(parent))
         return false;
-    QString id(ProjectExplorer::idFromMap(map));
+    QString id = QString::fromUtf8(ProjectExplorer::idFromMap(map).name());
     return id.startsWith(QLatin1String(CMAKE_RC_ID));
 }
 

src/plugins/cmakeprojectmanager/cmakerunconfiguration.h

@@ -168,15 +168,15 @@ public:
     explicit CMakeRunConfigurationFactory(QObject *parent = 0);
     ~CMakeRunConfigurationFactory();
 
-    bool canCreate(ProjectExplorer::Target *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
-    ProjectExplorer::RunConfiguration *create(ProjectExplorer::Target *parent, const QString &id);
+    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, const QVariantMap &map);
     bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *product) const;
     ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *product);
 
-    QStringList availableCreationIds(ProjectExplorer::Target *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 };
 
 }

src/plugins/cmakeprojectmanager/cmaketarget.cpp

@@ -49,8 +49,8 @@ using namespace CMakeProjectManager::Internal;
 
 namespace {
 
-QString displayNameForId(const QString &id) {
+QString displayNameForId(const Core::Id id) {
-    if (id == QLatin1String(DEFAULT_CMAKE_TARGET_ID))
+    if (id == Core::Id(DEFAULT_CMAKE_TARGET_ID))
         return QApplication::translate("CMakeProjectManager::Internal::CMakeTarget", "Desktop", "CMake Default target display name");
     return QString();
 }
@@ -62,7 +62,7 @@ QString displayNameForId(const QString &id) {
 // -------------------------------------------------------------------------
 
 CMakeTarget::CMakeTarget(CMakeProject *parent) :
-    ProjectExplorer::Target(parent, QLatin1String(DEFAULT_CMAKE_TARGET_ID)),
+    ProjectExplorer::Target(parent, Core::Id(DEFAULT_CMAKE_TARGET_ID)),
     m_buildConfigurationFactory(new CMakeBuildConfigurationFactory(this))
 {
     setDefaultDisplayName(displayNameForId(id()));
@@ -84,9 +84,9 @@ ProjectExplorer::BuildConfigWidget *CMakeTarget::createConfigWidget()
     return new CMakeBuildSettingsWidget(this);
 }
 
-bool CMakeTargetFactory::supportsTargetId(const QString &id) const
+bool CMakeTargetFactory::supportsTargetId(const Core::Id id) const
 {
-    return id == DEFAULT_CMAKE_TARGET_ID;
+    return id == Core::Id(DEFAULT_CMAKE_TARGET_ID);
 }
 
 CMakeBuildConfiguration *CMakeTarget::activeBuildConfiguration() const
@@ -178,23 +178,23 @@ CMakeTargetFactory::~CMakeTargetFactory()
 {
 }
 
-QStringList CMakeTargetFactory::supportedTargetIds() const
+QList<Core::Id> CMakeTargetFactory::supportedTargetIds() const
 {
-    return QStringList() << QLatin1String(DEFAULT_CMAKE_TARGET_ID);
+    return QList<Core::Id>() << Core::Id(DEFAULT_CMAKE_TARGET_ID);
 }
-QString CMakeTargetFactory::displayNameForId(const QString &id) const
+QString CMakeTargetFactory::displayNameForId(const Core::Id id) const
 {
     return ::displayNameForId(id);
 }
 
-bool CMakeTargetFactory::canCreate(ProjectExplorer::Project *parent, const QString &id) const
+bool CMakeTargetFactory::canCreate(ProjectExplorer::Project *parent, const Core::Id id) const
 {
     if (!qobject_cast<CMakeProject *>(parent))
         return false;
-    return id == QLatin1String(DEFAULT_CMAKE_TARGET_ID);
+    return id == Core::Id(DEFAULT_CMAKE_TARGET_ID);
 }
 
-CMakeTarget *CMakeTargetFactory::create(ProjectExplorer::Project *parent, const QString &id)
+CMakeTarget *CMakeTargetFactory::create(ProjectExplorer::Project *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;

src/plugins/cmakeprojectmanager/cmaketarget.h

@@ -83,13 +83,13 @@ public:
     CMakeTargetFactory(QObject *parent = 0);
     ~CMakeTargetFactory();
 
-    bool supportsTargetId(const QString &id) const;
+    bool supportsTargetId(const Core::Id id) const;
 
-    QStringList supportedTargetIds() const;
+    QList<Core::Id> supportedTargetIds() const;
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    bool canCreate(ProjectExplorer::Project *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::Project *parent, const Core::Id id) const;
-    CMakeTarget *create(ProjectExplorer::Project *parent, const QString &id);
+    CMakeTarget *create(ProjectExplorer::Project *parent, const Core::Id id);
     bool canRestore(ProjectExplorer::Project *parent, const QVariantMap &map) const;
     CMakeTarget *restore(ProjectExplorer::Project *parent, const QVariantMap &map);
 };

src/plugins/cmakeprojectmanager/makestep.cpp

@@ -66,13 +66,13 @@ const char * const ADDITIONAL_ARGUMENTS_KEY("CMakeProjectManager.MakeStep.Additi
 // TODO: Move progress information into an IOutputParser!
 
 MakeStep::MakeStep(BuildStepList *bsl) :
-    AbstractProcessStep(bsl, QLatin1String(MS_ID)), m_clean(false),
+    AbstractProcessStep(bsl, Core::Id(MS_ID)), m_clean(false),
     m_futureInterface(0)
 {
     ctor();
 }
 
-MakeStep::MakeStep(BuildStepList *bsl, const QString &id) :
+MakeStep::MakeStep(BuildStepList *bsl, const Core::Id id) :
     AbstractProcessStep(bsl, id), m_clean(false),
     m_futureInterface(0)
 {
@@ -339,19 +339,19 @@ MakeStepFactory::~MakeStepFactory()
 {
 }
 
-bool MakeStepFactory::canCreate(BuildStepList *parent, const QString &id) const
+bool MakeStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
 {
-    if (parent->target()->project()->id() != QLatin1String(Constants::CMAKEPROJECT_ID))
+    if (parent->target()->project()->id() != Core::Id(Constants::CMAKEPROJECT_ID))
         return false;
-    return QLatin1String(MS_ID) == id;
+    return Core::Id(MS_ID) == id;
 }
 
-BuildStep *MakeStepFactory::create(BuildStepList *parent, const QString &id)
+BuildStep *MakeStepFactory::create(BuildStepList *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
     MakeStep *step = new MakeStep(parent);
-    if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
+    if (parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)) {
         step->setClean(true);
         step->setAdditionalArguments("clean");
     }
@@ -372,8 +372,7 @@ BuildStep *MakeStepFactory::clone(BuildStepList *parent, BuildStep *source)
 
 bool MakeStepFactory::canRestore(BuildStepList *parent, const QVariantMap &map) const
 {
-    QString id(ProjectExplorer::idFromMap(map));
+    return canCreate(parent, idFromMap(map));
-    return canCreate(parent, id);
 }
 
 BuildStep *MakeStepFactory::restore(BuildStepList *parent, const QVariantMap &map)
@@ -387,16 +386,16 @@ BuildStep *MakeStepFactory::restore(BuildStepList *parent, const QVariantMap &ma
     return 0;
 }
 
-QStringList MakeStepFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
+QList<Core::Id> MakeStepFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
 {
-    if (parent->target()->project()->id() == QLatin1String(Constants::CMAKEPROJECT_ID))
+    if (parent->target()->project()->id() == Core::Id(Constants::CMAKEPROJECT_ID))
-        return QStringList() << QLatin1String(MS_ID);
+        return QList<Core::Id>() << Core::Id(MS_ID);
-    return QStringList();
+    return QList<Core::Id>();
 }
 
-QString MakeStepFactory::displayNameForId(const QString &id) const
+QString MakeStepFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(MS_ID))
+    if (id == Core::Id(MS_ID))
         return tr("Make", "Display name for CMakeProjectManager::MakeStep id.");
     return QString();
 }

src/plugins/cmakeprojectmanager/makestep.h

@@ -83,7 +83,7 @@ public:
 
 protected:
     MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs);
-    MakeStep(ProjectExplorer::BuildStepList *bsl, const QString &id);
+    MakeStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
 
     bool fromMap(const QVariantMap &map);
 
@@ -127,15 +127,15 @@ public:
     explicit MakeStepFactory(QObject *parent = 0);
     virtual ~MakeStepFactory();
 
-    virtual bool canCreate(ProjectExplorer::BuildStepList *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
-    virtual ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const QString &id);
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
-    virtual bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const;
+    bool canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const;
-    virtual ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source);
+    ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source);
-    virtual bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
+    bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
-    virtual ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
+    ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
 
-    virtual QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
-    virtual QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 };
 
 } // namespace Internal

src/plugins/coreplugin/id.h

@@ -53,6 +53,8 @@ public:
     bool isValid() const { return m_id; }
     bool operator==(const Id &id) const { return m_id == id.m_id; }
     bool operator!=(const Id &id) const { return m_id != id.m_id; }
+    bool operator<(const Id &id) const { return m_id < id.m_id; }
+    bool operator>(const Id &id) const { return m_id > id.m_id; }
     int uniqueIdentifier() const { return m_id; }
     static Id fromUniqueIdentifier(int uid) { return Id(uid, uid); }
 

src/plugins/genericprojectmanager/genericbuildconfiguration.cpp

@@ -54,11 +54,11 @@ const char * const BUILD_DIRECTORY_KEY("GenericProjectManager.GenericBuildConfig
 }
 
 GenericBuildConfiguration::GenericBuildConfiguration(GenericTarget *parent)
-    : BuildConfiguration(parent, QLatin1String(GENERIC_BC_ID))
+    : BuildConfiguration(parent, Core::Id(GENERIC_BC_ID))
 {
 }
 
-GenericBuildConfiguration::GenericBuildConfiguration(GenericTarget *parent, const QString &id)
+GenericBuildConfiguration::GenericBuildConfiguration(GenericTarget *parent, const Core::Id id)
     : BuildConfiguration(parent, id)
 {
 }
@@ -139,30 +139,30 @@ GenericBuildConfigurationFactory::~GenericBuildConfigurationFactory()
 {
 }
 
-QStringList GenericBuildConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
+QList<Core::Id> GenericBuildConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const
 {
     if (!qobject_cast<GenericTarget *>(parent))
-        return QStringList();
+        return QList<Core::Id>();
-    return QStringList() << QLatin1String(GENERIC_BC_ID);
+    return QList<Core::Id>() << Core::Id(GENERIC_BC_ID);
 }
 
-QString GenericBuildConfigurationFactory::displayNameForId(const QString &id) const
+QString GenericBuildConfigurationFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(GENERIC_BC_ID))
+    if (id == Core::Id(GENERIC_BC_ID))
         return tr("Build");
     return QString();
 }
 
-bool GenericBuildConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const QString &id) const
+bool GenericBuildConfigurationFactory::canCreate(ProjectExplorer::Target *parent, const Core::Id id) const
 {
     if (!qobject_cast<GenericTarget *>(parent))
         return false;
-    if (id == QLatin1String(GENERIC_BC_ID))
+    if (id == Core::Id(GENERIC_BC_ID))
         return true;
     return false;
 }
 
-BuildConfiguration *GenericBuildConfigurationFactory::create(ProjectExplorer::Target *parent, const QString &id)
+BuildConfiguration *GenericBuildConfigurationFactory::create(ProjectExplorer::Target *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -215,8 +215,7 @@ BuildConfiguration *GenericBuildConfigurationFactory::clone(ProjectExplorer::Tar
 
 bool GenericBuildConfigurationFactory::canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const
 {
-    QString id(ProjectExplorer::idFromMap(map));
+    return canCreate(parent, ProjectExplorer::idFromMap(map));
-    return canCreate(parent, id);
 }
 
 BuildConfiguration *GenericBuildConfigurationFactory::restore(ProjectExplorer::Target *parent, const QVariantMap &map)

src/plugins/genericprojectmanager/genericbuildconfiguration.h

@@ -65,7 +65,7 @@ public:
 
 protected:
     GenericBuildConfiguration(GenericTarget *parent, GenericBuildConfiguration *source);
-    GenericBuildConfiguration(GenericTarget *parent, const QString &id);
+    GenericBuildConfiguration(GenericTarget *parent, const Core::Id id);
     virtual bool fromMap(const QVariantMap &map);
 
 private:
@@ -78,13 +78,13 @@ class GenericBuildConfigurationFactory : public ProjectExplorer::IBuildConfigura
 
 public:
     explicit GenericBuildConfigurationFactory(QObject *parent = 0);
-    virtual ~GenericBuildConfigurationFactory();
+    ~GenericBuildConfigurationFactory();
 
-    QStringList availableCreationIds(ProjectExplorer::Target *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    bool canCreate(ProjectExplorer::Target *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
-    ProjectExplorer::BuildConfiguration *create(ProjectExplorer::Target *parent, const QString &id);
+    ProjectExplorer::BuildConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id);
     bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source) const;
     ProjectExplorer::BuildConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::BuildConfiguration *source);
     bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;

src/plugins/genericprojectmanager/genericmakestep.cpp

@@ -69,13 +69,13 @@ const char * const CLEAN_KEY("GenericProjectManager.GenericMakeStep.Clean");
 }
 
 GenericMakeStep::GenericMakeStep(ProjectExplorer::BuildStepList *parent) :
-    AbstractProcessStep(parent, QLatin1String(GENERIC_MS_ID)),
+    AbstractProcessStep(parent, Core::Id(GENERIC_MS_ID)),
     m_clean(false)
 {
     ctor();
 }
 
-GenericMakeStep::GenericMakeStep(ProjectExplorer::BuildStepList *parent, const QString &id) :
+GenericMakeStep::GenericMakeStep(ProjectExplorer::BuildStepList *parent, const Core::Id id) :
     AbstractProcessStep(parent, id),
     m_clean(false)
 {
@@ -315,20 +315,20 @@ GenericMakeStepFactory::~GenericMakeStepFactory()
 }
 
 bool GenericMakeStepFactory::canCreate(ProjectExplorer::BuildStepList *parent,
-                                       const QString &id) const
+                                       const Core::Id id) const
 {
-    if (parent->target()->project()->id() != QLatin1String(Constants::GENERICPROJECT_ID))
+    if (parent->target()->project()->id() != Core::Id(Constants::GENERICPROJECT_ID))
         return false;
-    return id == QLatin1String(GENERIC_MS_ID);
+    return id == Core::Id(GENERIC_MS_ID);
 }
 
 ProjectExplorer::BuildStep *GenericMakeStepFactory::create(ProjectExplorer::BuildStepList *parent,
-                                                           const QString &id)
+                                                           const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
     GenericMakeStep *step = new GenericMakeStep(parent);
-    if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
+    if (parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)) {
         step->setClean(true);
         step->setBuildTarget("clean", /* on = */ true);
     }
@@ -338,8 +338,7 @@ ProjectExplorer::BuildStep *GenericMakeStepFactory::create(ProjectExplorer::Buil
 bool GenericMakeStepFactory::canClone(ProjectExplorer::BuildStepList *parent,
                                       ProjectExplorer::BuildStep *source) const
 {
-    const QString id(source->id());
+    return canCreate(parent, source->id());
-    return canCreate(parent, id);
 }
 
 ProjectExplorer::BuildStep *GenericMakeStepFactory::clone(ProjectExplorer::BuildStepList *parent,
@@ -355,8 +354,7 @@ ProjectExplorer::BuildStep *GenericMakeStepFactory::clone(ProjectExplorer::Build
 bool GenericMakeStepFactory::canRestore(ProjectExplorer::BuildStepList *parent,
                                         const QVariantMap &map) const
 {
-    QString id(ProjectExplorer::idFromMap(map));
+    return canCreate(parent, ProjectExplorer::idFromMap(map));
-    return canCreate(parent, id);
 }
 
 ProjectExplorer::BuildStep *GenericMakeStepFactory::restore(ProjectExplorer::BuildStepList *parent,
@@ -371,16 +369,16 @@ ProjectExplorer::BuildStep *GenericMakeStepFactory::restore(ProjectExplorer::Bui
     return 0;
 }
 
-QStringList GenericMakeStepFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
+QList<Core::Id> GenericMakeStepFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
 {
-    if (parent->target()->project()->id() != QLatin1String(Constants::GENERICPROJECT_ID))
+    if (parent->target()->project()->id() != Core::Id(Constants::GENERICPROJECT_ID))
-        return QStringList();
+        return QList<Core::Id>();
-    return QStringList() << QLatin1String(GENERIC_MS_ID);
+    return QList<Core::Id>() << Core::Id(GENERIC_MS_ID);
 }
 
-QString GenericMakeStepFactory::displayNameForId(const QString &id) const
+QString GenericMakeStepFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(GENERIC_MS_ID))
+    if (id == Core::Id(GENERIC_MS_ID))
         return QCoreApplication::translate("GenericProjectManager::Internal::GenericMakeStep",
                                            GENERIC_MS_DISPLAY_NAME);
     return QString();

src/plugins/genericprojectmanager/genericmakestep.h

@@ -78,7 +78,7 @@ public:
 
 protected:
     GenericMakeStep(ProjectExplorer::BuildStepList *parent, GenericMakeStep *bs);
-    GenericMakeStep(ProjectExplorer::BuildStepList *parent, const QString &id);
+    GenericMakeStep(ProjectExplorer::BuildStepList *parent, const Core::Id id);
     virtual bool fromMap(const QVariantMap &map);
 
 private:
@@ -115,23 +115,20 @@ class GenericMakeStepFactory : public ProjectExplorer::IBuildStepFactory
 
 public:
     explicit GenericMakeStepFactory(QObject *parent = 0);
-    virtual ~GenericMakeStepFactory();
+    ~GenericMakeStepFactory();
 
-    virtual bool canCreate(ProjectExplorer::BuildStepList *parent,
+    bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
-                           const QString &id) const;
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
-    virtual ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent,
+    bool canClone(ProjectExplorer::BuildStepList *parent,
-                                               const QString &id);
+                  ProjectExplorer::BuildStep *source) const;
-    virtual bool canClone(ProjectExplorer::BuildStepList *parent,
+    ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
-                          ProjectExplorer::BuildStep *source) const;
+                                      ProjectExplorer::BuildStep *source);
-    virtual ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
+    bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
-                                              ProjectExplorer::BuildStep *source);
+    ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
-    virtual bool canRestore(ProjectExplorer::BuildStepList *parent,
+                                        const QVariantMap &map);
-                            const QVariantMap &map) const;
-    virtual ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
-                                                const QVariantMap &map);
 
-    virtual QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
-    virtual QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 };
 
 } // namespace Internal

src/plugins/genericprojectmanager/genericproject.cpp

@@ -415,9 +415,9 @@ QString GenericProject::displayName() const
     return m_projectName;
 }
 
-QString GenericProject::id() const
+Core::Id GenericProject::id() const
 {
-    return QLatin1String(Constants::GENERICPROJECT_ID);
+    return Core::Id(Constants::GENERICPROJECT_ID);
 }
 
 Core::IDocument *GenericProject::document() const
@@ -484,7 +484,7 @@ bool GenericProject::fromMap(const QVariantMap &map)
     if (targets().isEmpty()) {
         GenericTargetFactory *factory =
                 ExtensionSystem::PluginManager::instance()->getObject<GenericTargetFactory>();
-        addTarget(factory->create(this, QLatin1String(GENERIC_DESKTOP_TARGET_ID)));
+        addTarget(factory->create(this, Core::Id(GENERIC_DESKTOP_TARGET_ID)));
     }
 
     QString id = map.value(QLatin1String(TOOLCHAIN_KEY)).toString();

src/plugins/genericprojectmanager/genericproject.h

@@ -81,7 +81,7 @@ public:
     QString configFileName() const;
 
     QString displayName() const;
-    QString id() const;
+    Core::Id id() const;
     Core::IDocument *document() const;
     ProjectExplorer::IProjectManager *projectManager() const;
     GenericTarget *activeTarget() const;

src/plugins/genericprojectmanager/generictarget.cpp

@@ -54,7 +54,7 @@ using namespace GenericProjectManager::Internal;
 ////////////////////////////////////////////////////////////////////////////////////
 
 GenericTarget::GenericTarget(GenericProject *parent) :
-    ProjectExplorer::Target(parent, QLatin1String(GENERIC_DESKTOP_TARGET_ID)),
+    ProjectExplorer::Target(parent, Core::Id(GENERIC_DESKTOP_TARGET_ID)),
     m_buildConfigurationFactory(new GenericBuildConfigurationFactory(this))
 {
     setDefaultDisplayName(QApplication::translate("GenericProjectManager::GenericTarget",
@@ -96,33 +96,33 @@ GenericTargetFactory::GenericTargetFactory(QObject *parent) :
 {
 }
 
-bool GenericTargetFactory::supportsTargetId(const QString &id) const
+bool GenericTargetFactory::supportsTargetId(const Core::Id id) const
 {
-    return id == QLatin1String(GENERIC_DESKTOP_TARGET_ID);
+    return id == Core::Id(GENERIC_DESKTOP_TARGET_ID);
 }
 
-QStringList GenericTargetFactory::supportedTargetIds() const
+QList<Core::Id> GenericTargetFactory::supportedTargetIds() const
 {
-    return QStringList() << QLatin1String(GENERIC_DESKTOP_TARGET_ID);
+    return QList<Core::Id>() << Core::Id(GENERIC_DESKTOP_TARGET_ID);
 }
 
-QString GenericTargetFactory::displayNameForId(const QString &id) const
+QString GenericTargetFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(GENERIC_DESKTOP_TARGET_ID))
+    if (id == Core::Id(GENERIC_DESKTOP_TARGET_ID))
         return QCoreApplication::translate("GenericProjectManager::GenericTarget",
                                            GENERIC_DESKTOP_TARGET_DISPLAY_NAME,
                                            "Generic desktop target display name");
     return QString();
 }
 
-bool GenericTargetFactory::canCreate(ProjectExplorer::Project *parent, const QString &id) const
+bool GenericTargetFactory::canCreate(ProjectExplorer::Project *parent, const Core::Id id) const
 {
     if (!qobject_cast<GenericProject *>(parent))
         return false;
-    return id == QLatin1String(GENERIC_DESKTOP_TARGET_ID);
+    return id == Core::Id(GENERIC_DESKTOP_TARGET_ID);
 }
 
-GenericTarget *GenericTargetFactory::create(ProjectExplorer::Project *parent, const QString &id)
+GenericTarget *GenericTargetFactory::create(ProjectExplorer::Project *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;

src/plugins/genericprojectmanager/generictarget.h

@@ -83,13 +83,13 @@ class GenericTargetFactory : public ProjectExplorer::ITargetFactory
 public:
     explicit GenericTargetFactory(QObject *parent = 0);
 
-    bool supportsTargetId(const QString &id) const;
+    bool supportsTargetId(const Core::Id id) const;
 
-    QStringList supportedTargetIds() const;
+    QList<Core::Id> supportedTargetIds() const;
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    bool canCreate(ProjectExplorer::Project *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::Project *parent, const Core::Id id) const;
-    GenericTarget *create(ProjectExplorer::Project *parent, const QString &id);
+    GenericTarget *create(ProjectExplorer::Project *parent, const Core::Id id);
     bool canRestore(ProjectExplorer::Project *parent, const QVariantMap &map) const;
     GenericTarget *restore(ProjectExplorer::Project *parent, const QVariantMap &map);
 };

src/plugins/madde/maddeuploadandinstallpackagesteps.cpp

@@ -188,9 +188,9 @@ bool MaemoUploadAndInstallPackageStep::initInternal(QString *error)
     return deployService()->isDeploymentPossible(error);
 }
 
-QString MaemoUploadAndInstallPackageStep::stepId()
+Core::Id MaemoUploadAndInstallPackageStep::stepId()
 {
-    return QLatin1String("MaemoUploadAndInstallDpkgPackageStep");
+    return Core::Id("MaemoUploadAndInstallDpkgPackageStep");
 }
 
 QString MaemoUploadAndInstallPackageStep::displayName()
@@ -235,9 +235,9 @@ bool MeegoUploadAndInstallPackageStep::initInternal(QString *error)
     return deployService()->isDeploymentPossible(error);
 }
 
-QString MeegoUploadAndInstallPackageStep::stepId()
+Core::Id MeegoUploadAndInstallPackageStep::stepId()
 {
-    return QLatin1String("MaemoUploadAndInstallRpmPackageStep");
+    return Core::Id("MaemoUploadAndInstallRpmPackageStep");
 }
 
 QString MeegoUploadAndInstallPackageStep::displayName()

src/plugins/madde/maddeuploadandinstallpackagesteps.h

@@ -51,7 +51,7 @@ public:
 
     bool initInternal(QString *error = 0);
 
-    static QString stepId();
+    static Core::Id stepId();
     static QString displayName();
 
 private:
@@ -72,7 +72,7 @@ public:
 
     bool initInternal(QString *error);
 
-    static QString stepId();
+    static Core::Id stepId();
     static QString displayName();
 
 private:

src/plugins/madde/maemoconstants.h

@@ -49,8 +49,8 @@ const char MeeGoOsType[] = "MeeGoOsType";
 #define EXEC_SUFFIX ""
 #endif
 
-static const QLatin1String MAEMO_RC_ID(PREFIX);
+static const char MAEMO_RC_ID[] = PREFIX;
-static const QLatin1String MAEMO_RC_ID_PREFIX(PREFIX ".");
+static const char MAEMO_RC_ID_PREFIX[] = PREFIX ".";
 
 static const QLatin1String LastDeployedHostsKey(PREFIX ".LastDeployedHosts");
 static const QLatin1String LastDeployedFilesKey(PREFIX ".LastDeployedFiles");

src/plugins/madde/maemodeploybymountsteps.cpp

@@ -433,9 +433,9 @@ bool MaemoInstallPackageViaMountStep::initInternal(QString *error)
     return deployService()->isDeploymentPossible(error);
 }
 
-QString MaemoInstallPackageViaMountStep::stepId()
+Core::Id MaemoInstallPackageViaMountStep::stepId()
 {
-    return QLatin1String("MaemoMountAndInstallDeployStep");
+    return Core::Id("MaemoMountAndInstallDeployStep");
 }
 
 QString MaemoInstallPackageViaMountStep::displayName()
@@ -479,9 +479,9 @@ bool MaemoCopyFilesViaMountStep::initInternal(QString *error)
     return deployService()->isDeploymentPossible(error);
 }
 
-QString MaemoCopyFilesViaMountStep::stepId()
+Core::Id MaemoCopyFilesViaMountStep::stepId()
 {
-    return QLatin1String("MaemoMountAndCopyDeployStep");
+    return Core::Id("MaemoMountAndCopyDeployStep");
 }
 
 QString MaemoCopyFilesViaMountStep::displayName()

src/plugins/madde/maemodeploybymountsteps.h

@@ -49,7 +49,7 @@ public:
 
     bool initInternal(QString *error = 0);
 
-    static QString stepId();
+    static Core::Id stepId();
     static QString displayName();
 
 private:
@@ -72,7 +72,7 @@ public:
 
     bool initInternal(QString *error = 0);
 
-    static QString stepId();
+    static Core::Id stepId();
     static QString displayName();
 
 private:

src/plugins/madde/maemodeploystepfactory.cpp

@@ -61,9 +61,9 @@ MaemoDeployStepFactory::MaemoDeployStepFactory(QObject *parent)
 {
 }
 
-QStringList MaemoDeployStepFactory::availableCreationIds(BuildStepList *parent) const
+QList<Core::Id> MaemoDeployStepFactory::availableCreationIds(BuildStepList *parent) const
 {
-    QStringList ids;
+    QList<Core::Id> ids;
     if (!qobject_cast<Qt4MaemoDeployConfiguration *>(parent->parent()))
         return ids;
 
@@ -81,12 +81,13 @@ QStringList MaemoDeployStepFactory::availableCreationIds(BuildStepList *parent)
     if (qobject_cast<Qt4HarmattanTarget *>(parent->target()))
         ids << GenericDirectUploadStep::stepId();
     if (qobject_cast<Qt4Maemo5Target *>(parent->target()))
-        ids << MaemoInstallPackageViaMountStep::stepId() << MaemoCopyFilesViaMountStep::stepId();
+        ids << MaemoInstallPackageViaMountStep::stepId()
+            << MaemoCopyFilesViaMountStep::stepId();
 
     return ids;
 }
 
-QString MaemoDeployStepFactory::displayNameForId(const QString &id) const
+QString MaemoDeployStepFactory::displayNameForId(const Core::Id id) const
 {
     if (id == MaemoInstallPackageViaMountStep::stepId())
         return MaemoInstallPackageViaMountStep::displayName();
@@ -109,12 +110,12 @@ QString MaemoDeployStepFactory::displayNameForId(const QString &id) const
     return QString();
 }
 
-bool MaemoDeployStepFactory::canCreate(BuildStepList *parent, const QString &id) const
+bool MaemoDeployStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
 {
     return availableCreationIds(parent).contains(id) && !parent->contains(id);
 }
 
-BuildStep *MaemoDeployStepFactory::create(BuildStepList *parent, const QString &id)
+BuildStep *MaemoDeployStepFactory::create(BuildStepList *parent, const Core::Id id)
 {
     const Target * const t = parent->target();
 
@@ -127,15 +128,15 @@ BuildStep *MaemoDeployStepFactory::create(BuildStepList *parent, const QString &
     } else if (id == MaemoMakeInstallToSysrootStep::Id) {
         return new MaemoMakeInstallToSysrootStep(parent);
     } else if (id == MaemoInstallPackageViaMountStep::stepId()
-        || (id == OldMaemoDeployStepId && qobject_cast< const Qt4Maemo5Target *>(t))) {
+        || (id == Core::Id(OldMaemoDeployStepId) && qobject_cast< const Qt4Maemo5Target *>(t))) {
         return new MaemoInstallPackageViaMountStep(parent);
     } else if (id == MaemoCopyFilesViaMountStep::stepId()) {
         return new MaemoCopyFilesViaMountStep(parent);
     } else if (id == MaemoUploadAndInstallPackageStep::stepId()
-        || (id == OldMaemoDeployStepId && (qobject_cast<const Qt4HarmattanTarget *>(t)))) {
+        || (id == Core::Id(OldMaemoDeployStepId) && (qobject_cast<const Qt4HarmattanTarget *>(t)))) {
         return new MaemoUploadAndInstallPackageStep(parent);
     } else if (id == MeegoUploadAndInstallPackageStep::stepId()
-        || (id == OldMaemoDeployStepId && (qobject_cast<const Qt4MeegoTarget *>(t)))) {
+        || (id == Core::Id(OldMaemoDeployStepId) && (qobject_cast<const Qt4MeegoTarget *>(t)))) {
         return new MeegoUploadAndInstallPackageStep(parent);
     } else if (id == GenericDirectUploadStep::stepId()) {
         return new GenericDirectUploadStep(parent, id);
@@ -147,7 +148,7 @@ BuildStep *MaemoDeployStepFactory::create(BuildStepList *parent, const QString &
 bool MaemoDeployStepFactory::canRestore(BuildStepList *parent, const QVariantMap &map) const
 {
     return canCreate(parent, idFromMap(map))
-        || idFromMap(map) == OldMaemoDeployStepId;
+        || idFromMap(map) == Core::Id(OldMaemoDeployStepId);
 }
 
 BuildStep *MaemoDeployStepFactory::restore(BuildStepList *parent, const QVariantMap &map)

src/plugins/madde/maemodeploystepfactory.h

@@ -43,24 +43,23 @@ class MaemoDeployStepFactory : public ProjectExplorer::IBuildStepFactory
 public:
     MaemoDeployStepFactory(QObject *parent = 0);
 
-    virtual QStringList availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
-    virtual QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    virtual bool canCreate(ProjectExplorer::BuildStepList *parent,
+    bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
-                           const QString &id) const;
+    ProjectExplorer::BuildStep *
-    virtual ProjectExplorer::BuildStep *
+    create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
-            create(ProjectExplorer::BuildStepList *parent, const QString &id);
 
-    virtual bool canRestore(ProjectExplorer::BuildStepList *parent,
+    bool canRestore(ProjectExplorer::BuildStepList *parent,
-                            const QVariantMap &map) const;
+                    const QVariantMap &map) const;
-    virtual ProjectExplorer::BuildStep *
+    ProjectExplorer::BuildStep *
-            restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
+    restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
 
-    virtual bool canClone(ProjectExplorer::BuildStepList *parent,
+    bool canClone(ProjectExplorer::BuildStepList *parent,
-                          ProjectExplorer::BuildStep *product) const;
+                  ProjectExplorer::BuildStep *product) const;
-    virtual ProjectExplorer::BuildStep *
+    ProjectExplorer::BuildStep *
-            clone(ProjectExplorer::BuildStepList *parent,
+    clone(ProjectExplorer::BuildStepList *parent,
-                  ProjectExplorer::BuildStep *product);
+          ProjectExplorer::BuildStep *product);
 };
 
 } // namespace Internal

src/plugins/madde/maemoglobal.cpp

@@ -57,25 +57,25 @@ namespace {
 static const QLatin1String binQmake("/bin/qmake" EXEC_SUFFIX);
 }
 
-bool MaemoGlobal::isMaemoTargetId(const QString &id)
+bool MaemoGlobal::isMaemoTargetId(const Core::Id id)
 {
     return isFremantleTargetId(id) || isHarmattanTargetId(id)
         || isMeegoTargetId(id);
 }
 
-bool MaemoGlobal::isFremantleTargetId(const QString &id)
+bool MaemoGlobal::isFremantleTargetId(const Core::Id id)
 {
-    return id == QLatin1String(MAEMO5_DEVICE_TARGET_ID);
+    return id == Core::Id(MAEMO5_DEVICE_TARGET_ID);
 }
 
-bool MaemoGlobal::isHarmattanTargetId(const QString &id)
+bool MaemoGlobal::isHarmattanTargetId(const Core::Id id)
 {
-    return id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID);
+    return id == Core::Id(HARMATTAN_DEVICE_TARGET_ID);
 }
 
-bool MaemoGlobal::isMeegoTargetId(const QString &id)
+bool MaemoGlobal::isMeegoTargetId(const Core::Id id)
 {
-    return id == QLatin1String(MEEGO_DEVICE_TARGET_ID);
+    return id == Core::Id(MEEGO_DEVICE_TARGET_ID);
 }
 
 bool MaemoGlobal::isValidMaemo5QtVersion(const QString &qmakePath)

src/plugins/madde/maemoglobal.h

@@ -33,6 +33,7 @@
 #ifndef MAEMOGLOBAL_H
 #define MAEMOGLOBAL_H
 
+#include <coreplugin/id.h>
 #include <coreplugin/idocument.h>
 #include <utils/portlist.h>
 #include <utils/environment.h>
@@ -83,10 +84,10 @@ class MaemoGlobal
 public:
     enum PackagingSystem { Dpkg, Rpm, Tar };
 
-    static bool isMaemoTargetId(const QString &id);
+    static bool isMaemoTargetId(const Core::Id id);
-    static bool isFremantleTargetId(const QString &id);
+    static bool isFremantleTargetId(const Core::Id id);
-    static bool isHarmattanTargetId(const QString &id);
+    static bool isHarmattanTargetId(const Core::Id id);
-    static bool isMeegoTargetId(const QString &id);
+    static bool isMeegoTargetId(const Core::Id id);
     static bool isValidMaemo5QtVersion(const QString &qmakePath);
     static bool isValidHarmattanQtVersion(const QString &qmakePath);
     static bool isValidMeegoQtVersion(const QString &qmakePath);

src/plugins/madde/maemoinstalltosysrootstep.cpp

@@ -142,7 +142,7 @@ private:
 
 
 AbstractMaemoInstallPackageToSysrootStep::AbstractMaemoInstallPackageToSysrootStep(BuildStepList *bsl,
-    const QString &id)
+    Core::Id id)
         : BuildStep(bsl, id)
 {
 }
@@ -259,8 +259,8 @@ QStringList MaemoInstallDebianPackageToSysrootStep::madArguments() const
     return args;
 }
 
-const QString MaemoInstallDebianPackageToSysrootStep::Id
+const Core::Id MaemoInstallDebianPackageToSysrootStep::Id
-    = QLatin1String("MaemoInstallDebianPackageToSysrootStep");
+    = Core::Id("MaemoInstallDebianPackageToSysrootStep");
 
 QString MaemoInstallDebianPackageToSysrootStep::displayName()
 {
@@ -290,8 +290,8 @@ QStringList MaemoInstallRpmPackageToSysrootStep::madArguments() const
     return QStringList() << QLatin1String("xrpm") << QLatin1String("-i");
 }
 
-const QString MaemoInstallRpmPackageToSysrootStep::Id
+const Core::Id MaemoInstallRpmPackageToSysrootStep::Id
-    = QLatin1String("MaemoInstallRpmPackageToSysrootStep");
+    = Core::Id("MaemoInstallRpmPackageToSysrootStep");
 
 QString MaemoInstallRpmPackageToSysrootStep::displayName()
 {
@@ -369,8 +369,8 @@ BuildStepConfigWidget *MaemoCopyToSysrootStep::createConfigWidget()
     return new MaemoCopyFilesToSysrootWidget(this);
 }
 
-const QString MaemoCopyToSysrootStep::Id
+const Core::Id MaemoCopyToSysrootStep::Id
-    = QLatin1String("MaemoCopyToSysrootStep");
+    = Core::Id("MaemoCopyToSysrootStep");
 QString MaemoCopyToSysrootStep::displayName()
 {
     return tr("Copy files to sysroot");
@@ -424,8 +424,8 @@ BuildStepConfigWidget *MaemoMakeInstallToSysrootStep::createConfigWidget()
     return new MaemoCopyFilesToSysrootWidget(this);
 }
 
-const QString MaemoMakeInstallToSysrootStep::Id
+const Core::Id MaemoMakeInstallToSysrootStep::Id
-    = QLatin1String("MaemoMakeInstallToSysrootStep");
+    = Core::Id("MaemoMakeInstallToSysrootStep");
 QString MaemoMakeInstallToSysrootStep::displayName()
 {
     return tr("Copy files to sysroot");

src/plugins/madde/maemoinstalltosysrootstep.h

@@ -59,7 +59,7 @@ public:
 
 protected:
     AbstractMaemoInstallPackageToSysrootStep(ProjectExplorer::BuildStepList *bsl,
-        const QString &id);
+        Core::Id id);
     AbstractMaemoInstallPackageToSysrootStep(ProjectExplorer::BuildStepList *bsl,
         AbstractMaemoInstallPackageToSysrootStep *other);
 
@@ -85,7 +85,7 @@ public:
 
     virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
 
-    static const QString Id;
+    static const Core::Id Id;
     static QString displayName();
 private:
     virtual QStringList madArguments() const;
@@ -101,7 +101,7 @@ public:
 
     virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
 
-    static const QString Id;
+    static const Core::Id Id;
     static QString displayName();
 private:
     virtual QStringList madArguments() const;
@@ -119,7 +119,7 @@ public:
     virtual void run(QFutureInterface<bool> &fi);
     virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
 
-    static const QString Id;
+    static const Core::Id Id;
     static QString displayName();
 private:
     QString m_systemRoot;
@@ -138,7 +138,7 @@ public:
     virtual bool init();
     virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
 
-    static const QString Id;
+    static const Core::Id Id;
     static QString displayName();
 };
 

src/plugins/madde/maemopackagecreationfactory.cpp

@@ -49,7 +49,7 @@ using ProjectExplorer::BuildStep;
 namespace Madde {
 namespace Internal {
 namespace {
-const QString OldCreatePackageId("Qt4ProjectManager.MaemoPackageCreationStep");
+const char OldCreatePackageId[] = "Qt4ProjectManager.MaemoPackageCreationStep";
 } // anonymous namespace
 
 MaemoPackageCreationFactory::MaemoPackageCreationFactory(QObject *parent)
@@ -57,9 +57,9 @@ MaemoPackageCreationFactory::MaemoPackageCreationFactory(QObject *parent)
 {
 }
 
-QStringList MaemoPackageCreationFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
+QList<Core::Id> MaemoPackageCreationFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
 {
-    QStringList ids;
+    QList<Core::Id> ids;
     if (!qobject_cast<Qt4MaemoDeployConfiguration *>(parent->parent()))
         return ids;
     if (qobject_cast<AbstractDebBasedQt4MaemoTarget *>(parent->target())
@@ -72,7 +72,7 @@ QStringList MaemoPackageCreationFactory::availableCreationIds(ProjectExplorer::B
     return ids;
 }
 
-QString MaemoPackageCreationFactory::displayNameForId(const QString &id) const
+QString MaemoPackageCreationFactory::displayNameForId(const Core::Id id) const
 {
     if (id == MaemoDebianPackageCreationStep::CreatePackageId) {
         return QCoreApplication::translate("RemoteLinux::Internal::MaemoPackageCreationFactory",
@@ -84,12 +84,12 @@ QString MaemoPackageCreationFactory::displayNameForId(const QString &id) const
     return QString();
 }
 
-bool MaemoPackageCreationFactory::canCreate(ProjectExplorer::BuildStepList *parent, const QString &id) const
+bool MaemoPackageCreationFactory::canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const
 {
     return availableCreationIds(parent).contains(id);
 }
 
-BuildStep *MaemoPackageCreationFactory::create(ProjectExplorer::BuildStepList *parent, const QString &id)
+BuildStep *MaemoPackageCreationFactory::create(ProjectExplorer::BuildStepList *parent, const Core::Id id)
 {
     Q_ASSERT(canCreate(parent, id));
     if (id == MaemoDebianPackageCreationStep::CreatePackageId)
@@ -102,8 +102,8 @@ BuildStep *MaemoPackageCreationFactory::create(ProjectExplorer::BuildStepList *p
 bool MaemoPackageCreationFactory::canRestore(ProjectExplorer::BuildStepList *parent,
                                              const QVariantMap &map) const
 {
-    const QString id = ProjectExplorer::idFromMap(map);
+    const Core::Id id = ProjectExplorer::idFromMap(map);
-    return canCreate(parent, id) || id == OldCreatePackageId;
+    return canCreate(parent, id) || id == Core::Id(OldCreatePackageId);
 }
 
 BuildStep *MaemoPackageCreationFactory::restore(ProjectExplorer::BuildStepList *parent,
@@ -111,13 +111,13 @@ BuildStep *MaemoPackageCreationFactory::restore(ProjectExplorer::BuildStepList *
 {
     Q_ASSERT(canRestore(parent, map));
     BuildStep * step = 0;
-    const QString id = ProjectExplorer::idFromMap(map);
+    const Core::Id id = ProjectExplorer::idFromMap(map);
     if (id == MaemoDebianPackageCreationStep::CreatePackageId
-            || (id == OldCreatePackageId
+            || (id == Core::Id(OldCreatePackageId)
                 && qobject_cast<AbstractDebBasedQt4MaemoTarget *>(parent->target()))) {
         step = new MaemoDebianPackageCreationStep(parent);
     } else if (id == MaemoRpmPackageCreationStep::CreatePackageId
-               || (id == OldCreatePackageId
+               || (id == Core::Id(OldCreatePackageId)
                    && qobject_cast<AbstractRpmBasedQt4MaemoTarget *>(parent->target()))) {
         step = new MaemoRpmPackageCreationStep(parent);
     }

src/plugins/madde/maemopackagecreationfactory.h

@@ -42,24 +42,23 @@ class MaemoPackageCreationFactory : public ProjectExplorer::IBuildStepFactory
 public:
     MaemoPackageCreationFactory(QObject *parent = 0);
 
-    virtual QStringList availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
-    virtual QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    virtual bool canCreate(ProjectExplorer::BuildStepList *parent,
+    bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
-                           const QString &id) const;
+    ProjectExplorer::BuildStep *
-    virtual ProjectExplorer::BuildStep *
+    create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
-            create(ProjectExplorer::BuildStepList *parent, const QString &id);
 
-    virtual bool canRestore(ProjectExplorer::BuildStepList *parent,
+    bool canRestore(ProjectExplorer::BuildStepList *parent,
-                            const QVariantMap &map) const;
+                    const QVariantMap &map) const;
-    virtual ProjectExplorer::BuildStep *
+    ProjectExplorer::BuildStep *
-            restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
+    restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
 
-    virtual bool canClone(ProjectExplorer::BuildStepList *parent,
+    bool canClone(ProjectExplorer::BuildStepList *parent,
-                          ProjectExplorer::BuildStep *product) const;
+                  ProjectExplorer::BuildStep *product) const;
-    virtual ProjectExplorer::BuildStep *
+    ProjectExplorer::BuildStep *
-            clone(ProjectExplorer::BuildStepList *parent,
+    clone(ProjectExplorer::BuildStepList *parent,
-                  ProjectExplorer::BuildStep *product);
+          ProjectExplorer::BuildStep *product);
 };
 
 } // namespace Internal

src/plugins/madde/maemopackagecreationstep.cpp

@@ -64,7 +64,7 @@ namespace Internal {
 const QLatin1String AbstractMaemoPackageCreationStep::DefaultVersionNumber("0.0.1");
 
 AbstractMaemoPackageCreationStep::AbstractMaemoPackageCreationStep(BuildStepList *bsl,
-    const QString &id) : AbstractPackagingStep(bsl, id)
+    const Core::Id id) : AbstractPackagingStep(bsl, id)
 {
 }
 
@@ -273,8 +273,8 @@ MaemoDebianPackageCreationStep::MaemoDebianPackageCreationStep(BuildStepList *bs
     ctor();
 }
 
-const QString MaemoDebianPackageCreationStep::CreatePackageId
+const Core::Id MaemoDebianPackageCreationStep::CreatePackageId
-    = QLatin1String("MaemoDebianPackageCreationStep");
+    = Core::Id("MaemoDebianPackageCreationStep");
 
 MaemoDebianPackageCreationStep::MaemoDebianPackageCreationStep(BuildStepList *buildConfig,
     MaemoDebianPackageCreationStep *other)
@@ -555,8 +555,8 @@ QString MaemoRpmPackageCreationStep::rpmBuildDir() const
     return cachedPackageDirectory() + QLatin1String("/rrpmbuild");
 }
 
-const QString MaemoRpmPackageCreationStep::CreatePackageId
+const Core::Id MaemoRpmPackageCreationStep::CreatePackageId
-    = QLatin1String("MaemoRpmPackageCreationStep");
+    = Core::Id("MaemoRpmPackageCreationStep");
 
 } // namespace Internal
 } // namespace Madde

src/plugins/madde/maemopackagecreationstep.h

@@ -75,8 +75,7 @@ public:
 
 
 protected:
-    AbstractMaemoPackageCreationStep(ProjectExplorer::BuildStepList *bsl,
+    AbstractMaemoPackageCreationStep(ProjectExplorer::BuildStepList *bsl, const Core::Id id);
-        const QString &id);
     AbstractMaemoPackageCreationStep(ProjectExplorer::BuildStepList *buildConfig,
                              AbstractMaemoPackageCreationStep *other);
 
@@ -136,7 +135,7 @@ private:
     QString m_templatesDirPath;
     bool m_debugBuild;
 
-    static const QString CreatePackageId;
+    static const Core::Id CreatePackageId;
 };
 
 class MaemoRpmPackageCreationStep : public AbstractMaemoPackageCreationStep
@@ -160,7 +159,7 @@ private:
     QString m_specFile;
     QString m_packageFileName;
 
-    static const QString CreatePackageId;
+    static const Core::Id CreatePackageId;
 };
 
 } // namespace Internal

src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.cpp

@@ -75,7 +75,7 @@ MaemoPublishingBuildSettingsPageFremantleFree::~MaemoPublishingBuildSettingsPage
 void MaemoPublishingBuildSettingsPageFremantleFree::collectBuildConfigurations(const Project *project)
 {
     foreach (const Target *const target, project->targets()) {
-        if (target->id() != QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID))
+        if (target->id() != Core::Id(Constants::MAEMO5_DEVICE_TARGET_ID))
             continue;
         foreach (BuildConfiguration * const bc, target->buildConfigurations()) {
             Qt4BuildConfiguration * const qt4Bc

src/plugins/madde/maemopublishingwizardfactories.cpp

@@ -73,7 +73,7 @@ bool MaemoPublishingWizardFactoryFremantleFree::canCreateWizard(const Project *p
     if (!qobject_cast<const Qt4Project *>(project))
         return false;
     foreach (const Target *const target, project->targets()) {
-        if (target->id() != QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID))
+        if (target->id() != Core::Id(Constants::MAEMO5_DEVICE_TARGET_ID))
             continue;
         foreach (const BuildConfiguration *const bc, target->buildConfigurations()) {
             const Qt4BuildConfiguration *const qt4Bc

src/plugins/madde/maemoqtversion.cpp

@@ -141,22 +141,22 @@ QList<ProjectExplorer::Abi> MaemoQtVersion::detectQtAbis() const
     return result;
 }
 
-bool MaemoQtVersion::supportsTargetId(const QString &id) const
+bool MaemoQtVersion::supportsTargetId(Core::Id id) const
 {
     return supportedTargetIds().contains(id);
 }
 
-QSet<QString> MaemoQtVersion::supportedTargetIds() const
+QSet<Core::Id> MaemoQtVersion::supportedTargetIds() const
 {
-    QSet<QString> result;
+    QSet<Core::Id> result;
     if (!isValid())
         return result;
     if (m_deviceType == QLatin1String(Maemo5OsType)) {
-        result.insert(QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID));
+        result.insert(Core::Id(Constants::MAEMO5_DEVICE_TARGET_ID));
     } else if (m_deviceType == QLatin1String(HarmattanOsType)) {
-        result.insert(QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID));
+        result.insert(Core::Id(Constants::HARMATTAN_DEVICE_TARGET_ID));
     } else if (m_deviceType == QLatin1String(MeeGoOsType)) {
-        result.insert(QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID));
+        result.insert(Core::Id(Constants::MEEGO_DEVICE_TARGET_ID));
     }
     return result;
 }

src/plugins/madde/maemoqtversion.h

@@ -53,8 +53,8 @@ public:
     QList<ProjectExplorer::Abi> detectQtAbis() const;
     void addToEnvironment(Utils::Environment &env) const;
 
-    bool supportsTargetId(const QString &id) const;
+    bool supportsTargetId(Core::Id id) const;
-    QSet<QString> supportedTargetIds() const;
+    QSet<Core::Id> supportedTargetIds() const;
 
     QString description() const;
 

src/plugins/madde/maemorunconfiguration.cpp

@@ -192,7 +192,7 @@ const AbstractQt4MaemoTarget *MaemoRunConfiguration::maemoTarget() const
     return maemoTarget;
 }
 
-const QString MaemoRunConfiguration::Id = QLatin1String(MAEMO_RC_ID);
+const Core::Id MaemoRunConfiguration::Id = Core::Id(MAEMO_RC_ID);
 
 } // namespace Internal
 } // namespace Madde

src/plugins/madde/maemorunconfiguration.h

@@ -59,7 +59,7 @@ public:
     QString localDirToMountForRemoteGdb() const;
     QString remoteProjectSourcesMountPoint() const;
 
-    static const QString Id;
+    static const Core::Id Id;
 
 signals:
     void remoteMountsChanged();

src/plugins/madde/maemorunfactories.cpp

@@ -55,11 +55,13 @@ namespace Internal {
 
 namespace {
 
-QString pathFromId(const QString &id)
+QString pathFromId(Core::Id id)
 {
-    if (!id.startsWith(MAEMO_RC_ID_PREFIX))
+    QString idStr = QString::fromUtf8(id.name());
+    const QString prefix = QLatin1String(MAEMO_RC_ID_PREFIX);
+    if (!idStr.startsWith(prefix))
         return QString();
-    return id.mid(QString(MAEMO_RC_ID_PREFIX).size());
+    return idStr.mid(prefix.size());
 }
 
 } // namespace
@@ -73,8 +75,7 @@ MaemoRunConfigurationFactory::~MaemoRunConfigurationFactory()
 {
 }
 
-bool MaemoRunConfigurationFactory::canCreate(Target *parent,
+bool MaemoRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const
-    const QString &id) const
 {
     return qobject_cast<Qt4BaseTarget *>(parent)->qt4Project()
         ->hasApplicationProFile(pathFromId(id));
@@ -85,7 +86,7 @@ bool MaemoRunConfigurationFactory::canRestore(Target *parent,
 {
     Q_UNUSED(parent);
     return qobject_cast<AbstractQt4MaemoTarget *>(parent)
-        && ProjectExplorer::idFromMap(map).startsWith(QLatin1String(MAEMO_RC_ID));
+        && QString::fromUtf8(ProjectExplorer::idFromMap(map).name()).startsWith(QLatin1String(MAEMO_RC_ID));
 }
 
 bool MaemoRunConfigurationFactory::canClone(Target *parent,
@@ -93,24 +94,28 @@ bool MaemoRunConfigurationFactory::canClone(Target *parent,
 {
     const RemoteLinuxRunConfiguration * const rlrc
             = qobject_cast<RemoteLinuxRunConfiguration *>(source);
-    return rlrc && canCreate(parent, source->id() + QLatin1Char('.') + rlrc->proFilePath());
+    QString idStr = QString::fromLatin1(source->id().name()) + QLatin1Char('.') + rlrc->proFilePath();
+    return rlrc && canCreate(parent, Core::Id(idStr.toUtf8().constData()));
 }
 
-QStringList MaemoRunConfigurationFactory::availableCreationIds(Target *parent) const
+QList<Core::Id> MaemoRunConfigurationFactory::availableCreationIds(Target *parent) const
 {
-    if (AbstractQt4MaemoTarget *t = qobject_cast<AbstractQt4MaemoTarget *>(parent))
+    QList<Core::Id> result;
-        return t->qt4Project()->applicationProFilePathes(QLatin1String(MAEMO_RC_ID_PREFIX));
+    if (AbstractQt4MaemoTarget *t = qobject_cast<AbstractQt4MaemoTarget *>(parent)) {
-    return QStringList();
+        QStringList proFiles = t->qt4Project()->applicationProFilePathes(QLatin1String(MAEMO_RC_ID_PREFIX));
+        foreach (const QString &pf, proFiles)
+            result << Core::Id(pf.toUtf8().constData());
+    }
+    return result;
 }
 
-QString MaemoRunConfigurationFactory::displayNameForId(const QString &id) const
+QString MaemoRunConfigurationFactory::displayNameForId(Core::Id id) const
 {
     return QFileInfo(pathFromId(id)).completeBaseName()
         + QLatin1String(" (on remote Maemo device)");
 }
 
-RunConfiguration *MaemoRunConfigurationFactory::create(Target *parent,
+RunConfiguration *MaemoRunConfigurationFactory::create(Target *parent, Core::Id id)
-    const QString &id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -132,8 +137,7 @@ RunConfiguration *MaemoRunConfigurationFactory::restore(Target *parent,
     return 0;
 }
 
-RunConfiguration *MaemoRunConfigurationFactory::clone(Target *parent,
+RunConfiguration *MaemoRunConfigurationFactory::clone(Target *parent, RunConfiguration *source)
-    RunConfiguration *source)
 {
     if (!canClone(parent, source))
         return 0;

src/plugins/madde/maemorunfactories.h

@@ -57,11 +57,11 @@ public:
     explicit MaemoRunConfigurationFactory(QObject *parent = 0);
     ~MaemoRunConfigurationFactory();
 
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(Core::Id id) const;
-    QStringList availableCreationIds(Target *parent) const;
+    QList<Core::Id> availableCreationIds(Target *parent) const;
 
-    bool canCreate(Target *parent, const QString &id) const;
+    bool canCreate(Target *parent, Core::Id id) const;
-    RunConfiguration *create(Target *parent, const QString &id);
+    RunConfiguration *create(Target *parent, Core::Id id);
 
     bool canRestore(Target *parent, const QVariantMap &map) const;
     RunConfiguration *restore(Target *parent, const QVariantMap &map);

src/plugins/madde/qt4maemodeployconfiguration.cpp

@@ -60,7 +60,7 @@ const QString OldDeployConfigId = QLatin1String("2.2MaemoDeployConfig");
 } // namespace
 
 Qt4MaemoDeployConfiguration::Qt4MaemoDeployConfiguration(ProjectExplorer::Target *target,
-        const QString &id, const QString &displayName)
+        const Core::Id id, const QString &displayName)
     : RemoteLinuxDeployConfiguration(target, id, displayName)
 {
 }
@@ -91,34 +91,33 @@ DeployConfigurationWidget *Qt4MaemoDeployConfiguration::configurationWidget() co
 
 Qt4MaemoDeployConfiguration::~Qt4MaemoDeployConfiguration() {}
 
-QString Qt4MaemoDeployConfiguration::fremantleWithPackagingId()
+Core::Id Qt4MaemoDeployConfiguration::fremantleWithPackagingId()
 {
-    return QLatin1String("DeployToFremantleWithPackaging");
+    return Core::Id("DeployToFremantleWithPackaging");
 }
 
-QString Qt4MaemoDeployConfiguration::fremantleWithoutPackagingId()
+Core::Id Qt4MaemoDeployConfiguration::fremantleWithoutPackagingId()
 {
-    return QLatin1String("DeployToFremantleWithoutPackaging");
+    return Core::Id("DeployToFremantleWithoutPackaging");
 }
 
-QString Qt4MaemoDeployConfiguration::harmattanId()
+Core::Id Qt4MaemoDeployConfiguration::harmattanId()
 {
-    return QLatin1String("DeployToHarmattan");
+    return Core::Id("DeployToHarmattan");
 }
 
-QString Qt4MaemoDeployConfiguration::meegoId()
+Core::Id Qt4MaemoDeployConfiguration::meegoId()
 {
-    return QLatin1String("DeployToMeego");
+    return Core::Id("DeployToMeego");
 }
 
-
 Qt4MaemoDeployConfigurationFactory::Qt4MaemoDeployConfigurationFactory(QObject *parent)
     : DeployConfigurationFactory(parent)
 { }
 
-QStringList Qt4MaemoDeployConfigurationFactory::availableCreationIds(Target *parent) const
+QList<Core::Id> Qt4MaemoDeployConfigurationFactory::availableCreationIds(Target *parent) const
 {
-    QStringList ids;
+    QList<Core::Id> ids;
     if (qobject_cast<Qt4Maemo5Target *>(parent)) {
         ids << Qt4MaemoDeployConfiguration::fremantleWithPackagingId()
             << Qt4MaemoDeployConfiguration::fremantleWithoutPackagingId();
@@ -131,7 +130,7 @@ QStringList Qt4MaemoDeployConfigurationFactory::availableCreationIds(Target *par
     return ids;
 }
 
-QString Qt4MaemoDeployConfigurationFactory::displayNameForId(const QString &id) const
+QString Qt4MaemoDeployConfigurationFactory::displayNameForId(Core::Id id) const
 {
     if (id == Qt4MaemoDeployConfiguration::fremantleWithoutPackagingId())
         return tr("Copy Files to Maemo5 Device");
@@ -145,13 +144,13 @@ QString Qt4MaemoDeployConfigurationFactory::displayNameForId(const QString &id)
 }
 
 bool Qt4MaemoDeployConfigurationFactory::canCreate(Target *parent,
-    const QString &id) const
+    Core::Id id) const
 {
     return availableCreationIds(parent).contains(id);
 }
 
 DeployConfiguration *Qt4MaemoDeployConfigurationFactory::create(Target *parent,
-    const QString &id)
+    Core::Id id)
 {
     Q_ASSERT(canCreate(parent, id));
 
@@ -180,7 +179,7 @@ bool Qt4MaemoDeployConfigurationFactory::canRestore(Target *parent,
     const QVariantMap &map) const
 {
     return canCreate(parent, idFromMap(map))
-        || (idFromMap(map) == OldDeployConfigId
+        || (idFromMap(map) == Core::Id(OldDeployConfigId)
             && qobject_cast<AbstractQt4MaemoTarget *>(parent));
 }
 
@@ -189,8 +188,8 @@ DeployConfiguration *Qt4MaemoDeployConfigurationFactory::restore(Target *parent,
 {
     if (!canRestore(parent, map))
         return 0;
-    QString id = idFromMap(map);
+    Core::Id id = idFromMap(map);
-    if (id == OldDeployConfigId) {
+    if (id == Core::Id(OldDeployConfigId)) {
         if (qobject_cast<Qt4Maemo5Target *>(parent))
             id = Qt4MaemoDeployConfiguration::fremantleWithPackagingId();
         else if (qobject_cast<Qt4HarmattanTarget *>(parent))

src/plugins/madde/qt4maemodeployconfiguration.h

@@ -50,15 +50,15 @@ class Qt4MaemoDeployConfigurationFactory : public ProjectExplorer::DeployConfigu
 public:
     explicit Qt4MaemoDeployConfigurationFactory(QObject *parent = 0);
 
-    virtual QStringList availableCreationIds(ProjectExplorer::Target *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
-    virtual QString displayNameForId(const QString &id) const;
+    QString displayNameForId(Core::Id id) const;
-    virtual bool canCreate(ProjectExplorer::Target *parent, const QString &id) const;
+    bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const;
-    virtual ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, const QString &id);
+    ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id);
-    virtual bool canRestore(ProjectExplorer::Target *parent,
+    bool canRestore(ProjectExplorer::Target *parent,
         const QVariantMap &map) const;
-    virtual ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent,
+    ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent,
         const QVariantMap &map);
-    virtual ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent,
+    ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent,
         ProjectExplorer::DeployConfiguration *product);
 };
 
@@ -73,15 +73,15 @@ public:
 
     QString localDesktopFilePath(const RemoteLinux::DeployableFilesPerProFile *proFileInfo) const;
 
-    static QString fremantleWithPackagingId();
+    static Core::Id fremantleWithPackagingId();
-    static QString fremantleWithoutPackagingId();
+    static Core::Id fremantleWithoutPackagingId();
-    static QString harmattanId();
+    static Core::Id harmattanId();
-    static QString meegoId();
+    static Core::Id meegoId();
 
 private:
     friend class Internal::Qt4MaemoDeployConfigurationFactory;
 
-    Qt4MaemoDeployConfiguration(ProjectExplorer::Target *target, const QString &id,
+    Qt4MaemoDeployConfiguration(ProjectExplorer::Target *target, const Core::Id id,
         const QString &displayName);
     Qt4MaemoDeployConfiguration(ProjectExplorer::Target *target,
         Qt4MaemoDeployConfiguration *source);

src/plugins/madde/qt4maemotarget.cpp

@@ -121,7 +121,7 @@ bool adaptTagValue(QByteArray &document, const QByteArray &fieldName,
 } // anonymous namespace
 
 
-AbstractQt4MaemoTarget::AbstractQt4MaemoTarget(Qt4Project *parent, const QString &id,
+AbstractQt4MaemoTarget::AbstractQt4MaemoTarget(Qt4Project *parent, const Core::Id id,
         const QString &qmakeScope) :
     AbstractEmbeddedLinuxTarget(parent, id),
     m_filesWatcher(new Utils::FileSystemWatcher(this)),
@@ -375,8 +375,9 @@ void AbstractQt4MaemoTarget::raiseError(const QString &reason)
 }
 
 AbstractDebBasedQt4MaemoTarget::AbstractDebBasedQt4MaemoTarget(Qt4Project *parent,
-        const QString &id, const QString &qmakeScope)
+                                                               const Core::Id id,
-    : AbstractQt4MaemoTarget(parent, id, qmakeScope)
+                                                               const QString &qmakeScope) :
+    AbstractQt4MaemoTarget(parent, id, qmakeScope)
 {
 }
 
@@ -958,8 +959,8 @@ QString AbstractDebBasedQt4MaemoTarget::shortDayOfWeekName(const QDateTime &dt)
 
 
 AbstractRpmBasedQt4MaemoTarget::AbstractRpmBasedQt4MaemoTarget(Qt4Project *parent,
-        const QString &id, const QString &qmakeScope)
+        const Core::Id id, const QString &qmakeScope) :
-    : AbstractQt4MaemoTarget(parent, id, qmakeScope)
+    AbstractQt4MaemoTarget(parent, id, qmakeScope)
 {
 }
 
@@ -1123,7 +1124,7 @@ bool AbstractRpmBasedQt4MaemoTarget::setValueForTag(const QByteArray &tag,
     return true;
 }
 
-Qt4Maemo5Target::Qt4Maemo5Target(Qt4Project *parent, const QString &id)
+Qt4Maemo5Target::Qt4Maemo5Target(Qt4Project *parent, const Core::Id id)
     : AbstractDebBasedQt4MaemoTarget(parent, id, QLatin1String("maemo5"))
 {
     setDisplayName(defaultDisplayName());
@@ -1167,8 +1168,8 @@ QByteArray Qt4Maemo5Target::defaultSection() const
     return "user/hidden";
 }
 
-Qt4HarmattanTarget::Qt4HarmattanTarget(Qt4Project *parent, const QString &id)
+Qt4HarmattanTarget::Qt4HarmattanTarget(Qt4Project *parent, const Core::Id id) :
-    : AbstractDebBasedQt4MaemoTarget(parent, id, QLatin1String("contains(MEEGO_EDITION,harmattan)"))
+    AbstractDebBasedQt4MaemoTarget(parent, id, QLatin1String("contains(MEEGO_EDITION,harmattan)"))
 {
     setDisplayName(defaultDisplayName());
 }
@@ -1242,9 +1243,9 @@ QByteArray Qt4HarmattanTarget::defaultSection() const
 }
 
 
-Qt4MeegoTarget::Qt4MeegoTarget(Qt4Project *parent, const QString &id)
+Qt4MeegoTarget::Qt4MeegoTarget(Qt4Project *parent, const Core::Id id) :
-    : AbstractRpmBasedQt4MaemoTarget(parent, id,
+    AbstractRpmBasedQt4MaemoTarget(parent, id,
-          QLatin1String("!isEmpty(MEEGO_VERSION_MAJOR):!contains(MEEGO_EDITION,harmattan)"))
+                                   QLatin1String("!isEmpty(MEEGO_VERSION_MAJOR):!contains(MEEGO_EDITION,harmattan)"))
 {
     setDisplayName(defaultDisplayName());
 }

src/plugins/madde/qt4maemotarget.h

@@ -56,8 +56,8 @@ class AbstractQt4MaemoTarget : public RemoteLinux::AbstractEmbeddedLinuxTarget
     friend class Qt4MaemoTargetFactory;
     Q_OBJECT
 public:
-    explicit AbstractQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent, const QString &id,
+    AbstractQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent, const Core::Id id,
-        const QString &qmakeScope);
+                           const QString &qmakeScope);
     virtual ~AbstractQt4MaemoTarget();
 
     void createApplicationProFiles(bool reparse);
@@ -119,8 +119,8 @@ class AbstractDebBasedQt4MaemoTarget : public AbstractQt4MaemoTarget
 {
     Q_OBJECT
 public:
-    AbstractDebBasedQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent, const QString &id,
+    AbstractDebBasedQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent, const Core::Id id,
-        const QString &qmakeScope);
+                                   const QString &qmakeScope);
     ~AbstractDebBasedQt4MaemoTarget();
 
     QString debianDirPath() const;
@@ -192,8 +192,8 @@ class AbstractRpmBasedQt4MaemoTarget : public AbstractQt4MaemoTarget
 {
     Q_OBJECT
 public:
-    AbstractRpmBasedQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent, const QString &id,
+    AbstractRpmBasedQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent, const Core::Id id,
-        const QString &qmakeScope);
+                                   const QString &qmakeScope);
     ~AbstractRpmBasedQt4MaemoTarget();
 
     virtual bool allowsRemoteMounts() const { return false; }
@@ -236,8 +236,7 @@ class Qt4Maemo5Target : public AbstractDebBasedQt4MaemoTarget
 {
     Q_OBJECT
 public:
-    explicit Qt4Maemo5Target(Qt4ProjectManager::Qt4Project *parent,
+    Qt4Maemo5Target(Qt4ProjectManager::Qt4Project *parent, const Core::Id id);
-        const QString &id);
     virtual ~Qt4Maemo5Target();
 
     virtual bool supportsDevice(const QSharedPointer<const ProjectExplorer::IDevice> &device) const;
@@ -262,8 +261,7 @@ class Qt4HarmattanTarget : public AbstractDebBasedQt4MaemoTarget
 {
     Q_OBJECT
 public:
-    explicit Qt4HarmattanTarget(Qt4ProjectManager::Qt4Project *parent,
+    Qt4HarmattanTarget(Qt4ProjectManager::Qt4Project *parent, const Core::Id id);
-        const QString &id);
     virtual ~Qt4HarmattanTarget();
 
     virtual bool supportsDevice(const QSharedPointer<const ProjectExplorer::IDevice> &device) const;
@@ -290,8 +288,7 @@ class Qt4MeegoTarget : public AbstractRpmBasedQt4MaemoTarget
 {
     Q_OBJECT
 public:
-    explicit Qt4MeegoTarget(Qt4ProjectManager::Qt4Project *parent,
+    Qt4MeegoTarget(Qt4ProjectManager::Qt4Project *parent, const Core::Id id);
-        const QString &id);
     virtual ~Qt4MeegoTarget();
     virtual bool supportsDevice(const QSharedPointer<const ProjectExplorer::IDevice> &device) const;
     static QString defaultDisplayName();

src/plugins/madde/qt4maemotargetfactory.cpp

@@ -66,38 +66,38 @@ Qt4MaemoTargetFactory::~Qt4MaemoTargetFactory()
 {
 }
 
-bool Qt4MaemoTargetFactory::supportsTargetId(const QString &id) const
+bool Qt4MaemoTargetFactory::supportsTargetId(const Core::Id id) const
 {
     return MaemoGlobal::isMaemoTargetId(id);
 }
 
-QStringList Qt4MaemoTargetFactory::supportedTargetIds() const
+QList<Core::Id> Qt4MaemoTargetFactory::supportedTargetIds() const
 {
-    QStringList targetIds;
+    QList<Core::Id> targetIds;
-    targetIds << QLatin1String(MAEMO5_DEVICE_TARGET_ID)
+    targetIds << Core::Id(MAEMO5_DEVICE_TARGET_ID)
-              << QLatin1String(HARMATTAN_DEVICE_TARGET_ID)
+              << Core::Id(HARMATTAN_DEVICE_TARGET_ID)
-              << QLatin1String(MEEGO_DEVICE_TARGET_ID);
+              << Core::Id(MEEGO_DEVICE_TARGET_ID);
     return targetIds;
 }
 
-QString Qt4MaemoTargetFactory::displayNameForId(const QString &id) const
+QString Qt4MaemoTargetFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(MAEMO5_DEVICE_TARGET_ID))
+    if (id == Core::Id(MAEMO5_DEVICE_TARGET_ID))
         return Qt4Maemo5Target::defaultDisplayName();
-    else if (id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID))
+    else if (id == Core::Id(HARMATTAN_DEVICE_TARGET_ID))
         return Qt4HarmattanTarget::defaultDisplayName();
-    else if (id == QLatin1String(MEEGO_DEVICE_TARGET_ID))
+    else if (id == Core::Id(MEEGO_DEVICE_TARGET_ID))
         return Qt4MeegoTarget::defaultDisplayName();
     return QString();
 }
 
-QIcon Qt4MaemoTargetFactory::iconForId(const QString &id) const
+QIcon Qt4MaemoTargetFactory::iconForId(const Core::Id id) const
 {
     Q_UNUSED(id)
     return QIcon(":/projectexplorer/images/MaemoDevice.png");
 }
 
-bool Qt4MaemoTargetFactory::canCreate(ProjectExplorer::Project *parent, const QString &id) const
+bool Qt4MaemoTargetFactory::canCreate(ProjectExplorer::Project *parent, const Core::Id id) const
 {
     if (!qobject_cast<Qt4Project *>(parent))
         return false;
@@ -117,34 +117,34 @@ ProjectExplorer::Target *Qt4MaemoTargetFactory::restore(ProjectExplorer::Project
     if (!canRestore(parent, map))
         return 0;
 
-    const QString id = idFromMap(map);
+    const Core::Id id = idFromMap(map);
     AbstractQt4MaemoTarget *target = 0;
     Qt4Project *qt4project = static_cast<Qt4Project *>(parent);
-    if (id == QLatin1String(MAEMO5_DEVICE_TARGET_ID))
+    if (id == Core::Id(MAEMO5_DEVICE_TARGET_ID))
-        target = new Qt4Maemo5Target(qt4project, QLatin1String("transient ID"));
+        target = new Qt4Maemo5Target(qt4project, id);
-    else if (id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID))
+    else if (id == Core::Id(HARMATTAN_DEVICE_TARGET_ID))
-        target = new Qt4HarmattanTarget(qt4project, QLatin1String("transient ID"));
+        target = new Qt4HarmattanTarget(qt4project, id);
-    else if (id == QLatin1String(MEEGO_DEVICE_TARGET_ID))
+    else if (id == Core::Id(MEEGO_DEVICE_TARGET_ID))
-        target = new Qt4MeegoTarget(qt4project, QLatin1String("transient ID"));
+        target = new Qt4MeegoTarget(qt4project, id);
     if (target->fromMap(map))
         return target;
     delete target;
     return 0;
 }
 
-QString Qt4MaemoTargetFactory::buildNameForId(const QString &id) const
+QString Qt4MaemoTargetFactory::buildNameForId(const Core::Id id) const
 {
-    if (id == QLatin1String(MAEMO5_DEVICE_TARGET_ID))
+    if (id == Core::Id(MAEMO5_DEVICE_TARGET_ID))
         return QLatin1String("maemo");
-    else if (id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID))
+    else if (id == Core::Id(HARMATTAN_DEVICE_TARGET_ID))
         return QLatin1String("harmattan");
-    else if (id == QLatin1String(MEEGO_DEVICE_TARGET_ID))
+    else if (id == Core::Id(MEEGO_DEVICE_TARGET_ID))
         return QLatin1String("meego");
     else
         return QString();
 }
 
-QString Qt4MaemoTargetFactory::shadowBuildDirectory(const QString &profilePath, const QString &id, const QString &suffix)
+QString Qt4MaemoTargetFactory::shadowBuildDirectory(const QString &profilePath, const Core::Id id, const QString &suffix)
 {
 #if defined(Q_OS_WIN)
     // No shadowbuilding for windows!
@@ -156,8 +156,9 @@ QString Qt4MaemoTargetFactory::shadowBuildDirectory(const QString &profilePath,
 #endif
 }
 
-QSet<QString> Qt4MaemoTargetFactory::targetFeatures(const QString & /*id*/) const
+QSet<QString> Qt4MaemoTargetFactory::targetFeatures(const Core::Id id) const
 {
+    Q_UNUSED(id);
     QSet<QString> features;
     features << Qt4ProjectManager::Constants::MOBILE_TARGETFEATURE_ID;
 #ifndef Q_OS_WIN
@@ -166,7 +167,7 @@ QSet<QString> Qt4MaemoTargetFactory::targetFeatures(const QString & /*id*/) cons
     return features;
 }
 
-ProjectExplorer::Target *Qt4MaemoTargetFactory::create(ProjectExplorer::Project *parent, const QString &id)
+ProjectExplorer::Target *Qt4MaemoTargetFactory::create(ProjectExplorer::Project *parent, const Core::Id id)
 {
     if (!canCreate(parent, id))
         return 0;
@@ -186,21 +187,21 @@ ProjectExplorer::Target *Qt4MaemoTargetFactory::create(ProjectExplorer::Project
 }
 
 ProjectExplorer::Target *Qt4MaemoTargetFactory::create(ProjectExplorer::Project *parent,
-    const QString &id, const QList<BuildConfigurationInfo> &infos)
+    const Core::Id id, const QList<BuildConfigurationInfo> &infos)
 {
     if (!canCreate(parent, id))
         return 0;
 
     AbstractQt4MaemoTarget *target = 0;
-    QStringList deployConfigIds;
+    QList<Core::Id> deployConfigIds;
-    if (id == QLatin1String(MAEMO5_DEVICE_TARGET_ID)) {
+    if (id == Core::Id(MAEMO5_DEVICE_TARGET_ID)) {
         target = new Qt4Maemo5Target(static_cast<Qt4Project *>(parent), id);
         deployConfigIds << Qt4MaemoDeployConfiguration::fremantleWithPackagingId()
             << Qt4MaemoDeployConfiguration::fremantleWithoutPackagingId();
-    } else if (id == QLatin1String(HARMATTAN_DEVICE_TARGET_ID)) {
+    } else if (id == Core::Id(HARMATTAN_DEVICE_TARGET_ID)) {
         target = new Qt4HarmattanTarget(static_cast<Qt4Project *>(parent), id);
         deployConfigIds << Qt4MaemoDeployConfiguration::harmattanId();
-    } else if (id == QLatin1String(MEEGO_DEVICE_TARGET_ID)) {
+    } else if (id == Core::Id(MEEGO_DEVICE_TARGET_ID)) {
         target = new Qt4MeegoTarget(static_cast<Qt4Project *>(parent), id);
         deployConfigIds << Qt4MaemoDeployConfiguration::meegoId();
     }
@@ -211,7 +212,7 @@ ProjectExplorer::Target *Qt4MaemoTargetFactory::create(ProjectExplorer::Project
                                          info.version(), info.buildConfig,
                                          info.additionalArguments, info.directory, info.importing);
 
-    foreach (const QString &deployConfigId, deployConfigIds) {
+    foreach (const Core::Id &deployConfigId, deployConfigIds) {
         target->addDeployConfiguration(target->createDeployConfiguration(deployConfigId));
     }
     target->createApplicationProFiles(false);

src/plugins/madde/qt4maemotargetfactory.h

@@ -45,24 +45,24 @@ public:
     Qt4MaemoTargetFactory(QObject *parent = 0);
     ~Qt4MaemoTargetFactory();
 
-    QStringList supportedTargetIds() const;
+    QList<Core::Id> supportedTargetIds() const;
-    QString displayNameForId(const QString &id) const;
+    QString displayNameForId(const Core::Id id) const;
-    QIcon iconForId(const QString &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);
 
-    QString shadowBuildDirectory(const QString &profilePath, const QString &id, const QString &suffix);
+    QString shadowBuildDirectory(const QString &profilePath, const Core::Id id, const QString &suffix);
-    QString buildNameForId(const QString &id) const;
+    QString buildNameForId(const Core::Id id) const;
 
-    bool supportsTargetId(const QString &id) const;
+    bool supportsTargetId(const Core::Id id) const;
 
-    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id);
+    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const Core::Id id);
-    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const QString &id,
+    ProjectExplorer::Target *create(ProjectExplorer::Project *parent, const Core::Id id,
         const QList<Qt4ProjectManager::BuildConfigurationInfo> &infos);
 
-    QSet<QString> targetFeatures(const QString &id) const;
+    QSet<QString> targetFeatures(const Core::Id id) const;
 };
 
 } // namespace Internal

src/plugins/projectexplorer/abstractprocessstep.cpp

@@ -90,7 +90,7 @@ using namespace ProjectExplorer;
      Should be used in init()
 */
 
-AbstractProcessStep::AbstractProcessStep(BuildStepList *bsl, const QString &id) :
+AbstractProcessStep::AbstractProcessStep(BuildStepList *bsl, const Core::Id id) :
     BuildStep(bsl, id), m_timer(0), m_futureInterface(0),
     m_ignoreReturnValue(false), m_process(0),
     m_eventLoop(0), m_outputParserChain(0)

src/plugins/projectexplorer/abstractprocessstep.h

@@ -73,7 +73,7 @@ public:
     void appendOutputParser(ProjectExplorer::IOutputParser *parser);
     ProjectExplorer::IOutputParser *outputParser() const;
 protected:
-    AbstractProcessStep(BuildStepList *bsl, const QString &id);
+    AbstractProcessStep(BuildStepList *bsl, const Core::Id id);
     AbstractProcessStep(BuildStepList *bsl, AbstractProcessStep *bs);
 
     virtual void processStarted();

src/plugins/projectexplorer/applicationrunconfiguration.cpp

@@ -41,7 +41,7 @@ namespace ProjectExplorer {
 
 /// LocalApplicationRunConfiguration
 
-LocalApplicationRunConfiguration::LocalApplicationRunConfiguration(Target *target, const QString &id) :
+LocalApplicationRunConfiguration::LocalApplicationRunConfiguration(Target *target, const Core::Id id) :
     RunConfiguration(target, id)
 {
 }

src/plugins/projectexplorer/applicationrunconfiguration.h

@@ -62,7 +62,7 @@ public:
     virtual QStringList dumperLibraryLocations() const = 0;
 
 protected:
-    explicit LocalApplicationRunConfiguration(Target *target, const QString &id);
+    explicit LocalApplicationRunConfiguration(Target *target, const Core::Id id);
     explicit LocalApplicationRunConfiguration(Target *target, LocalApplicationRunConfiguration *rc);
 
     Utils::AbstractMacroExpander *macroExpander() const;

src/plugins/projectexplorer/buildconfiguration.cpp

@@ -80,18 +80,18 @@ bool BuildConfigMacroExpander::resolveMacro(const QString &name, QString *ret)
 }
 } // namespace Internal
 
-BuildConfiguration::BuildConfiguration(Target *target, const QString &id) :
+BuildConfiguration::BuildConfiguration(Target *target, const Core::Id id) :
     ProjectConfiguration(target, id),
     m_clearSystemEnvironment(false),
     m_toolChain(0),
     m_macroExpander(0)
 {
     Q_ASSERT(target);
-    BuildStepList *bsl = new BuildStepList(this, QLatin1String(Constants::BUILDSTEPS_BUILD));
+    BuildStepList *bsl = new BuildStepList(this, Core::Id(Constants::BUILDSTEPS_BUILD));
     //: Display name of the build build step list. Used as part of the labels in the project window.
     bsl->setDefaultDisplayName(tr("Build"));
     m_stepLists.append(bsl);
-    bsl = new BuildStepList(this, QLatin1String(Constants::BUILDSTEPS_CLEAN));
+    bsl = new BuildStepList(this, Core::Id(Constants::BUILDSTEPS_CLEAN));
     //: Display name of the clean build step list. Used as part of the labels in the project window.
     bsl->setDefaultDisplayName(tr("Clean"));
     m_stepLists.append(bsl);
@@ -136,15 +136,15 @@ Utils::AbstractMacroExpander *BuildConfiguration::macroExpander()
     return m_macroExpander;
 }
 
-QStringList BuildConfiguration::knownStepLists() const
+QList<Core::Id> BuildConfiguration::knownStepLists() const
 {
-    QStringList result;
+    QList<Core::Id> result;
     foreach (BuildStepList *list, m_stepLists)
         result.append(list->id());
     return result;
 }
 
-BuildStepList *BuildConfiguration::stepList(const QString &id) const
+BuildStepList *BuildConfiguration::stepList(Core::Id id) const
 {
     foreach (BuildStepList *list, m_stepLists)
         if (id == list->id())
@@ -188,9 +188,9 @@ bool BuildConfiguration::fromMap(const QVariantMap &map)
             delete list;
             return false;
         }
-        if (list->id() == QLatin1String(Constants::BUILDSTEPS_BUILD))
+        if (list->id() == Core::Id(Constants::BUILDSTEPS_BUILD))
             list->setDefaultDisplayName(tr("Build"));
-        else if (list->id() == QLatin1String(Constants::BUILDSTEPS_CLEAN))
+        else if (list->id() == Core::Id(Constants::BUILDSTEPS_CLEAN))
             list->setDefaultDisplayName(tr("Clean"));
         m_stepLists.append(list);
     }
@@ -200,8 +200,8 @@ bool BuildConfiguration::fromMap(const QVariantMap &map)
                                                                    // the BC is not completely set up yet!
 
     // TODO: We currently assume there to be at least a clean and build list!
-    QTC_CHECK(knownStepLists().contains(QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_BUILD)));
+    QTC_CHECK(knownStepLists().contains(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD)));
-    QTC_CHECK(knownStepLists().contains(QLatin1String(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)));
+    QTC_CHECK(knownStepLists().contains(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)));
 
     return ProjectConfiguration::fromMap(map);
 }

src/plugins/projectexplorer/buildconfiguration.h

@@ -71,8 +71,8 @@ public:
     bool useSystemEnvironment() const;
     void setUseSystemEnvironment(bool b);
 
-    QStringList knownStepLists() const;
+    QList<Core::Id> knownStepLists() const;
-    BuildStepList *stepList(const QString &id) const;
+    BuildStepList *stepList(Core::Id id) const;
 
     virtual QVariantMap toMap() const;
 
@@ -107,7 +107,7 @@ signals:
     void toolChainChanged();
 
 protected:
-    BuildConfiguration(Target *target, const QString &id);
+    BuildConfiguration(Target *target, const Core::Id id);
     BuildConfiguration(Target *target, BuildConfiguration *source);
 
     void cloneSteps(BuildConfiguration *source);
@@ -137,12 +137,12 @@ public:
     virtual ~IBuildConfigurationFactory();
 
     // used to show the list of possible additons to a target, returns a list of types
-    virtual QStringList availableCreationIds(Target *parent) const = 0;
+    virtual QList<Core::Id> availableCreationIds(Target *parent) const = 0;
     // used to translate the types to names to display to the user
-    virtual QString displayNameForId(const QString &id) const = 0;
+    virtual QString displayNameForId(const Core::Id id) const = 0;
 
-    virtual bool canCreate(Target *parent, const QString &id) const = 0;
+    virtual bool canCreate(Target *parent, const Core::Id id) const = 0;
-    virtual BuildConfiguration *create(Target *parent, const QString &id) = 0;
+    virtual BuildConfiguration *create(Target *parent, const Core::Id id) = 0;
     // used to recreate the runConfigurations when restoring settings
     virtual bool canRestore(Target *parent, const QVariantMap &map) const = 0;
     virtual BuildConfiguration *restore(Target *parent, const QVariantMap &map) = 0;

src/plugins/projectexplorer/buildsettingspropertiespage.cpp

@@ -229,9 +229,9 @@ void BuildSettingsWidget::updateAddButtonMenu()
         }
         IBuildConfigurationFactory *factory = m_target->buildConfigurationFactory();
         if (factory) {
-            foreach (const QString &id, factory->availableCreationIds(m_target)) {
+            foreach (Core::Id id, factory->availableCreationIds(m_target)) {
                 QAction *action = m_addButtonMenu->addAction(factory->displayNameForId(id), this, SLOT(createConfiguration()));
-                action->setData(id);
+                action->setData(QVariant::fromValue(id));
             }
         }
     }
@@ -248,8 +248,8 @@ void BuildSettingsWidget::updateBuildSettings()
     BuildConfigWidget *generalConfigWidget = m_target->createConfigWidget();
     addSubWidget(generalConfigWidget);
 
-    addSubWidget(new BuildStepsPage(m_target, QLatin1String(Constants::BUILDSTEPS_BUILD)));
+    addSubWidget(new BuildStepsPage(m_target, Core::Id(Constants::BUILDSTEPS_BUILD)));
-    addSubWidget(new BuildStepsPage(m_target, QLatin1String(Constants::BUILDSTEPS_CLEAN)));
+    addSubWidget(new BuildStepsPage(m_target, Core::Id(Constants::BUILDSTEPS_CLEAN)));
 
     QList<BuildConfigWidget *> subConfigWidgets = m_target->project()->subConfigWidgets();
     foreach (BuildConfigWidget *subConfigWidget, subConfigWidgets)
@@ -289,7 +289,7 @@ void BuildSettingsWidget::createConfiguration()
         return;
 
     QAction *action = qobject_cast<QAction *>(sender());
-    const QString &id = action->data().toString();
+    Core::Id id = action->data().value<Core::Id>();
     BuildConfiguration *bc = m_target->buildConfigurationFactory()->create(m_target, id);
     if (bc) {
         m_target->setActiveBuildConfiguration(bc);

src/plugins/projectexplorer/buildstep.cpp

@@ -126,7 +126,7 @@ static const char buildStepEnabledKey[] = "ProjectExplorer.BuildStep.Enabled";
 
 using namespace ProjectExplorer;
 
-BuildStep::BuildStep(BuildStepList *bsl, const QString &id) :
+BuildStep::BuildStep(BuildStepList *bsl, const Core::Id id) :
     ProjectConfiguration(bsl, id), m_enabled(true)
 {
     Q_ASSERT(bsl);

src/plugins/projectexplorer/buildstep.h

@@ -54,7 +54,7 @@ class PROJECTEXPLORER_EXPORT BuildStep : public ProjectConfiguration
     Q_OBJECT
 
 protected:
-    BuildStep(BuildStepList *bsl, const QString &id);
+    BuildStep(BuildStepList *bsl, const Core::Id id);
     BuildStep(BuildStepList *bsl, BuildStep *bs);
 
 public:
@@ -108,12 +108,12 @@ public:
     virtual ~IBuildStepFactory();
 
     // used to show the list of possible additons to a target, returns a list of types
-    virtual QStringList availableCreationIds(BuildStepList *parent) const = 0;
+    virtual QList<Core::Id> availableCreationIds(BuildStepList *parent) const = 0;
     // used to translate the types to names to display to the user
-    virtual QString displayNameForId(const QString &id) const = 0;
+    virtual QString displayNameForId(const Core::Id id) const = 0;
 
-    virtual bool canCreate(BuildStepList *parent, const QString &id) const = 0;
+    virtual bool canCreate(BuildStepList *parent, const Core::Id id) const = 0;
-    virtual BuildStep *create(BuildStepList *parent, const QString &id) = 0;
+    virtual BuildStep *create(BuildStepList *parent, const Core::Id id) = 0;
     // used to recreate the runConfigurations when restoring settings
     virtual bool canRestore(BuildStepList *parent, const QVariantMap &map) const = 0;
     virtual BuildStep *restore(BuildStepList *parent, const QVariantMap &map) = 0;

src/plugins/projectexplorer/buildsteplist.cpp

@@ -68,7 +68,7 @@ const char * const STEPS_PREFIX("ProjectExplorer.BuildStepList.Step.");
 
 } // namespace
 
-BuildStepList::BuildStepList(QObject *parent, const QString &id) :
+BuildStepList::BuildStepList(QObject *parent, const Core::Id id) :
     ProjectConfiguration(parent, id),
     m_isNull(false)
 {
@@ -87,7 +87,7 @@ BuildStepList::BuildStepList(QObject *parent, BuildStepList *source) :
 }
 
 BuildStepList::BuildStepList(QObject *parent, const QVariantMap &data) :
-    ProjectConfiguration(parent, QLatin1String("UNKNOWN ID"))
+    ProjectConfiguration(parent, Core::Id())
 {
     Q_ASSERT(parent);
     m_isNull = !fromMap(data);
@@ -124,7 +124,7 @@ bool BuildStepList::isEmpty() const
     return m_steps.isEmpty();
 }
 
-bool BuildStepList::contains(const QString &id) const
+bool BuildStepList::contains(const Core::Id id) const
 {
     foreach (BuildStep *bs, steps()) {
         if (bs->id() == id)

src/plugins/projectexplorer/buildsteplist.h

@@ -49,7 +49,7 @@ class PROJECTEXPLORER_EXPORT BuildStepList : public ProjectConfiguration
     Q_OBJECT
 
 public:
-    BuildStepList(QObject *parent, const QString &id);
+    BuildStepList(QObject *parent, const Core::Id id);
     BuildStepList(QObject *parent, BuildStepList *source);
     BuildStepList(QObject *parent, const QVariantMap &data);
     virtual ~BuildStepList();
@@ -58,7 +58,7 @@ public:
     bool isNull() const;
     int count() const;
     bool isEmpty() const;
-    bool contains(const QString &id) const;
+    bool contains(const Core::Id id) const;
 
     void insertStep(int position, BuildStep *step);
     bool removeStep(int position);

src/plugins/projectexplorer/buildstepspage.cpp

@@ -339,14 +339,13 @@ void BuildStepListWidget::init(BuildStepList *bsl)
 
 void BuildStepListWidget::updateAddBuildStepMenu()
 {
-    QMap<QString, QPair<QString, IBuildStepFactory *> > map;
+    QMap<QString, QPair<Core::Id, IBuildStepFactory *> > map;
     //Build up a list of possible steps and save map the display names to the (internal) name and factories.
     QList<IBuildStepFactory *> factories = ExtensionSystem::PluginManager::instance()->getObjects<IBuildStepFactory>();
     foreach (IBuildStepFactory *factory, factories) {
-        QStringList ids = factory->availableCreationIds(m_buildStepList);
+        QList<Core::Id> ids = factory->availableCreationIds(m_buildStepList);
-        foreach (const QString &id, ids) {
+        foreach (Core::Id id, ids)
-            map.insert(factory->displayNameForId(id), QPair<QString, IBuildStepFactory *>(id, factory));
+            map.insert(factory->displayNameForId(id), QPair<Core::Id, IBuildStepFactory *>(id, factory));
-        }
     }
 
     // Ask the user which one to add
@@ -354,7 +353,7 @@ void BuildStepListWidget::updateAddBuildStepMenu()
     m_addBuildStepHash.clear();
     menu->clear();
     if (!map.isEmpty()) {
-        QMap<QString, QPair<QString, IBuildStepFactory *> >::const_iterator it, end;
+        QMap<QString, QPair<Core::Id, IBuildStepFactory *> >::const_iterator it, end;
         end = map.constEnd();
         for (it = map.constBegin(); it != end; ++it) {
             QAction *action = menu->addAction(it.key());
@@ -394,7 +393,7 @@ void BuildStepListWidget::addBuildStepWidget(int pos, BuildStep *step)
 void BuildStepListWidget::triggerAddBuildStep()
 {
     if (QAction *action = qobject_cast<QAction *>(sender())) {
-        QPair<QString, IBuildStepFactory *> pair = m_addBuildStepHash.value(action);
+        QPair<Core::Id, IBuildStepFactory *> pair = m_addBuildStepHash.value(action);
         BuildStep *newStep = pair.second->create(m_buildStepList, pair.first);
         int pos = m_buildStepList->count();
         m_buildStepList->insertStep(pos, newStep);
@@ -533,7 +532,7 @@ void BuildStepListWidget::updateBuildStepButtonsState()
     }
 }
 
-BuildStepsPage::BuildStepsPage(Target *target, const QString &id) :
+BuildStepsPage::BuildStepsPage(Target *target, Core::Id id) :
     BuildConfigWidget(),
     m_id(id),
     m_widget(new BuildStepListWidget(this))
@@ -550,9 +549,9 @@ BuildStepsPage::~BuildStepsPage()
 
 QString BuildStepsPage::displayName() const
 {
-    if (m_id == QLatin1String(Constants::BUILDSTEPS_BUILD))
+    if (m_id == Core::Id(Constants::BUILDSTEPS_BUILD))
         return tr("Build Steps");
-    if (m_id == QLatin1String(Constants::BUILDSTEPS_CLEAN))
+    if (m_id == Core::Id(Constants::BUILDSTEPS_CLEAN))
         return tr("Clean Steps");
     return QString();
 }

src/plugins/projectexplorer/buildstepspage.h

@@ -144,7 +144,7 @@ private:
     void addBuildStepWidget(int pos, BuildStep *step);
 
     BuildStepList *m_buildStepList;
-    QHash<QAction *, QPair<QString, ProjectExplorer::IBuildStepFactory *> > m_addBuildStepHash;
+    QHash<QAction *, QPair<Core::Id, ProjectExplorer::IBuildStepFactory *> > m_addBuildStepHash;
 
     QList<Internal::BuildStepsWidgetData *> m_buildStepsData;
 
@@ -170,14 +170,14 @@ class BuildStepsPage : public BuildConfigWidget
     Q_OBJECT
 
 public:
-    BuildStepsPage(Target *target, const QString &id);
+    BuildStepsPage(Target *target, Core::Id id);
     virtual ~BuildStepsPage();
 
     QString displayName() const;
     void init(BuildConfiguration *bc);
 
 private:
-    QString m_id;
+    Core::Id m_id;
     BuildStepListWidget *m_widget;
 };