diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2021-08-30 10:58:08 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-09-01 14:53:58 +0000 |
| commit | 284817fae6514701902ccdb834c2faa46462f2e8 (patch) | |
| tree | 44a8c7d9813dc110b61c4639036366c7696bd7e9 /src/plugins/qmljstools/qmljsmodelmanager.cpp | |
| parent | 3e1fa0f170d523971d2c3c12da15a6e291f56511 (diff) | |
| download | qt-creator-284817fae6514701902ccdb834c2faa46462f2e8.tar.gz | |
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>
Diffstat (limited to 'src/plugins/qmljstools/qmljsmodelmanager.cpp')
| -rw-r--r-- | src/plugins/qmljstools/qmljsmodelmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index 341043dcf9..004f844f1c 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -34,7 +34,7 @@ #include <coreplugin/messagemanager.h> #include <coreplugin/progressmanager/progressmanager.h> -#include <cpptools/cppmodelmanager.h> +#include <cppeditor/cppmodelmanager.h> #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildsystem.h> @@ -207,10 +207,10 @@ ModelManager::~ModelManager() = default; void ModelManager::delayedInitialization() { - CppTools::CppModelManager *cppModelManager = CppTools::CppModelManager::instance(); + CppEditor::CppModelManager *cppModelManager = CppEditor::CppModelManager::instance(); // It's important to have a direct connection here so we can prevent // the source and AST of the cpp document being cleaned away. - connect(cppModelManager, &CppTools::CppModelManager::documentUpdated, + connect(cppModelManager, &CppEditor::CppModelManager::documentUpdated, this, &ModelManagerInterface::maybeQueueCppQmlTypeUpdate, Qt::DirectConnection); connect(SessionManager::instance(), &SessionManager::projectRemoved, |