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/clangtools/clangtoolsutils.h
View File

@@ -25,14 +25,14 @@
#pragma once
#include <cpptools/clangdiagnosticconfig.h>
#include <cppeditor/clangdiagnosticconfig.h>
#include <utils/id.h>
#include <utils/optional.h>
#include <QtGlobal>
namespace CppTools { class ClangDiagnosticConfigsModel; }
namespace CppEditor { class ClangDiagnosticConfigsModel; }
namespace Debugger { class DiagnosticLocation; }
namespace Utils { class FilePath; }
@@ -58,7 +58,7 @@ QString createDiagnosticToolTipString(
Utils::optional<FixitStatus> status = Utils::nullopt,
bool showSteps = true);
CppTools::ClangDiagnosticConfig builtinConfig();
CppEditor::ClangDiagnosticConfig builtinConfig();
QString createFullLocationString(const Debugger::DiagnosticLocation &location);
@@ -77,11 +77,11 @@ Utils::FilePath fullPath(const Utils::FilePath &executable);
QString documentationUrl(const QString &checkName);
CppTools::ClangDiagnosticConfigsModel diagnosticConfigsModel();
CppTools::ClangDiagnosticConfigsModel diagnosticConfigsModel(
const CppTools::ClangDiagnosticConfigs &customConfigs);
CppEditor::ClangDiagnosticConfigsModel diagnosticConfigsModel();
CppEditor::ClangDiagnosticConfigsModel diagnosticConfigsModel(
const CppEditor::ClangDiagnosticConfigs &customConfigs);
CppTools::ClangDiagnosticConfig diagnosticConfig(const Utils::Id &diagConfigId);
CppEditor::ClangDiagnosticConfig diagnosticConfig(const Utils::Id &diagConfigId);
QStringList extraClangToolsPrependOptions();
QStringList extraClangToolsAppendOptions();