1 files changed, 7 insertions, 13 deletions
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index b6b65e6889..f03fe6c7c9 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -30,7 +30,6 @@
 #include "deploymentdata.h"
 #include "kit.h"
 
-#include <coreplugin/id.h>
 #include <coreplugin/idocument.h>
 
 #include <utils/environmentfwd.h>
@@ -51,12 +50,10 @@ namespace ProjectExplorer {
 
 class BuildInfo;
 class BuildSystem;
-class BuildConfiguration;
 class ContainerNode;
 class EditorConfiguration;
 class FolderNode;
 class Node;
-class ProjectConfiguration;
 class ProjectImporter;
 class ProjectNode;
 class ProjectPrivate;
@@ -80,7 +77,7 @@ public:
     ~Project() override;
 
     QString displayName() const;
-    Core::Id id() const;
+    Utils::Id id() const;
 
     QString mimeType() const;
     bool canBuildProducts() const;
@@ -109,7 +106,7 @@ public:
     const QList<Target *> targets() const;
     // Note: activeTarget can be 0 (if no targets are defined).
     Target *activeTarget() const;
-    Target *target(Core::Id id) const;
+    Target *target(Utils::Id id) const;
     Target *target(Kit *k) const;
     virtual Tasks projectIssues(const Kit *k) const;
 
@@ -140,7 +137,7 @@ public:
 
     virtual bool needsConfiguration() const;
     bool needsBuildConfigurations() const;
-    virtual void configureAsExampleProject();
+    virtual void configureAsExampleProject(ProjectExplorer::Kit *kit);
 
     virtual ProjectImporter *projectImporter() const;
 
@@ -167,8 +164,8 @@ public:
     void setExtraProjectFiles(const QSet<Utils::FilePath> &projectDocumentPaths);
 
     void setDisplayName(const QString &name);
-    void setProjectLanguage(Core::Id id, bool enabled);
-    void addProjectLanguage(Core::Id id);
+    void setProjectLanguage(Utils::Id id, bool enabled);
+    void addProjectLanguage(Utils::Id id);
 
     void setExtraData(const QString &key, const QVariant &data);
     QVariant extraData(const QString &key) const;
@@ -183,9 +180,6 @@ signals:
     // Note: activeTarget can be 0 (if no targets are defined).
     void activeTargetChanged(ProjectExplorer::Target *target);
 
-    void removedProjectConfiguration(ProjectExplorer::ProjectConfiguration *pc);
-    void addedProjectConfiguration(ProjectExplorer::ProjectConfiguration *pc);
-
     void aboutToRemoveTarget(ProjectExplorer::Target *target);
     void removedTarget(ProjectExplorer::Target *target);
     void addedTarget(ProjectExplorer::Target *target);
@@ -207,9 +201,9 @@ protected:
 
     void setCanBuildProducts();
 
-    void setId(Core::Id id);
+    void setId(Utils::Id id);
     void setProjectLanguages(Core::Context language);
-    void removeProjectLanguage(Core::Id id);
+    void removeProjectLanguage(Utils::Id id);
     void setHasMakeInstallEquivalent(bool enabled);
 
     void setKnowsAllBuildExecutables(bool value);