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

10
src/plugins/clangcodemodel/clangcodemodelplugin.cpp
View File

@@ -40,7 +40,7 @@
#include <coreplugin/messagemanager.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <cpptools/cppmodelmanager.h>
#include <cppeditor/cppmodelmanager.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/projectpanelfactory.h>
@@ -70,7 +70,7 @@ static void addProjectPanelWidget()
void ClangCodeModelPlugin::generateCompilationDB()
{
using namespace CppTools;
using namespace CppEditor;
ProjectExplorer::Target *target = ProjectExplorer::SessionManager::startupTarget();
if (!target)
@@ -91,7 +91,7 @@ void ClangCodeModelPlugin::generateCompilationDB()
static bool isDBGenerationEnabled(ProjectExplorer::Project *project)
{
using namespace CppTools;
using namespace CppEditor;
if (!project)
return false;
const ProjectInfo::ConstPtr projectInfo = CppModelManager::instance()->projectInfo(project);
@@ -116,7 +116,7 @@ bool ClangCodeModelPlugin::initialize(const QStringList &arguments, QString *err
this,
&ClangCodeModelPlugin::maybeHandleBatchFileAndExit);
CppTools::CppModelManager::instance()->activateClangCodeModel(&m_modelManagerSupportProvider);
CppEditor::CppModelManager::instance()->activateClangCodeModel(&m_modelManagerSupportProvider);
addProjectPanelWidget();
@@ -167,7 +167,7 @@ void ClangCodeModelPlugin::createCompilationDBButton()
m_generateCompilationDBAction->setEnabled(false);
generateCompilationDB();
});
connect(CppTools::CppModelManager::instance(), &CppTools::CppModelManager::projectPartsUpdated,
connect(CppEditor::CppModelManager::instance(), &CppEditor::CppModelManager::projectPartsUpdated,
this, [this](ProjectExplorer::Project *project) {
if (project != ProjectExplorer::SessionManager::startupProject())
return;