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, 4 insertions, 4 deletions

diff --git a/src/plugins/cppcheck/cppchecktrigger.cpp b/src/plugins/cppcheck/cppchecktrigger.cpp
index 47370c2cd5..68145b2ce9 100644
--- a/src/plugins/cppcheck/cppchecktrigger.cpp
+++ b/src/plugins/cppcheck/cppchecktrigger.cpp
@@ -27,7 +27,7 @@
 #include "cppchecktool.h"
 #include "cppchecktrigger.h"
 
-#include <cpptools/cppmodelmanager.h>
+#include <cppeditor/cppmodelmanager.h>
 
 #include <utils/qtcassert.h>
 
@@ -46,7 +46,7 @@ CppcheckTrigger::CppcheckTrigger(CppcheckTextMarkManager &marks, CppcheckTool &t
 {
     using EditorManager = Core::EditorManager;
     using SessionManager = ProjectExplorer::SessionManager;
-    using CppModelManager = CppTools::CppModelManager;
+    using CppModelManager = CppEditor::CppModelManager;
 
     connect(EditorManager::instance(), &EditorManager::editorOpened,
             this, [this](Core::IEditor *editor) {checkEditors({editor});});
@@ -75,8 +75,8 @@ void CppcheckTrigger::checkEditors(const QList<Core::IEditor *> &editors)
     if (!m_currentProject)
         return;
 
-    using CppModelManager = CppTools::CppModelManager;
-    const CppTools::ProjectInfo::ConstPtr info
+    using CppModelManager = CppEditor::CppModelManager;
+    const CppEditor::ProjectInfo::ConstPtr info
             = CppModelManager::instance()->projectInfo(m_currentProject);
     if (!info)
         return;