ProjectExplorer: Move ToolChainType enumeration into separate Header.

Acked-By: dt

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

@@ -34,6 +34,7 @@
 #include "cmaketarget.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/buildsteplist.h>
 #include <utils/qtcassert.h>
 
@@ -102,11 +103,11 @@ QString CMakeBuildConfiguration::buildDirectory() const
     return m_buildDirectory;
 }
 
-ProjectExplorer::ToolChain::ToolChainType CMakeBuildConfiguration::toolChainType() const
+ProjectExplorer::ToolChainType CMakeBuildConfiguration::toolChainType() const
 {
     if (m_toolChain)
         return m_toolChain->type();
-    return ProjectExplorer::ToolChain::UNKNOWN;
+    return ProjectExplorer::ToolChain_UNKNOWN;
 }
 
 ProjectExplorer::ToolChain *CMakeBuildConfiguration::toolChain() const

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h

@@ -31,7 +31,11 @@
 #define CMAKEBUILDCONFIGURATION_H
 
 #include <projectexplorer/buildconfiguration.h>
-#include <projectexplorer/toolchain.h>
+#include <projectexplorer/toolchaintype.h>
+
+namespace ProjectExplorer {
+class ToolChain;
+}
 
 namespace CMakeProjectManager {
 namespace Internal {
@@ -52,7 +56,7 @@ public:
 
     virtual QString buildDirectory() const;
 
-    ProjectExplorer::ToolChain::ToolChainType toolChainType() const;
+    ProjectExplorer::ToolChainType toolChainType() const;
     ProjectExplorer::ToolChain *toolChain() const;
 
     void setBuildDirectory(const QString &buildDirectory);

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -42,6 +42,7 @@
 #include <projectexplorer/buildenvironmentwidget.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/buildmanager.h>
+#include <projectexplorer/toolchain.h>
 #include <cpptools/cppmodelmanagerinterface.h>
 #include <extensionsystem/pluginmanager.h>
 #include <designer/formwindoweditor.h>

src/plugins/cmakeprojectmanager/cmakeproject.h

@@ -39,7 +39,6 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectnodes.h>
 #include <projectexplorer/buildstep.h>
-#include <projectexplorer/toolchain.h>
 #include <projectexplorer/filewatcher.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <coreplugin/ifile.h>

src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp

@@ -305,11 +305,11 @@ void CMakeRunConfiguration::setUserEnvironmentChanges(const QList<Utils::Environ
     }
 }
 
-ProjectExplorer::ToolChain::ToolChainType CMakeRunConfiguration::toolChainType() const
+ProjectExplorer::ToolChainType CMakeRunConfiguration::toolChainType() const
 {
     CMakeBuildConfiguration *bc = activeBuildConfiguration();
     if (!bc)
-        return ProjectExplorer::ToolChain::UNKNOWN;
+        return ProjectExplorer::ToolChain_UNKNOWN;
     return bc->toolChainType();
 }
 

src/plugins/cmakeprojectmanager/cmakerunconfiguration.h

@@ -79,7 +79,7 @@ public:
 
     QString dumperLibrary() const;
     QStringList dumperLibraryLocations() const;
-    ProjectExplorer::ToolChain::ToolChainType toolChainType() const;
+    ProjectExplorer::ToolChainType toolChainType() const;
 
     QVariantMap toMap() const;
 

src/plugins/cmakeprojectmanager/makestep.cpp

@@ -35,6 +35,7 @@
 #include "cmakebuildconfiguration.h"
 
 #include <projectexplorer/buildsteplist.h>
+#include <projectexplorer/toolchain.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/gnumakeparser.h>