1 files changed, 21 insertions, 18 deletions
diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h
index 1df90adb53..4e5708eeca 100644
--- a/src/plugins/projectexplorer/kitinformation.h
+++ b/src/plugins/projectexplorer/kitinformation.h
@@ -35,6 +35,7 @@
 #include <QVariant>
 
 namespace ProjectExplorer {
+class OutputTaskParser;
 class ToolChain;
 
 class KitAspectWidget;
@@ -55,7 +56,7 @@ public:
     ItemList toUserOutput(const Kit *k) const override;
     void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const override;
 
-    static Core::Id id();
+    static Utils::Id id();
     static Utils::FilePath sysRoot(const Kit *k);
     static void setSysRoot(Kit *k, const Utils::FilePath &v);
 };
@@ -84,16 +85,18 @@ public:
 
     void addToEnvironment(const Kit *k, Utils::Environment &env) const override;
     void addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const override;
-    IOutputParser *createOutputParser(const Kit *k) const override;
-    QSet<Core::Id> availableFeatures(const Kit *k) const override;
-
-    static Core::Id id();
-    static QByteArray toolChainId(const Kit *k, Core::Id language);
-    static ToolChain *toolChain(const Kit *k, Core::Id language);
+    QList<Utils::OutputLineParser *> createOutputParsers(const Kit *k) const override;
+    QSet<Utils::Id> availableFeatures(const Kit *k) const override;
+
+    static Utils::Id id();
+    static QByteArray toolChainId(const Kit *k, Utils::Id language);
+    static ToolChain *toolChain(const Kit *k, Utils::Id language);
+    static ToolChain *cToolChain(const Kit *k);
+    static ToolChain *cxxToolChain(const Kit *k);
     static QList<ToolChain *> toolChains(const Kit *k);
     static void setToolChain(Kit *k, ToolChain *tc);
     static void setAllToolChainsToMatch(Kit *k, ToolChain *tc);
-    static void clearToolChain(Kit *k, Core::Id language);
+    static void clearToolChain(Kit *k, Utils::Id language);
     static Abi targetAbi(const Kit *k);
 
     static QString msgNoToolChainInTarget();
@@ -120,12 +123,12 @@ public:
     KitAspectWidget *createConfigWidget(Kit *k) const override;
     ItemList toUserOutput(const Kit *k) const override;
 
-    static const Core::Id id();
-    static const Core::Id deviceTypeId(const Kit *k);
-    static void setDeviceTypeId(Kit *k, Core::Id type);
+    static const Utils::Id id();
+    static const Utils::Id deviceTypeId(const Kit *k);
+    static void setDeviceTypeId(Kit *k, Utils::Id type);
 
-    QSet<Core::Id> supportedPlatforms(const Kit *k) const override;
-    QSet<Core::Id> availableFeatures(const Kit *k) const override;
+    QSet<Utils::Id> supportedPlatforms(const Kit *k) const override;
+    QSet<Utils::Id> availableFeatures(const Kit *k) const override;
 };
 
 // --------------------------------------------------------------------------
@@ -151,17 +154,17 @@ public:
 
     void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override;
 
-    static Core::Id id();
+    static Utils::Id id();
     static IDevice::ConstPtr device(const Kit *k);
-    static Core::Id deviceId(const Kit *k);
+    static Utils::Id deviceId(const Kit *k);
     static void setDevice(Kit *k, IDevice::ConstPtr dev);
-    static void setDeviceId(Kit *k, Core::Id dataId);
+    static void setDeviceId(Kit *k, Utils::Id dataId);
 
 private:
     QVariant defaultValue(const Kit *k) const;
 
     void kitsWereLoaded();
-    void deviceUpdated(Core::Id dataId);
+    void deviceUpdated(Utils::Id dataId);
     void devicesChanged();
     void kitUpdated(ProjectExplorer::Kit *k);
 };
@@ -185,7 +188,7 @@ public:
 
     ItemList toUserOutput(const Kit *k) const override;
 
-    static Core::Id id();
+    static Utils::Id id();
     static Utils::EnvironmentItems environmentChanges(const Kit *k);
     static void setEnvironmentChanges(Kit *k, const Utils::EnvironmentItems &changes);
 };