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/debugger/debuggerplugin.cpp
View File

@@ -150,8 +150,8 @@
#ifdef WITH_TESTS
#include <cpptools/cpptoolstestcase.h>
#include <cpptools/projectinfo.h>
#include <cppeditor/cpptoolstestcase.h>
#include <cppeditor/projectinfo.h>
#include <utils/executeondestruction.h>
@@ -2302,7 +2302,7 @@ private slots:
void testStateMachine();
private:
CppTools::Tests::TemporaryCopiedDir *m_tmpDir = nullptr;
CppEditor::Tests::TemporaryCopiedDir *m_tmpDir = nullptr;
};
void DebuggerUnitTests::initTestCase()
@@ -2319,7 +2319,7 @@ void DebuggerUnitTests::initTestCase()
// QSKIP("No clang suitable for analyzing found");
s_testRun = true;
m_tmpDir = new CppTools::Tests::TemporaryCopiedDir(":/debugger/unit-tests");
m_tmpDir = new CppEditor::Tests::TemporaryCopiedDir(":/debugger/unit-tests");
QVERIFY(m_tmpDir->isValid());
}
@@ -2332,7 +2332,7 @@ void DebuggerUnitTests::testStateMachine()
{
QString proFile = m_tmpDir->absolutePath("simple/simple.pro");
CppTools::Tests::ProjectOpenerAndCloser projectManager;
CppEditor::Tests::ProjectOpenerAndCloser projectManager;
QVERIFY(projectManager.open(proFile, true));
QEventLoop loop;