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

14
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -68,8 +68,8 @@
#include <utils/winutils.h>
#include <cplusplus/findcdbbreakpoint.h>
#include <cpptools/cppmodelmanager.h>
#include <cpptools/cppworkingcopy.h>
#include <cppeditor/cppmodelmanager.h>
#include <cppeditor/cppworkingcopy.h>
#include <QDir>
#include <QRegularExpression>
@@ -216,7 +216,7 @@ CdbEngine::CdbEngine() :
this, &CdbEngine::updateLocals);
if (s->useCodeModel.value())
m_codeModelSnapshot = CppTools::CppModelManager::instance()->snapshot();
m_codeModelSnapshot = CppEditor::CppModelManager::instance()->snapshot();
}
void CdbEngine::init()
@@ -2433,18 +2433,18 @@ class BreakpointCorrectionContext
{
public:
explicit BreakpointCorrectionContext(const CPlusPlus::Snapshot &s,
const CppTools::WorkingCopy &workingCopy) :
const CppEditor::WorkingCopy &workingCopy) :
m_snapshot(s), m_workingCopy(workingCopy) {}
unsigned fixLineNumber(const Utils::FilePath &filePath, unsigned lineNumber) const;
private:
const CPlusPlus::Snapshot m_snapshot;
CppTools::WorkingCopy m_workingCopy;
CppEditor::WorkingCopy m_workingCopy;
};
static CPlusPlus::Document::Ptr getParsedDocument(const Utils::FilePath &filePath,
const CppTools::WorkingCopy &workingCopy,
const CppEditor::WorkingCopy &workingCopy,
const CPlusPlus::Snapshot &snapshot)
{
QByteArray src;
@@ -2485,7 +2485,7 @@ void CdbEngine::insertBreakpoint(const Breakpoint &bp)
BreakpointParameters response = parameters;
const QString responseId = breakPointCdbId(bp);
QScopedPointer<BreakpointCorrectionContext> lineCorrection(
new BreakpointCorrectionContext(m_codeModelSnapshot, CppTools::CppModelManager::instance()->workingCopy()));
new BreakpointCorrectionContext(m_codeModelSnapshot, CppEditor::CppModelManager::instance()->workingCopy()));
if (!m_autoBreakPointCorrection
&& parameters.type == BreakpointByFileAndLine
&& debuggerSettings()->cdbBreakPointCorrection.value()) {