Core/Utils: Migrate further to Utils::Id

The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
(cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

4 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index 5e94dee80c..6a6fa4564e 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -81,7 +81,7 @@ static QString extractToolchainPrefix(QString *compilerName)
 
 static QString targetPlatform(const ProjectExplorer::Abi &abi, const ProjectExplorer::Kit *k)
 {
-    const Core::Id device = ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(k);
+    const Utils::Id device = ProjectExplorer::DeviceTypeKitAspect::deviceTypeId(k);
     switch (abi.os()) {
     case ProjectExplorer::Abi::WindowsOS:
         return QLatin1String("windows");
diff --git a/src/plugins/qbsprojectmanager/qbskitinformation.cpp b/src/plugins/qbsprojectmanager/qbskitinformation.cpp
index fa0cc6469d..3167d77e74 100644
--- a/src/plugins/qbsprojectmanager/qbskitinformation.cpp
+++ b/src/plugins/qbsprojectmanager/qbskitinformation.cpp
@@ -101,7 +101,7 @@ void QbsKitAspect::setProperties(Kit *kit, const QVariantMap &properties)
     kit->setValue(id(), properties);
 }
 
-Core::Id QbsKitAspect::id()
+Utils::Id QbsKitAspect::id()
 {
     return "Qbs.KitInformation";
 }
diff --git a/src/plugins/qbsprojectmanager/qbskitinformation.h b/src/plugins/qbsprojectmanager/qbskitinformation.h
index 1113f2ce01..50cbd80e77 100644
--- a/src/plugins/qbsprojectmanager/qbskitinformation.h
+++ b/src/plugins/qbsprojectmanager/qbskitinformation.h
@@ -42,7 +42,7 @@ public:
     static void setProperties(ProjectExplorer::Kit *kit, const QVariantMap &properties);
 
 private:
-    static Core::Id id();
+    static Utils::Id id();
 
     ProjectExplorer::Tasks validate(const ProjectExplorer::Kit *) const override;
     ItemList toUserOutput(const ProjectExplorer::Kit *) const override;
diff --git a/src/plugins/qbsprojectmanager/qbsnodes.h b/src/plugins/qbsprojectmanager/qbsnodes.h
index f5a752ad3c..f5131e0f73 100644
--- a/src/plugins/qbsprojectmanager/qbsnodes.h
+++ b/src/plugins/qbsprojectmanager/qbsnodes.h
@@ -47,7 +47,7 @@ public:
 private:
     friend class QbsBuildSystem;
     AddNewInformation addNewInformation(const QStringList &files, Node *context) const override;
-    QVariant data(Core::Id role) const override;
+    QVariant data(Utils::Id role) const override;
 
     const QJsonObject m_groupData;
 };
@@ -67,7 +67,7 @@ public:
 
     const QJsonObject productData() const { return m_productData; }
     QJsonObject mainGroup() const;
-    QVariant data(Core::Id role) const override;
+    QVariant data(Utils::Id role) const override;
 
 private:
     const QJsonObject m_productData;