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/autotest/loadprojectscenario.cpp
View File

@@ -25,8 +25,8 @@
#include "loadprojectscenario.h"
#include <cpptools/cpptoolstestcase.h>
#include <cpptools/projectinfo.h>
#include <cppeditor/cpptoolstestcase.h>
#include <cppeditor/projectinfo.h>
#include <qtsupport/qtkitinformation.h>
@@ -82,7 +82,7 @@ bool LoadProjectScenario::init()
return false;
}
m_tmpDir = new CppTools::Tests::TemporaryCopiedDir(":/unit_test");
m_tmpDir = new CppEditor::Tests::TemporaryCopiedDir(":/unit_test");
return true;
}
@@ -90,9 +90,9 @@ bool LoadProjectScenario::loadProject()
{
const QString projectFilePath = m_tmpDir->path() + "/plain/plain.pro";
CppTools::Tests::ProjectOpenerAndCloser projectManager;
CppEditor::Tests::ProjectOpenerAndCloser projectManager;
// This code must trigger a call to PluginManager::finishScenario() at some later point.
const CppTools::ProjectInfo::ConstPtr projectInfo = projectManager.open(projectFilePath,
const CppEditor::ProjectInfo::ConstPtr projectInfo = projectManager.open(projectFilePath,
true, m_kit);
return projectInfo.get();
}