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

8
src/plugins/classview/classviewparser.cpp
View File

@@ -31,7 +31,7 @@
#include <cplusplus/Symbol.h>
// other
#include <cpptools/cppmodelmanager.h>
#include <cppeditor/cppmodelmanager.h>
#include <utils/algorithm.h>
#include <utils/qtcassert.h>
@@ -281,7 +281,7 @@ ParserTreeItem::ConstPtr Parser::getCachedOrParseDocumentTree(const CPlusPlus::D
void Parser::updateDocuments(const QSet<FilePath> &documentPaths)
{
updateDocumentsFromSnapshot(documentPaths, CppTools::CppModelManager::instance()->snapshot());
updateDocumentsFromSnapshot(documentPaths, CppEditor::CppModelManager::instance()->snapshot());
}
void Parser::updateDocumentsFromSnapshot(const QSet<FilePath> &documentPaths,
@@ -324,7 +324,7 @@ void Parser::resetData(const QHash<FilePath, QPair<QString, FilePaths>> &project
d->m_projectCache.clear();
d->m_documentCache.clear();
const CPlusPlus::Snapshot &snapshot = CppTools::CppModelManager::instance()->snapshot();
const CPlusPlus::Snapshot &snapshot = CppEditor::CppModelManager::instance()->snapshot();
for (auto it = projects.cbegin(); it != projects.cend(); ++it) {
const auto projectData = it.value();
QSet<FilePath> commonFiles;
@@ -344,7 +344,7 @@ void Parser::resetData(const QHash<FilePath, QPair<QString, FilePaths>> &project
void Parser::addProject(const FilePath &projectPath, const QString &projectName,
const FilePaths &filesInProject)
{
const CPlusPlus::Snapshot &snapshot = CppTools::CppModelManager::instance()->snapshot();
const CPlusPlus::Snapshot &snapshot = CppEditor::CppModelManager::instance()->snapshot();
QSet<FilePath> commonFiles;
for (const auto &fileInProject : filesInProject) {
CPlusPlus::Document::Ptr doc = snapshot.document(fileInProject);