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/cppeditor/cppinsertvirtualmethods.cpp

@@ -24,13 +24,14 @@
 ****************************************************************************/
 
 #include "cppinsertvirtualmethods.h"
+
+#include "cppcodestylesettings.h"
 #include "cppquickfixassistant.h"
+#include "cpptoolsreuse.h"
+#include "functionutils.h"
+#include "insertionpointlocator.h"
 
 #include <coreplugin/icore.h>
-#include <cpptools/cppcodestylesettings.h>
-#include <cpptools/cpptoolsreuse.h>
-#include <cpptools/functionutils.h>
-#include <cpptools/insertionpointlocator.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/texteditorsettings.h>
 
@@ -60,17 +61,12 @@
 #include <QVBoxLayout>
 
 #ifdef WITH_TESTS
-
 #include "cppeditorplugin.h"
 #include "cppquickfix_test.h"
-
 #include <QtTest>
-
 #endif
 
-
 using namespace CPlusPlus;
-using namespace CppTools;
 using namespace TextEditor;
 
 namespace CppEditor {
@@ -196,7 +192,8 @@ public:
     Qt::CheckState checkState() const override { return checked ? Qt::Checked : Qt::Unchecked; }
 
     const Function *function = nullptr;
-    InsertionPointLocator::AccessSpec accessSpec = InsertionPointLocator::Invalid;
+    CppEditor::InsertionPointLocator::AccessSpec accessSpec
+        = CppEditor::InsertionPointLocator::Invalid;
     bool reimplemented = false;
     bool alreadyFound = false;
     bool checked = false;