feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge CppTools into CppEditor

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/classview/classviewmanager.cpp
View File

@@ -32,8 +32,8 @@
#include <utils/qtcassert.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h>
#include <cpptools/cppmodelmanager.h>
#include <cpptools/cpptoolsconstants.h>
#include <cppeditor/cppeditorconstants.h>
#include <cppeditor/cppmodelmanager.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
@@ -251,7 +251,7 @@ void Manager::initialize()
// connect to the progress manager for signals about Parsing tasks
connect(ProgressManager::instance(), &ProgressManager::taskStarted,
this, [this](Id type) {
if (type != CppTools::Constants::TASK_INDEX)
if (type != CppEditor::Constants::TASK_INDEX)
return;
// disable tree updates to speed up
@@ -260,7 +260,7 @@ void Manager::initialize()
});
connect(ProgressManager::instance(), &ProgressManager::allTasksFinished,
this, [this](Id type) {
if (type != CppTools::Constants::TASK_INDEX)
if (type != CppEditor::Constants::TASK_INDEX)
return;
// parsing is finished, enable tree updates
@@ -287,10 +287,10 @@ void Manager::initialize()
}, Qt::QueuedConnection);
// connect to the cpp model manager for signals about document updates
CppTools::CppModelManager *codeModelManager = CppTools::CppModelManager::instance();
CppEditor::CppModelManager *codeModelManager = CppEditor::CppModelManager::instance();
// when code manager signals that document is updated - handle it by ourselves
connect(codeModelManager, &CppTools::CppModelManager::documentUpdated,
connect(codeModelManager, &CppEditor::CppModelManager::documentUpdated,
this, [this](CPlusPlus::Document::Ptr doc) {
// do nothing if Manager is disabled
if (!state())
@@ -317,7 +317,7 @@ void Manager::initialize()
}, Qt::QueuedConnection);
});
connect(codeModelManager, &CppTools::CppModelManager::aboutToRemoveFiles,
connect(codeModelManager, &CppEditor::CppModelManager::aboutToRemoveFiles,
d->m_parser, &Parser::removeFiles, Qt::QueuedConnection);
}