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>
This commit is contained in:
Christian Kandeler
2021-08-30 10:58:08 +02:00
parent 3e1fa0f170
commit 284817fae6
525 changed files with 3705 additions and 4179 deletions

View File

@@ -50,13 +50,11 @@
#include <coreplugin/icontext.h>
#include <coreplugin/icore.h>
#include <cpptools/cpptoolsconstants.h>
#include <cpptools/cppmodelmanager.h>
#include <cppeditor/cppeditorconstants.h>
#include <cppeditor/cppmodelmanager.h>
#include <texteditor/texteditor.h>
#include <cppeditor/cppeditorconstants.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/projectpanelfactory.h>
#include <projectexplorer/target.h>
@@ -117,7 +115,7 @@ bool ClangToolsPlugin::initialize(const QStringList &arguments, QString *errorSt
TaskHub::addCategory(taskCategory(), tr("Clang Tools"));
// Import tidy/clazy diagnostic configs from CppTools now
// Import tidy/clazy diagnostic configs from CppEditor now
// instead of at opening time of the settings page
ClangToolsSettings::instance();
@@ -159,7 +157,7 @@ void ClangToolsPlugin::registerAnalyzeActions()
ActionManager::registerAction(d->clangTool.startAction(), Constants::RUN_ON_PROJECT);
Command *cmd = ActionManager::registerAction(d->clangTool.startOnCurrentFileAction(),
Constants::RUN_ON_CURRENT_FILE);
ActionContainer *mtoolscpp = ActionManager::actionContainer(CppTools::Constants::M_TOOLS_CPP);
ActionContainer *mtoolscpp = ActionManager::actionContainer(CppEditor::Constants::M_TOOLS_CPP);
if (mtoolscpp)
mtoolscpp->addAction(cmd);