Merge CppTools into CppEditor

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

View File

@@ -34,10 +34,11 @@
#include <QSharedPointer>
#include <QStringList>
namespace CppTools { class CppCodeStylePreferences; }
namespace TextEditor { class QuickFixOperation; }
namespace CppEditor {
class CppCodeStylePreferences;
namespace Internal {
namespace Tests {
@@ -84,9 +85,9 @@ protected:
QList<QuickFixTestDocument::Ptr> m_testDocuments;
private:
QScopedPointer<CppTools::Tests::TemporaryDir> m_temporaryDirectory;
QScopedPointer<::CppEditor::Tests::TemporaryDir> m_temporaryDirectory;
CppTools::CppCodeStylePreferences *m_cppCodeStylePreferences;
CppCodeStylePreferences *m_cppCodeStylePreferences;
QByteArray m_cppCodeStylePreferencesOriginalDelegateId;
ProjectExplorer::HeaderPaths m_headerPathsToRestore;