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>

4 files changed, 14 insertions, 14 deletions

diff --git a/src/plugins/glsleditor/CMakeLists.txt b/src/plugins/glsleditor/CMakeLists.txt
index 9d5dc56629..a688988295 100644
--- a/src/plugins/glsleditor/CMakeLists.txt
+++ b/src/plugins/glsleditor/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_plugin(GLSLEditor
   DEPENDS GLSL
-  PLUGIN_DEPENDS Core CppTools TextEditor
+  PLUGIN_DEPENDS Core CppEditor TextEditor
   SOURCES
     glslautocompleter.cpp glslautocompleter.h
     glslcompletionassist.cpp glslcompletionassist.h
diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs
index 23f7b4f429..64359cb6c6 100644
--- a/src/plugins/glsleditor/glsleditor.qbs
+++ b/src/plugins/glsleditor/glsleditor.qbs
@@ -10,7 +10,7 @@ QtcPlugin {
 
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
-    Depends { name: "CppTools" }
+    Depends { name: "CppEditor" }
 
     files: [
         "glslautocompleter.cpp",
diff --git a/src/plugins/glsleditor/glsleditor_dependencies.pri b/src/plugins/glsleditor/glsleditor_dependencies.pri
index 26a7703072..53578e191a 100644
--- a/src/plugins/glsleditor/glsleditor_dependencies.pri
+++ b/src/plugins/glsleditor/glsleditor_dependencies.pri
@@ -7,4 +7,4 @@ QTC_LIB_DEPENDS += \
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     texteditor \
-    cpptools
+    cppeditor
diff --git a/src/plugins/glsleditor/glslindenter.cpp b/src/plugins/glsleditor/glslindenter.cpp
index 91229d5a5a..d8ac66d929 100644
--- a/src/plugins/glsleditor/glslindenter.cpp
+++ b/src/plugins/glsleditor/glslindenter.cpp
@@ -25,9 +25,9 @@
 
 #include "glslindenter.h"
 
-#include <cpptools/cppcodeformatter.h>
-#include <cpptools/cpptoolssettings.h>
-#include <cpptools/cppcodestylepreferences.h>
+#include <cppeditor/cppcodeformatter.h>
+#include <cppeditor/cpptoolssettings.h>
+#include <cppeditor/cppcodestylepreferences.h>
 #include <texteditor/tabsettings.h>
 
 #include <QChar>
@@ -55,9 +55,9 @@ void GlslIndenter::indentBlock(const QTextBlock &block,
                                int /*cursorPositionInEditor*/)
 {
     // TODO: do something with it
-    CppTools::QtStyleCodeFormatter
+    CppEditor::QtStyleCodeFormatter
         codeFormatter(tabSettings,
-                      CppTools::CppToolsSettings::instance()->cppCodeStyle()->codeStyleSettings());
+                      CppEditor::CppToolsSettings::instance()->cppCodeStyle()->codeStyleSettings());
 
     codeFormatter.updateStateUntil(block);
     int indent;
@@ -87,8 +87,8 @@ void GlslIndenter::indent(const QTextCursor &cursor,
         const QTextBlock end = m_doc->findBlock(cursor.selectionEnd()).next();
 
         // TODO: do something with it
-        CppTools::QtStyleCodeFormatter codeFormatter(tabSettings,
-                                                     CppTools::CppToolsSettings::instance()
+        CppEditor::QtStyleCodeFormatter codeFormatter(tabSettings,
+                                                     CppEditor::CppToolsSettings::instance()
                                                          ->cppCodeStyle()
                                                          ->codeStyleSettings());
         codeFormatter.updateStateUntil(block);
@@ -113,9 +113,9 @@ int GlslIndenter::indentFor(const QTextBlock &block,
                             const TextEditor::TabSettings &tabSettings,
                             int /*cursorPositionInEditor*/)
 {
-    CppTools::QtStyleCodeFormatter
+    CppEditor::QtStyleCodeFormatter
         codeFormatter(tabSettings,
-                      CppTools::CppToolsSettings::instance()->cppCodeStyle()->codeStyleSettings());
+                      CppEditor::CppToolsSettings::instance()->cppCodeStyle()->codeStyleSettings());
 
     codeFormatter.updateStateUntil(block);
     int indent;
@@ -130,9 +130,9 @@ TextEditor::IndentationForBlock GlslIndenter::indentationForBlocks(
     const TextEditor::TabSettings &tabSettings,
     int /*cursorPositionInEditor*/)
 {
-    CppTools::QtStyleCodeFormatter
+    CppEditor::QtStyleCodeFormatter
         codeFormatter(tabSettings,
-                      CppTools::CppToolsSettings::instance()->cppCodeStyle()->codeStyleSettings());
+                      CppEditor::CppToolsSettings::instance()->cppCodeStyle()->codeStyleSettings());
 
     codeFormatter.updateStateUntil(blocks.last());