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>

8 files changed, 66 insertions, 72 deletions

diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
index 4988a9c621..8f37bfc877 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
+++ b/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 QStringList() << QLatin1String(GENERIC_BC_ID);
+        return QList<Core::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, id);
+    return canCreate(parent, ProjectExplorer::idFromMap(map));
 }
 
 BuildConfiguration *GenericBuildConfigurationFactory::restore(ProjectExplorer::Target *parent, const QVariantMap &map)
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.h b/src/plugins/genericprojectmanager/genericbuildconfiguration.h
index 48e567d755..6a2058861a 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.h
+++ b/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;
-    QString displayNameForId(const QString &id) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
+    QString displayNameForId(const Core::Id id) const;
 
-    bool canCreate(ProjectExplorer::Target *parent, const QString &id) const;
-    ProjectExplorer::BuildConfiguration *create(ProjectExplorer::Target *parent, const QString &id);
+    bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
+    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;
diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp
index 57bb1d49b0..899ffcb359 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.cpp
+++ b/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, id);
+    return canCreate(parent, source->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, id);
+    return canCreate(parent, ProjectExplorer::idFromMap(map));
 }
 
 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))
-        return QStringList();
-    return QStringList() << QLatin1String(GENERIC_MS_ID);
+    if (parent->target()->project()->id() != Core::Id(Constants::GENERICPROJECT_ID))
+        return QList<Core::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();
diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h
index 46ee7944e3..2a7a4fa7aa 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.h
+++ b/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();
-
-    virtual bool canCreate(ProjectExplorer::BuildStepList *parent,
-                           const QString &id) const;
-    virtual ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent,
-                                               const QString &id);
-    virtual bool canClone(ProjectExplorer::BuildStepList *parent,
-                          ProjectExplorer::BuildStep *source) const;
-    virtual ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
-                                              ProjectExplorer::BuildStep *source);
-    virtual bool canRestore(ProjectExplorer::BuildStepList *parent,
-                            const QVariantMap &map) const;
-    virtual ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
-                                                const QVariantMap &map);
-
-    virtual QStringList availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
-    virtual QString displayNameForId(const QString &id) const;
+    ~GenericMakeStepFactory();
+
+    bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
+    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;
+    ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
+                                        const QVariantMap &map);
+
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
+    QString displayNameForId(const Core::Id id) const;
 };
 
 } // namespace Internal
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index a7ea37a461..06dfaa30c8 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/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();
diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h
index f35d7eb611..a36f2323c4 100644
--- a/src/plugins/genericprojectmanager/genericproject.h
+++ b/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;
diff --git a/src/plugins/genericprojectmanager/generictarget.cpp b/src/plugins/genericprojectmanager/generictarget.cpp
index f3572ca5ce..314d423d84 100644
--- a/src/plugins/genericprojectmanager/generictarget.cpp
+++ b/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;
diff --git a/src/plugins/genericprojectmanager/generictarget.h b/src/plugins/genericprojectmanager/generictarget.h
index 7f4df5d3f3..48eef3e9f5 100644
--- a/src/plugins/genericprojectmanager/generictarget.h
+++ b/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;
-    QString displayNameForId(const QString &id) const;
+    QList<Core::Id> supportedTargetIds() const;
+    QString displayNameForId(const Core::Id id) const;
 
-    bool canCreate(ProjectExplorer::Project *parent, const QString &id) const;
-    GenericTarget *create(ProjectExplorer::Project *parent, const QString &id);
+    bool canCreate(ProjectExplorer::Project *parent, const Core::Id id) const;
+    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);
 };