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>

1 files changed, 10 insertions, 11 deletions

diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h
index f55380c573..ecf542e851 100644
--- a/src/plugins/projectexplorer/kitmanager.h
+++ b/src/plugins/projectexplorer/kitmanager.h
@@ -30,7 +30,6 @@
 #include "kit.h"
 
 #include <coreplugin/featureprovider.h>
-#include <coreplugin/id.h>
 
 #include <QObject>
 #include <QPair>
@@ -69,7 +68,7 @@ public:
     using Item = QPair<QString, QString>;
     using ItemList = QList<Item>;
 
-    Core::Id id() const { return m_id; }
+    Utils::Id id() const { return m_id; }
     int priority() const { return m_priority; }
     QString displayName() const { return m_displayName; }
     QString description() const { return m_description; }
@@ -95,8 +94,8 @@ public:
 
     virtual QString displayNamePostfix(const Kit *k) const;
 
-    virtual QSet<Core::Id> supportedPlatforms(const Kit *k) const;
-    virtual QSet<Core::Id> availableFeatures(const Kit *k) const;
+    virtual QSet<Utils::Id> supportedPlatforms(const Kit *k) const;
+    virtual QSet<Utils::Id> availableFeatures(const Kit *k) const;
 
     virtual void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const;
 
@@ -106,7 +105,7 @@ protected:
     KitAspect();
     ~KitAspect();
 
-    void setId(Core::Id id) { m_id = id; }
+    void setId(Utils::Id id) { m_id = id; }
     void setDisplayName(const QString &name) { m_displayName = name; }
     void setDescription(const QString &desc) { m_description = desc; }
     void makeEssential() { m_essential = true; }
@@ -116,7 +115,7 @@ protected:
 private:
     QString m_displayName;
     QString m_description;
-    Core::Id m_id;
+    Utils::Id m_id;
     int m_priority = 0; // The higher the closer to the top.
     bool m_essential = false;
 };
@@ -128,7 +127,7 @@ class PROJECTEXPLORER_EXPORT KitAspectWidget : public QObject
 public:
     KitAspectWidget(Kit *kit, const KitAspect *ki);
 
-    Core::Id kitInformationId() const;
+    Utils::Id kitInformationId() const;
 
     virtual void makeReadOnly() = 0;
     virtual void refresh() = 0;
@@ -162,14 +161,14 @@ public:
 
     static const QList<Kit *> kits();
     static Kit *kit(const Kit::Predicate &predicate);
-    static Kit *kit(Core::Id id);
+    static Kit *kit(Utils::Id id);
     static Kit *defaultKit();
 
     static const QList<KitAspect *> kitAspects();
-    static const QSet<Core::Id> irrelevantAspects();
-    static void setIrrelevantAspects(const QSet<Core::Id> &aspects);
+    static const QSet<Utils::Id> irrelevantAspects();
+    static void setIrrelevantAspects(const QSet<Utils::Id> &aspects);
 
-    static Kit *registerKit(const std::function<void(Kit *)> &init, Core::Id id = {});
+    static Kit *registerKit(const std::function<void(Kit *)> &init, Utils::Id id = {});
     static void deregisterKit(Kit *k);
     static void setDefaultKit(Kit *k);