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/clangcodemodel/clangbackendcommunicator.h
View File

@@ -28,7 +28,7 @@
#include "clangbackendreceiver.h"
#include "clangbackendsender.h"
#include <cpptools/projectpart.h>
#include <cppeditor/projectpart.h>
#include <clangsupport/clangcodemodelconnectionclient.h>
#include <clangsupport/filecontainer.h>
@@ -57,7 +57,7 @@ class BackendCommunicator : public QObject
public:
using FileContainer = ClangBackEnd::FileContainer;
using FileContainers = QVector<ClangBackEnd::FileContainer>;
using LocalUseMap = CppTools::SemanticInfo::LocalUseMap;
using LocalUseMap = CppEditor::SemanticInfo::LocalUseMap;
public:
BackendCommunicator();
@@ -92,19 +92,19 @@ public:
qint32 funcNameStartColumn = -1);
void cancelCompletions(TextEditor::IAssistProcessor *processor);
void requestAnnotations(const ClangBackEnd::FileContainer &fileContainer);
QFuture<CppTools::CursorInfo> requestReferences(
QFuture<CppEditor::CursorInfo> requestReferences(
const FileContainer &fileContainer,
quint32 line,
quint32 column,
const LocalUseMap &localUses);
QFuture<CppTools::CursorInfo> requestLocalReferences(
QFuture<CppEditor::CursorInfo> requestLocalReferences(
const FileContainer &fileContainer,
quint32 line,
quint32 column);
QFuture<CppTools::ToolTipInfo> requestToolTip(const FileContainer &fileContainer,
QFuture<CppEditor::ToolTipInfo> requestToolTip(const FileContainer &fileContainer,
quint32 line,
quint32 column);
QFuture<CppTools::SymbolInfo> requestFollowSymbol(const FileContainer &curFileContainer,
QFuture<CppEditor::SymbolInfo> requestFollowSymbol(const FileContainer &curFileContainer,
quint32 line,
quint32 column);