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

8
src/plugins/clangtools/clangtoolssettings.h
View File

@@ -27,7 +27,7 @@
#include "executableinfo.h"
#include <cpptools/clangdiagnosticconfig.h>
#include <cppeditor/clangdiagnosticconfig.h>
#include <utils/id.h>
@@ -83,8 +83,8 @@ public:
Utils::FilePath clazyStandaloneExecutable() const { return m_clazyStandaloneExecutable; }
void setClazyStandaloneExecutable(const Utils::FilePath &path);
CppTools::ClangDiagnosticConfigs diagnosticConfigs() const { return m_diagnosticConfigs; }
void setDiagnosticConfigs(const CppTools::ClangDiagnosticConfigs &configs)
CppEditor::ClangDiagnosticConfigs diagnosticConfigs() const { return m_diagnosticConfigs; }
void setDiagnosticConfigs(const CppEditor::ClangDiagnosticConfigs &configs)
{ m_diagnosticConfigs = configs; }
RunSettings runSettings() const { return m_runSettings; }
@@ -105,7 +105,7 @@ private:
Utils::FilePath m_clazyStandaloneExecutable;
// Diagnostic Configs
CppTools::ClangDiagnosticConfigs m_diagnosticConfigs;
CppEditor::ClangDiagnosticConfigs m_diagnosticConfigs;
// Run settings
RunSettings m_runSettings;