diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2021-08-30 10:58:08 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-09-01 14:53:58 +0000 |
commit | 284817fae6514701902ccdb834c2faa46462f2e8 (patch) | |
tree | 44a8c7d9813dc110b61c4639036366c7696bd7e9 /src/plugins/cppeditor/cppquickfixsettingspage.cpp | |
parent | 3e1fa0f170d523971d2c3c12da15a6e291f56511 (diff) |
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>
Diffstat (limited to 'src/plugins/cppeditor/cppquickfixsettingspage.cpp')
-rw-r--r-- | src/plugins/cppeditor/cppquickfixsettingspage.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/cppeditor/cppquickfixsettingspage.cpp b/src/plugins/cppeditor/cppquickfixsettingspage.cpp index 63738f098f..1896d1a5bd 100644 --- a/src/plugins/cppeditor/cppquickfixsettingspage.cpp +++ b/src/plugins/cppeditor/cppquickfixsettingspage.cpp @@ -24,10 +24,11 @@ ****************************************************************************/ #include "cppquickfixsettingspage.h" + #include "cppeditorconstants.h" #include "cppquickfixsettings.h" #include "cppquickfixsettingswidget.h" -#include "cpptools/cpptoolsconstants.h" + #include <QCoreApplication> #include <QtDebug> @@ -36,8 +37,8 @@ using namespace CppEditor::Internal; CppQuickFixSettingsPage::CppQuickFixSettingsPage() { setId(Constants::QUICK_FIX_SETTINGS_ID); - setDisplayName(QCoreApplication::translate("CppTools", Constants::QUICK_FIX_SETTINGS_DISPLAY_NAME)); - setCategory(CppTools::Constants::CPP_SETTINGS_CATEGORY); + setDisplayName(QCoreApplication::translate("CppEditor", Constants::QUICK_FIX_SETTINGS_DISPLAY_NAME)); + setCategory(Constants::CPP_SETTINGS_CATEGORY); } QWidget *CppQuickFixSettingsPage::widget() |