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

12
src/plugins/todo/cpptodoitemsscanner.cpp
View File

@@ -26,7 +26,7 @@
#include "cpptodoitemsscanner.h"
#include <cpptools/projectinfo.h>
#include <cppeditor/projectinfo.h>
#include <projectexplorer/project.h>
@@ -42,9 +42,9 @@ namespace Internal {
CppTodoItemsScanner::CppTodoItemsScanner(const KeywordList &keywordList, QObject *parent) :
TodoItemsScanner(keywordList, parent)
{
CppTools::CppModelManager *modelManager = CppTools::CppModelManager::instance();
CppEditor::CppModelManager *modelManager = CppEditor::CppModelManager::instance();
connect(modelManager, &CppTools::CppModelManager::documentUpdated,
connect(modelManager, &CppEditor::CppModelManager::documentUpdated,
this, &CppTodoItemsScanner::documentUpdated, Qt::DirectConnection);
setParams(keywordList);
@@ -55,10 +55,10 @@ void CppTodoItemsScanner::scannerParamsChanged()
// We need to rescan everything known to the code model
// TODO: It would be nice to only tokenize the source files, not update the code model entirely.
CppTools::CppModelManager *modelManager = CppTools::CppModelManager::instance();
CppEditor::CppModelManager *modelManager = CppEditor::CppModelManager::instance();
QSet<QString> filesToBeUpdated;
foreach (const CppTools::ProjectInfo::ConstPtr &info, modelManager->projectInfos())
foreach (const CppEditor::ProjectInfo::ConstPtr &info, modelManager->projectInfos())
filesToBeUpdated.unite(info->sourceFiles());
modelManager->updateSourceFiles(filesToBeUpdated);
@@ -66,7 +66,7 @@ void CppTodoItemsScanner::scannerParamsChanged()
void CppTodoItemsScanner::documentUpdated(CPlusPlus::Document::Ptr doc)
{
CppTools::CppModelManager *modelManager = CppTools::CppModelManager::instance();
CppEditor::CppModelManager *modelManager = CppEditor::CppModelManager::instance();
if (!modelManager->projectPart(doc->fileName()).isEmpty())
processDocument(doc);
}