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>

src/plugins/clangformat/CMakeLists.txt

@@ -2,7 +2,7 @@ add_qtc_plugin(ClangFormat
   CONDITION TARGET libclang AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND QTC_CLANG_BUILDMODE_MATCH
   DEPENDS Utils Qt5::Widgets ${CLANG_FORMAT_LIB}
   INCLUDES "${CLANG_INCLUDE_DIRS}"
-  PLUGIN_DEPENDS Core TextEditor CppEditor CppTools ProjectExplorer
+  PLUGIN_DEPENDS Core TextEditor CppEditor ProjectExplorer
   SOURCES
     clangformatbaseindenter.cpp clangformatbaseindenter.h
     clangformatchecks.ui

src/plugins/clangformat/clangformat.qbs

@@ -5,10 +5,9 @@ QtcPlugin {
     targetName: "ClangFormatPlugin"
 
     Depends { name: "Core" }
-    Depends { name: "TextEditor" }
     Depends { name: "CppEditor" }
-    Depends { name: "CppTools" }
     Depends { name: "ProjectExplorer" }
+    Depends { name: "TextEditor" }
     Depends { name: "Utils" }
 
     Depends { name: "libclang"; required: false }

src/plugins/clangformat/clangformat_dependencies.pri

@@ -3,6 +3,5 @@ QTC_LIB_DEPENDS += \
     extensionsystem \
     utils
 QTC_PLUGIN_DEPENDS += \
-    cpptools \
-    projectexplorer \
-    cppeditor
+    cppeditor \
+    projectexplorer

src/plugins/clangformat/clangformatconfigwidget.cpp

@@ -36,7 +36,7 @@
 
 #include <coreplugin/icore.h>
 #include <cppeditor/cpphighlighter.h>
-#include <cpptools/cppcodestylesnippets.h>
+#include <cppeditor/cppcodestylesnippets.h>
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/pluginspec.h>
 #include <projectexplorer/project.h>
@@ -163,7 +163,7 @@ void ClangFormatConfigWidget::initChecksAndPreview()
     TextEditor::DisplaySettings displaySettings = m_preview->displaySettings();
     displaySettings.m_visualizeWhitespace = true;
     m_preview->setDisplaySettings(displaySettings);
-    m_preview->setPlainText(QLatin1String(CppTools::Constants::DEFAULT_CODE_STYLE_SNIPPETS[0]));
+    m_preview->setPlainText(QLatin1String(CppEditor::Constants::DEFAULT_CODE_STYLE_SNIPPETS[0]));
     m_preview->textDocument()->setIndenter(new ClangFormatIndenter(m_preview->document()));
     m_preview->textDocument()->setFontSettings(TextEditor::TextEditorSettings::fontSettings());
     m_preview->textDocument()->setSyntaxHighlighter(new CppEditor::CppHighlighter);

src/plugins/clangformat/clangformatplugin.cpp

@@ -44,9 +44,9 @@
 
 #include <cppeditor/cppeditorconstants.h>
 
-#include <cpptools/cppcodestylepreferencesfactory.h>
-#include <cpptools/cpptoolsconstants.h>
-#include <cpptools/cppmodelmanager.h>
+#include <cppeditor/cppcodestylepreferencesfactory.h>
+#include <cppeditor/cppeditorconstants.h>
+#include <cppeditor/cppmodelmanager.h>
 
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/project.h>
@@ -73,7 +73,7 @@ using namespace Utils;
 
 namespace ClangFormat {
 
-class ClangFormatStyleFactory : public CppTools::CppCodeStylePreferencesFactory
+class ClangFormatStyleFactory : public CppEditor::CppCodeStylePreferencesFactory
 {
 public:
     TextEditor::CodeStyleEditorWidget *createCodeStyleEditor(
@@ -99,7 +99,7 @@ public:
 static void replaceCppCodeStyle()
 {
     using namespace TextEditor;
-    TextEditorSettings::unregisterCodeStyleFactory(CppTools::Constants::CPP_SETTINGS_ID);
+    TextEditorSettings::unregisterCodeStyleFactory(CppEditor::Constants::CPP_SETTINGS_ID);
     TextEditorSettings::registerCodeStyleFactory(new ClangFormatStyleFactory);
 }
 

src/plugins/clangformat/clangformatutils.cpp

@@ -29,7 +29,7 @@
 #include "clangformatsettings.h"
 
 #include <coreplugin/icore.h>
-#include <cpptools/cppcodestylesettings.h>
+#include <cppeditor/cppcodestylesettings.h>
 #include <texteditor/tabsettings.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/session.h>
@@ -39,7 +39,7 @@
 using namespace clang;
 using namespace format;
 using namespace llvm;
-using namespace CppTools;
+using namespace CppEditor;
 using namespace ProjectExplorer;
 using namespace TextEditor;
 using namespace Utils;