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

32
src/plugins/modeleditor/componentviewcontroller.cpp
View File

@@ -37,7 +37,7 @@
#include "qmt/model/mpackage.h"
#include "qmt/tasks/diagramscenecontroller.h"
#include <cpptools/cppmodelmanager.h>
#include <cppeditor/cppmodelmanager.h>
#include <cplusplus/CppDocument.h>
#include <projectexplorer/session.h>
@@ -165,7 +165,7 @@ void UpdateIncludeDependenciesVisitor::updateFilePaths()
void UpdateIncludeDependenciesVisitor::visitMComponent(qmt::MComponent *component)
{
CppTools::CppModelManager *cppModelManager = CppTools::CppModelManager::instance();
CppEditor::CppModelManager *cppModelManager = CppEditor::CppModelManager::instance();
CPlusPlus::Snapshot snapshot = cppModelManager->snapshot();
QStringList filePaths = findFilePathOfComponent(component);
@@ -329,25 +329,25 @@ void ComponentViewController::doCreateComponentModel(const QString &filePath, qm
QString componentName = qmt::NameController::convertFileNameToElementName(file);
qmt::MComponent *component = nullptr;
bool isSource = false;
CppTools::ProjectFile::Kind kind = CppTools::ProjectFile::classify(file);
CppEditor::ProjectFile::Kind kind = CppEditor::ProjectFile::classify(file);
switch (kind) {
case CppTools::ProjectFile::CSource:
case CppTools::ProjectFile::CXXSource:
case CppTools::ProjectFile::ObjCSource:
case CppTools::ProjectFile::ObjCXXSource:
case CppTools::ProjectFile::CudaSource:
case CppTools::ProjectFile::OpenCLSource:
case CppEditor::ProjectFile::CSource:
case CppEditor::ProjectFile::CXXSource:
case CppEditor::ProjectFile::ObjCSource:
case CppEditor::ProjectFile::ObjCXXSource:
case CppEditor::ProjectFile::CudaSource:
case CppEditor::ProjectFile::OpenCLSource:
isSource = !scanHeaders;
break;
case CppTools::ProjectFile::AmbiguousHeader:
case CppTools::ProjectFile::CHeader:
case CppTools::ProjectFile::CXXHeader:
case CppTools::ProjectFile::ObjCHeader:
case CppTools::ProjectFile::ObjCXXHeader:
case CppEditor::ProjectFile::AmbiguousHeader:
case CppEditor::ProjectFile::CHeader:
case CppEditor::ProjectFile::CXXHeader:
case CppEditor::ProjectFile::ObjCHeader:
case CppEditor::ProjectFile::ObjCXXHeader:
isSource = scanHeaders && !d->pxnodeUtilities->isProxyHeader(file);
break;
case CppTools::ProjectFile::Unclassified:
case CppTools::ProjectFile::Unsupported:
case CppEditor::ProjectFile::Unclassified:
case CppEditor::ProjectFile::Unsupported:
isSource = false;
break;
}