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

22
src/plugins/clangcodemodel/clangrefactoringengine.h
View File

@@ -25,8 +25,8 @@
#pragma once
#include <cpptools/refactoringengineinterface.h>
#include <cpptools/cppcursorinfo.h>
#include <cppeditor/refactoringengineinterface.h>
#include <cppeditor/cppcursorinfo.h>
#include <QFutureWatcher>
@@ -38,25 +38,25 @@ class RefactoringServerInterface;
namespace ClangCodeModel {
namespace Internal {
class RefactoringEngine : public CppTools::RefactoringEngineInterface
class RefactoringEngine : public CppEditor::RefactoringEngineInterface
{
public:
void startLocalRenaming(const CppTools::CursorInEditor &data,
const CppTools::ProjectPart *projectPart,
void startLocalRenaming(const CppEditor::CursorInEditor &data,
const CppEditor::ProjectPart *projectPart,
RenameCallback &&renameSymbolsCallback) override;
void globalRename(const CppTools::CursorInEditor &cursor, CppTools::UsagesCallback &&callback,
void globalRename(const CppEditor::CursorInEditor &cursor, CppEditor::UsagesCallback &&callback,
const QString &replacement) override;
void findUsages(const CppTools::CursorInEditor &cursor,
CppTools::UsagesCallback &&callback) const override;
void globalFollowSymbol(const CppTools::CursorInEditor &cursor,
void findUsages(const CppEditor::CursorInEditor &cursor,
CppEditor::UsagesCallback &&callback) const override;
void globalFollowSymbol(const CppEditor::CursorInEditor &cursor,
::Utils::ProcessLinkCallback &&callback,
const CPlusPlus::Snapshot &snapshot,
const CPlusPlus::Document::Ptr &doc,
CppTools::SymbolFinder *symbolFinder,
CppEditor::SymbolFinder *symbolFinder,
bool inNextSplit) const override;
private:
using FutureCursorWatcher = QFutureWatcher<CppTools::CursorInfo>;
using FutureCursorWatcher = QFutureWatcher<CppEditor::CursorInfo>;
std::unique_ptr<FutureCursorWatcher> m_watcher;
};