1 files changed, 10 insertions, 15 deletions
diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h
index 3702655e16..8c8ab9bf2b 100644
--- a/src/plugins/projectexplorer/projectconfiguration.h
+++ b/src/plugins/projectexplorer/projectconfiguration.h
@@ -27,9 +27,8 @@
 
 #include "projectexplorer_export.h"
 
-#include <coreplugin/id.h>
 #include <utils/displayname.h>
-#include <utils/macroexpander.h>
+#include <utils/id.h>
 
 #include <QObject>
 #include <QPointer>
@@ -87,11 +86,11 @@ public:
     ProjectConfigurationAspect();
     ~ProjectConfigurationAspect() override;
 
-    void setId(Core::Id id) { m_id = id; }
+    void setId(Utils::Id id) { m_id = id; }
     void setDisplayName(const QString &displayName) { m_displayName = displayName; }
     void setSettingsKey(const QString &settingsKey) { m_settingsKey = settingsKey; }
 
-    Core::Id id() const { return m_id; }
+    Utils::Id id() const { return m_id; }
     QString displayName() const { return m_displayName; }
     QString settingsKey() const { return  m_settingsKey; }
 
@@ -114,7 +113,7 @@ signals:
 protected:
     virtual void setVisibleDynamic(bool visible) { Q_UNUSED(visible) } // TODO: Better name? Merge with setVisible() somehow?
 
-    Core::Id m_id;
+    Utils::Id m_id;
     QString m_displayName;
     QString m_settingsKey; // Name of data in settings.
     bool m_visible = true;
@@ -140,7 +139,7 @@ public:
         return aspect;
     }
 
-    ProjectConfigurationAspect *aspect(Core::Id id) const;
+    ProjectConfigurationAspect *aspect(Utils::Id id) const;
 
     template <typename T> T *aspect() const
     {
@@ -167,12 +166,12 @@ class PROJECTEXPLORER_EXPORT ProjectConfiguration : public QObject
     Q_OBJECT
 
 protected:
-    explicit ProjectConfiguration(QObject *parent, Core::Id id);
+    explicit ProjectConfiguration(QObject *parent, Utils::Id id);
 
 public:
     ~ProjectConfiguration() override;
 
-    Core::Id id() const;
+    Utils::Id id() const;
 
     QString displayName() const { return m_displayName.value(); }
     bool usesDefaultDisplayName() const { return m_displayName.usesDefaultValue(); }
@@ -188,9 +187,6 @@ public:
     // Note: Make sure subclasses call the superclasses' toMap() function!
     virtual QVariantMap toMap() const;
 
-    Utils::MacroExpander *macroExpander() { return &m_macroExpander; }
-    const Utils::MacroExpander *macroExpander() const { return &m_macroExpander; }
-
     Target *target() const;
     Project *project() const;
 
@@ -204,7 +200,7 @@ public:
 
     const ProjectConfigurationAspects &aspects() const { return m_aspects; }
 
-    ProjectConfigurationAspect *aspect(Core::Id id) const;
+    ProjectConfigurationAspect *aspect(Utils::Id id) const;
     template <typename T> T *aspect() const { return m_aspects.aspect<T>(); }
 
     void acquaintAspects();
@@ -218,13 +214,12 @@ protected:
 
 private:
     QPointer<Target> m_target;
-    const Core::Id m_id;
+    const Utils::Id m_id;
     Utils::DisplayName m_displayName;
     QString m_toolTip;
-    Utils::MacroExpander m_macroExpander;
 };
 
 // helper function:
-PROJECTEXPLORER_EXPORT Core::Id idFromMap(const QVariantMap &map);
+PROJECTEXPLORER_EXPORT Utils::Id idFromMap(const QVariantMap &map);
 
 } // namespace ProjectExplorer