Merge CppTools into CppEditor

There was no proper separation of responsibilities between these
plugins. In particular, CppTools had lots of editor-related
functionality, so it's not clear why it was separated out in the first
place.
In fact, for a lot of code, it seemed quite arbitrary where it was put
(just one example: switchHeaderSource() was in CppTools, wheras
switchDeclarationDefinition() was in CppEditor).
Merging the plugins will enable us to get rid of various convoluted
pseudo-abstractions that were only introduced to keep up the artificial
separation.

Change-Id: Iafc3bce625b4794f6d4aa03df6cddc7f2d26716a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/clangtools/clangtoolruncontrol.h b/src/plugins/clangtools/clangtoolruncontrol.h
index 5f8b613d77..363756d080 100644
--- a/src/plugins/clangtools/clangtoolruncontrol.h
+++ b/src/plugins/clangtools/clangtoolruncontrol.h
@@ -28,8 +28,8 @@
 #include "clangfileinfo.h"
 #include "clangtoolssettings.h"
 
-#include <cpptools/clangdiagnosticconfig.h>
-#include <cpptools/projectinfo.h>
+#include <cppeditor/clangdiagnosticconfig.h>
+#include <cppeditor/projectinfo.h>
 #include <projectexplorer/runcontrol.h>
 #include <utils/environment.h>
 #include <utils/temporarydirectory.h>
@@ -70,7 +70,7 @@ class ClangToolRunWorker : public ProjectExplorer::RunWorker
 public:
     ClangToolRunWorker(ProjectExplorer::RunControl *runControl,
                        const RunSettings &runSettings,
-                       const CppTools::ClangDiagnosticConfig &diagnosticConfig,
+                       const CppEditor::ClangDiagnosticConfig &diagnosticConfig,
                        const FileInfos &fileInfos,
                        bool buildBeforeAnalysis);
 
@@ -107,15 +107,15 @@ private:
 
 private:
     RunSettings m_runSettings;
-    CppTools::ClangDiagnosticConfig m_diagnosticConfig;
+    CppEditor::ClangDiagnosticConfig m_diagnosticConfig;
     FileInfos m_fileInfos;
 
     ProjectBuilder *m_projectBuilder = nullptr;
     Utils::Environment m_environment;
     Utils::TemporaryDirectory m_temporaryDir;
 
-    CppTools::ProjectInfo::ConstPtr m_projectInfoBeforeBuild;
-    CppTools::ProjectInfo::ConstPtr m_projectInfo;
+    CppEditor::ProjectInfo::ConstPtr m_projectInfoBeforeBuild;
+    CppEditor::ProjectInfo::ConstPtr m_projectInfo;
     QString m_targetTriple;
     Utils::Id m_toolChainType;