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>

5 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp
index c127fb58a0..da71045d20 100644
--- a/src/plugins/qnx/qnxplugin.cpp
+++ b/src/plugins/qnx/qnxplugin.cpp
@@ -70,8 +70,8 @@ namespace Internal {
 class QnxUploadStep : public RemoteLinux::GenericDirectUploadStep
 {
 public:
-    QnxUploadStep(BuildStepList *bsl, Core::Id id) : GenericDirectUploadStep(bsl, id, false) {}
-    static Core::Id stepId() { return "Qnx.DirectUploadStep"; }
+    QnxUploadStep(BuildStepList *bsl, Utils::Id id) : GenericDirectUploadStep(bsl, id, false) {}
+    static Utils::Id stepId() { return "Qnx.DirectUploadStep"; }
 };
 
 template <class Step>
diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp
index 1f134feb15..271f5ef8d7 100644
--- a/src/plugins/qnx/qnxqtversion.cpp
+++ b/src/plugins/qnx/qnxqtversion.cpp
@@ -53,16 +53,16 @@ QString QnxQtVersion::description() const
             .arg(QnxUtils::cpuDirShortDescription(cpuDir()));
 }
 
-QSet<Core::Id> QnxQtVersion::availableFeatures() const
+QSet<Utils::Id> QnxQtVersion::availableFeatures() const
 {
-    QSet<Core::Id> features = QtSupport::BaseQtVersion::availableFeatures();
+    QSet<Utils::Id> features = QtSupport::BaseQtVersion::availableFeatures();
     features.insert(Constants::QNX_QNX_FEATURE);
     features.remove(QtSupport::Constants::FEATURE_QT_CONSOLE);
     features.remove(QtSupport::Constants::FEATURE_QT_WEBKIT);
     return features;
 }
 
-QSet<Core::Id> QnxQtVersion::targetDeviceTypes() const
+QSet<Utils::Id> QnxQtVersion::targetDeviceTypes() const
 {
     return {Constants::QNX_QNX_OS_TYPE};
 }
diff --git a/src/plugins/qnx/qnxqtversion.h b/src/plugins/qnx/qnxqtversion.h
index c12da8b566..0b86963c0b 100644
--- a/src/plugins/qnx/qnxqtversion.h
+++ b/src/plugins/qnx/qnxqtversion.h
@@ -43,8 +43,8 @@ public:
 
     QString description() const override;
 
-    QSet<Core::Id> availableFeatures() const override;
-    QSet<Core::Id> targetDeviceTypes() const override;
+    QSet<Utils::Id> availableFeatures() const override;
+    QSet<Utils::Id> targetDeviceTypes() const override;
 
     QString qnxHost() const;
     Utils::FilePath qnxTarget() const;
diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp
index 7e948bc49b..6725c28fbe 100644
--- a/src/plugins/qnx/qnxrunconfiguration.cpp
+++ b/src/plugins/qnx/qnxrunconfiguration.cpp
@@ -44,7 +44,7 @@ using namespace Utils;
 namespace Qnx {
 namespace Internal {
 
-QnxRunConfiguration::QnxRunConfiguration(Target *target, Core::Id id)
+QnxRunConfiguration::QnxRunConfiguration(Target *target, Utils::Id id)
     : RunConfiguration(target, id)
 {
     auto exeAspect = addAspect<ExecutableAspect>();
diff --git a/src/plugins/qnx/qnxrunconfiguration.h b/src/plugins/qnx/qnxrunconfiguration.h
index 75ec72a66c..154e2b32e1 100644
--- a/src/plugins/qnx/qnxrunconfiguration.h
+++ b/src/plugins/qnx/qnxrunconfiguration.h
@@ -44,7 +44,7 @@ class QnxRunConfiguration final : public ProjectExplorer::RunConfiguration
     Q_OBJECT
 
 public:
-    QnxRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
+    QnxRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
 
 private:
     ProjectExplorer::Runnable runnable() const override;