From ce16d5821414df8fb78c9b092e9a0515bd01b08a Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 13 May 2024 15:46:13 +0200 Subject: [PATCH] CppEditor: Add quickfixes/ subdirectory We'd like to split up the monster files cppquickfixes.cpp and cppquickfix_test.cpp by moving non-trivial quickfixes into dedicated files. Since there will be many of them, we want to have them in a separate directory. This patch prepares that. Change-Id: I1e78fab5cce25151662297482582c8043618332e Reviewed-by: Reviewed-by: Christian Stenger --- src/plugins/clangcodemodel/clangdquickfixes.h | 2 +- .../clangtools/documentquickfixfactory.h | 2 +- src/plugins/cppeditor/CMakeLists.txt | 24 ++++---- src/plugins/cppeditor/cppeditor.qbs | 55 ++++++++++++------- src/plugins/cppeditor/cppeditordocument.cpp | 2 +- src/plugins/cppeditor/cppeditorplugin.cpp | 10 ++-- src/plugins/cppeditor/cppeditorwidget.cpp | 2 +- .../cppeditor/cppfunctiondecldeflink.cpp | 2 +- src/plugins/cppeditor/cpprenaming_test.cpp | 2 +- src/plugins/cppeditor/cpptoolsreuse.cpp | 2 +- .../cppeditor/fileandtokenactions_test.cpp | 6 +- .../cppinsertvirtualmethods.cpp | 10 ++-- .../cppinsertvirtualmethods.h | 0 .../{ => quickfixes}/cppquickfix.cpp | 2 +- .../cppeditor/{ => quickfixes}/cppquickfix.h | 2 +- .../{ => quickfixes}/cppquickfix_test.cpp | 10 ++-- .../{ => quickfixes}/cppquickfix_test.h | 2 +- .../{ => quickfixes}/cppquickfixassistant.cpp | 6 +- .../{ => quickfixes}/cppquickfixassistant.h | 2 +- .../{ => quickfixes}/cppquickfixes.cpp | 30 +++++----- .../{ => quickfixes}/cppquickfixes.h | 0 .../cppquickfixprojectsettings.cpp | 4 +- .../cppquickfixprojectsettings.h | 0 .../cppquickfixprojectsettingswidget.cpp | 4 +- .../cppquickfixprojectsettingswidget.h | 0 .../{ => quickfixes}/cppquickfixsettings.cpp | 4 +- .../{ => quickfixes}/cppquickfixsettings.h | 0 .../cppquickfixsettingspage.cpp | 4 +- .../cppquickfixsettingspage.h | 0 .../cppquickfixsettingswidget.cpp | 2 +- .../cppquickfixsettingswidget.h | 0 31 files changed, 103 insertions(+), 88 deletions(-) rename src/plugins/cppeditor/{ => quickfixes}/cppinsertvirtualmethods.cpp (99%) rename src/plugins/cppeditor/{ => quickfixes}/cppinsertvirtualmethods.h (100%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfix.cpp (94%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfix.h (98%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfix_test.cpp (99%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfix_test.h (99%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfixassistant.cpp (97%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfixassistant.h (97%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfixes.cpp (99%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfixes.h (100%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfixprojectsettings.cpp (98%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfixprojectsettings.h (100%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfixprojectsettingswidget.cpp (98%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfixprojectsettingswidget.h (100%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfixsettings.cpp (99%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfixsettings.h (100%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfixsettingspage.cpp (92%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfixsettingspage.h (100%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfixsettingswidget.cpp (99%) rename src/plugins/cppeditor/{ => quickfixes}/cppquickfixsettingswidget.h (100%) diff --git a/src/plugins/clangcodemodel/clangdquickfixes.h b/src/plugins/clangcodemodel/clangdquickfixes.h index cdd22692667..088fb5e7be7 100644 --- a/src/plugins/clangcodemodel/clangdquickfixes.h +++ b/src/plugins/clangcodemodel/clangdquickfixes.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include namespace ClangCodeModel { diff --git a/src/plugins/clangtools/documentquickfixfactory.h b/src/plugins/clangtools/documentquickfixfactory.h index 98f45af46e3..6e99b1d345c 100644 --- a/src/plugins/clangtools/documentquickfixfactory.h +++ b/src/plugins/clangtools/documentquickfixfactory.h @@ -3,7 +3,7 @@ #pragma once -#include +#include namespace ClangTools { namespace Internal { diff --git a/src/plugins/cppeditor/CMakeLists.txt b/src/plugins/cppeditor/CMakeLists.txt index 3a137a4d642..189bc709df5 100644 --- a/src/plugins/cppeditor/CMakeLists.txt +++ b/src/plugins/cppeditor/CMakeLists.txt @@ -53,7 +53,6 @@ add_qtc_plugin(CppEditor cppincludehierarchy.cpp cppincludehierarchy.h cppincludesfilter.cpp cppincludesfilter.h cppindexingsupport.cpp cppindexingsupport.h - cppinsertvirtualmethods.cpp cppinsertvirtualmethods.h cpplocalrenaming.cpp cpplocalrenaming.h cpplocalsymbols.cpp cpplocalsymbols.h cpplocatordata.cpp cpplocatordata.h @@ -71,14 +70,6 @@ add_qtc_plugin(CppEditor cppprojectpartchooser.cpp cppprojectpartchooser.h cppprojectupdater.cpp cppprojectupdater.h cppqtstyleindenter.cpp cppqtstyleindenter.h - cppquickfix.cpp cppquickfix.h - cppquickfixassistant.cpp cppquickfixassistant.h - cppquickfixes.cpp cppquickfixes.h - cppquickfixprojectsettings.cpp cppquickfixprojectsettings.h - cppquickfixprojectsettingswidget.cpp cppquickfixprojectsettingswidget.h - cppquickfixsettings.cpp cppquickfixsettings.h - cppquickfixsettingspage.cpp cppquickfixsettingspage.h - cppquickfixsettingswidget.cpp cppquickfixsettingswidget.h cpprefactoringchanges.cpp cpprefactoringchanges.h cppselectionchanger.cpp cppselectionchanger.h cppsemanticinfo.h @@ -104,6 +95,15 @@ add_qtc_plugin(CppEditor insertionpointlocator.cpp insertionpointlocator.h projectinfo.cpp projectinfo.h projectpart.cpp projectpart.h + quickfixes/cppinsertvirtualmethods.cpp quickfixes/cppinsertvirtualmethods.h + quickfixes/cppquickfix.cpp quickfixes/cppquickfix.h + quickfixes/cppquickfixassistant.cpp quickfixes/cppquickfixassistant.h + quickfixes/cppquickfixes.cpp quickfixes/cppquickfixes.h + quickfixes/cppquickfixprojectsettings.cpp quickfixes/cppquickfixprojectsettings.h + quickfixes/cppquickfixprojectsettingswidget.cpp quickfixes/cppquickfixprojectsettingswidget.h + quickfixes/cppquickfixsettings.cpp quickfixes/cppquickfixsettings.h + quickfixes/cppquickfixsettingspage.cpp quickfixes/cppquickfixsettingspage.h + quickfixes/cppquickfixsettingswidget.cpp quickfixes/cppquickfixsettingswidget.h resourcepreviewhoverhandler.cpp resourcepreviewhoverhandler.h searchsymbols.cpp searchsymbols.h semantichighlighter.cpp semantichighlighter.h @@ -112,7 +112,7 @@ add_qtc_plugin(CppEditor typehierarchybuilder.cpp typehierarchybuilder.h wrappablelineedit.cpp wrappablelineedit.h EXPLICIT_MOC - cppquickfixsettingswidget.h + quickfixes/cppquickfixsettingswidget.h ) extend_qtc_plugin(CppEditor @@ -127,7 +127,6 @@ extend_qtc_plugin(CppEditor cpplocatorfilter_test.cpp cpplocatorfilter_test.h cppmodelmanager_test.cpp cppmodelmanager_test.h cpppointerdeclarationformatter_test.cpp cpppointerdeclarationformatter_test.h - cppquickfix_test.cpp cppquickfix_test.h cpprenaming_test.cpp cpprenaming_test.h cppsourceprocessertesthelper.cpp cppsourceprocessertesthelper.h cppsourceprocessor_test.cpp cppsourceprocessor_test.h @@ -137,9 +136,10 @@ extend_qtc_plugin(CppEditor followsymbol_switchmethoddecldef_test.cpp followsymbol_switchmethoddecldef_test.h modelmanagertesthelper.cpp modelmanagertesthelper.h projectinfo_test.cpp projectinfo_test.h + quickfixes/cppquickfix_test.cpp quickfixes/cppquickfix_test.h symbolsearcher_test.cpp symbolsearcher_test.h typehierarchybuilder_test.cpp typehierarchybuilder_test.h EXPLICIT_MOC cppdoxygen_test.h - cppquickfix_test.h + quickfixes/cppquickfix_test.h ) diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index c535488de90..e556ea1f8bf 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/src/plugins/cppeditor/cppeditor.qbs @@ -119,8 +119,6 @@ QtcPlugin { "cppincludesfilter.h", "cppindexingsupport.cpp", "cppindexingsupport.h", - "cppinsertvirtualmethods.cpp", - "cppinsertvirtualmethods.h", "cpplocalrenaming.cpp", "cpplocalrenaming.h", "cpplocalsymbols.cpp", @@ -153,22 +151,6 @@ QtcPlugin { "cppprojectinfogenerator.h", "cppprojectupdater.cpp", "cppprojectupdater.h", - "cppquickfix.cpp", - "cppquickfix.h", - "cppquickfixassistant.cpp", - "cppquickfixassistant.h", - "cppquickfixes.cpp", - "cppquickfixes.h", - "cppquickfixprojectsettings.cpp", - "cppquickfixprojectsettings.h", - "cppquickfixprojectsettingswidget.cpp", - "cppquickfixprojectsettingswidget.h", - "cppquickfixsettings.cpp", - "cppquickfixsettings.h", - "cppquickfixsettingspage.cpp", - "cppquickfixsettingspage.h", - "cppquickfixsettingswidget.cpp", - "cppquickfixsettingswidget.h", "cppqtstyleindenter.cpp", "cppqtstyleindenter.h", "cpprefactoringchanges.cpp", @@ -233,6 +215,31 @@ QtcPlugin { "wrappablelineedit.h", ] + Group { + name: "Quickfixes" + prefix: "quickfixes/" + files: [ + "cppinsertvirtualmethods.cpp", + "cppinsertvirtualmethods.h", + "cppquickfix.cpp", + "cppquickfix.h", + "cppquickfixassistant.cpp", + "cppquickfixassistant.h", + "cppquickfixes.cpp", + "cppquickfixes.h", + "cppquickfixprojectsettings.cpp", + "cppquickfixprojectsettings.h", + "cppquickfixprojectsettingswidget.cpp", + "cppquickfixprojectsettingswidget.h", + "cppquickfixsettings.cpp", + "cppquickfixsettings.h", + "cppquickfixsettingspage.cpp", + "cppquickfixsettingspage.h", + "cppquickfixsettingswidget.cpp", + "cppquickfixsettingswidget.h", + ] + } + Group { name: "TestCase" condition: qtc.withPluginTests || qtc.withAutotests @@ -244,6 +251,16 @@ QtcPlugin { QtcTestFiles { cpp.defines: outer.concat(['SRCDIR="' + FileInfo.path(filePath) + '"']) + + Group { + name: "Quickfix tests" + prefix: "quickfixes/" + files: [ + "cppquickfix_test.cpp", + "cppquickfix_test.h", + ] + } + files: [ "compileroptionsbuilder_test.cpp", "compileroptionsbuilder_test.h", @@ -263,8 +280,6 @@ QtcPlugin { "cppmodelmanager_test.h", "cpppointerdeclarationformatter_test.cpp", "cpppointerdeclarationformatter_test.h", - "cppquickfix_test.cpp", - "cppquickfix_test.h", "cpprenaming_test.cpp", "cpprenaming_test.h", "cppsourceprocessor_test.cpp", diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp index 6f2a67fede4..1f5adc4baa5 100644 --- a/src/plugins/cppeditor/cppeditordocument.cpp +++ b/src/plugins/cppeditor/cppeditordocument.cpp @@ -11,7 +11,7 @@ #include "cppeditorconstants.h" #include "cppeditortr.h" #include "cpphighlighter.h" -#include "cppquickfixassistant.h" +#include "quickfixes/cppquickfixassistant.h" #include #include diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp index 6718d4cbc85..e87b6d1ea51 100644 --- a/src/plugins/cppeditor/cppeditorplugin.cpp +++ b/src/plugins/cppeditor/cppeditorplugin.cpp @@ -16,12 +16,12 @@ #include "cppmodelmanager.h" #include "cppoutline.h" #include "cppprojectupdater.h" -#include "cppquickfixes.h" -#include "cppquickfixprojectsettingswidget.h" -#include "cppquickfixsettingspage.h" #include "cpptoolsreuse.h" #include "cpptoolssettings.h" #include "cpptypehierarchy.h" +#include "quickfixes/cppquickfixes.h" +#include "quickfixes/cppquickfixprojectsettingswidget.h" +#include "quickfixes/cppquickfixsettingspage.h" #include "resourcepreviewhoverhandler.h" #ifdef WITH_TESTS @@ -31,12 +31,10 @@ #include "cppdoxygen_test.h" #include "cpphighlighter.h" #include "cppincludehierarchy_test.h" -#include "cppinsertvirtualmethods.h" #include "cpplocalsymbols_test.h" #include "cpplocatorfilter_test.h" #include "cppmodelmanager_test.h" #include "cpppointerdeclarationformatter_test.h" -#include "cppquickfix_test.h" #include "cpprenaming_test.h" #include "cppsourceprocessor_test.h" #include "cppuseselections_test.h" @@ -45,6 +43,8 @@ #include "functionutils.h" #include "includeutils.h" #include "projectinfo_test.h" +#include "quickfixes/cppinsertvirtualmethods.h" +#include "quickfixes/cppquickfix_test.h" #include "symbolsearcher_test.h" #include "typehierarchybuilder_test.h" #endif diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp index 5882c8d1647..d5d64597b92 100644 --- a/src/plugins/cppeditor/cppeditorwidget.cpp +++ b/src/plugins/cppeditor/cppeditorwidget.cpp @@ -14,11 +14,11 @@ #include "cpplocalrenaming.h" #include "cppmodelmanager.h" #include "cpppreprocessordialog.h" -#include "cppquickfixassistant.h" #include "cppselectionchanger.h" #include "cppsemanticinfo.h" #include "cppuseselectionsupdater.h" #include "doxygengenerator.h" +#include "quickfixes/cppquickfixassistant.h" #include #include diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp index e489045f351..4cd17ae52d6 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp @@ -8,8 +8,8 @@ #include "cppeditortr.h" #include "cppeditorwidget.h" #include "cpplocalsymbols.h" -#include "cppquickfixassistant.h" #include "cpptoolsreuse.h" +#include "quickfixes/cppquickfixassistant.h" #include "symbolfinder.h" #include diff --git a/src/plugins/cppeditor/cpprenaming_test.cpp b/src/plugins/cppeditor/cpprenaming_test.cpp index 2827434be55..a31d00fa072 100644 --- a/src/plugins/cppeditor/cpprenaming_test.cpp +++ b/src/plugins/cppeditor/cpprenaming_test.cpp @@ -5,7 +5,7 @@ #include "cppeditorwidget.h" #include "cppmodelmanager.h" -#include "cppquickfix_test.h" +#include "quickfixes/cppquickfix_test.h" #include diff --git a/src/plugins/cppeditor/cpptoolsreuse.cpp b/src/plugins/cppeditor/cpptoolsreuse.cpp index 947ecdd4c6f..23d8495a74d 100644 --- a/src/plugins/cppeditor/cpptoolsreuse.cpp +++ b/src/plugins/cppeditor/cpptoolsreuse.cpp @@ -15,9 +15,9 @@ #include "cppfilesettingspage.h" #include "cpphighlighter.h" #include "cppqtstyleindenter.h" -#include "cppquickfixassistant.h" #include "cpprefactoringchanges.h" #include "projectinfo.h" +#include "quickfixes/cppquickfixassistant.h" #include #include diff --git a/src/plugins/cppeditor/fileandtokenactions_test.cpp b/src/plugins/cppeditor/fileandtokenactions_test.cpp index 5acca7fa116..7c8175fa188 100644 --- a/src/plugins/cppeditor/fileandtokenactions_test.cpp +++ b/src/plugins/cppeditor/fileandtokenactions_test.cpp @@ -4,13 +4,13 @@ #include "fileandtokenactions_test.h" #include "cppeditorwidget.h" -#include "cppquickfix.h" -#include "cppquickfixassistant.h" -#include "cppinsertvirtualmethods.h" #include "cppmodelmanager.h" #include "cpptoolstestcase.h" #include "cppworkingcopy.h" #include "projectinfo.h" +#include "quickfixes/cppquickfix.h" +#include "quickfixes/cppquickfixassistant.h" +#include "quickfixes/cppinsertvirtualmethods.h" #include #include diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp b/src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.cpp similarity index 99% rename from src/plugins/cppeditor/cppinsertvirtualmethods.cpp rename to src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.cpp index b34977cfd88..a9ca1816d89 100644 --- a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp +++ b/src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.cpp @@ -3,12 +3,12 @@ #include "cppinsertvirtualmethods.h" -#include "cppcodestylesettings.h" -#include "cppeditortr.h" +#include "../cppcodestylesettings.h" +#include "../cppeditortr.h" +#include "../cpptoolsreuse.h" +#include "../functionutils.h" +#include "../insertionpointlocator.h" #include "cppquickfixassistant.h" -#include "cpptoolsreuse.h" -#include "functionutils.h" -#include "insertionpointlocator.h" #include #include diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.h b/src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.h similarity index 100% rename from src/plugins/cppeditor/cppinsertvirtualmethods.h rename to src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.h diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/quickfixes/cppquickfix.cpp similarity index 94% rename from src/plugins/cppeditor/cppquickfix.cpp rename to src/plugins/cppeditor/quickfixes/cppquickfix.cpp index 0741c842bad..4e9f7e3517e 100644 --- a/src/plugins/cppeditor/cppquickfix.cpp +++ b/src/plugins/cppeditor/quickfixes/cppquickfix.cpp @@ -3,8 +3,8 @@ #include "cppquickfix.h" +#include "../cpprefactoringchanges.h" #include "cppquickfixassistant.h" -#include "cpprefactoringchanges.h" using namespace CPlusPlus; using namespace TextEditor; diff --git a/src/plugins/cppeditor/cppquickfix.h b/src/plugins/cppeditor/quickfixes/cppquickfix.h similarity index 98% rename from src/plugins/cppeditor/cppquickfix.h rename to src/plugins/cppeditor/quickfixes/cppquickfix.h index e901b2bd306..738a30e3228 100644 --- a/src/plugins/cppeditor/cppquickfix.h +++ b/src/plugins/cppeditor/quickfixes/cppquickfix.h @@ -3,7 +3,7 @@ #pragma once -#include "cppeditor_global.h" +#include "../cppeditor_global.h" #include "cppquickfixassistant.h" #include diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/quickfixes/cppquickfix_test.cpp similarity index 99% rename from src/plugins/cppeditor/cppquickfix_test.cpp rename to src/plugins/cppeditor/quickfixes/cppquickfix_test.cpp index 781febee6f3..d823c1471db 100644 --- a/src/plugins/cppeditor/cppquickfix_test.cpp +++ b/src/plugins/cppeditor/quickfixes/cppquickfix_test.cpp @@ -3,14 +3,14 @@ #include "cppquickfix_test.h" -#include "cppcodestylepreferences.h" -#include "cppeditorwidget.h" -#include "cppmodelmanager.h" +#include "../cppcodestylepreferences.h" +#include "../cppeditorwidget.h" +#include "../cppmodelmanager.h" +#include "../cppsourceprocessertesthelper.h" +#include "../cpptoolssettings.h" #include "cppquickfixassistant.h" #include "cppquickfixes.h" #include "cppquickfixsettings.h" -#include "cppsourceprocessertesthelper.h" -#include "cpptoolssettings.h" #include #include diff --git a/src/plugins/cppeditor/cppquickfix_test.h b/src/plugins/cppeditor/quickfixes/cppquickfix_test.h similarity index 99% rename from src/plugins/cppeditor/cppquickfix_test.h rename to src/plugins/cppeditor/quickfixes/cppquickfix_test.h index 27ba90f0d06..b11301a0e15 100644 --- a/src/plugins/cppeditor/cppquickfix_test.h +++ b/src/plugins/cppeditor/quickfixes/cppquickfix_test.h @@ -3,8 +3,8 @@ #pragma once +#include "../cpptoolstestcase.h" #include "cppquickfix.h" -#include "cpptoolstestcase.h" #include diff --git a/src/plugins/cppeditor/cppquickfixassistant.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixassistant.cpp similarity index 97% rename from src/plugins/cppeditor/cppquickfixassistant.cpp rename to src/plugins/cppeditor/quickfixes/cppquickfixassistant.cpp index 1456ce56042..834abaed8ab 100644 --- a/src/plugins/cppeditor/cppquickfixassistant.cpp +++ b/src/plugins/cppeditor/quickfixes/cppquickfixassistant.cpp @@ -3,10 +3,10 @@ #include "cppquickfixassistant.h" -#include "cppeditorwidget.h" -#include "cppmodelmanager.h" +#include "../cppeditorwidget.h" +#include "../cppmodelmanager.h" +#include "../cpprefactoringchanges.h" #include "cppquickfix.h" -#include "cpprefactoringchanges.h" #include #include diff --git a/src/plugins/cppeditor/cppquickfixassistant.h b/src/plugins/cppeditor/quickfixes/cppquickfixassistant.h similarity index 97% rename from src/plugins/cppeditor/cppquickfixassistant.h rename to src/plugins/cppeditor/quickfixes/cppquickfixassistant.h index 63a37f715a7..db818c923cd 100644 --- a/src/plugins/cppeditor/cppquickfixassistant.h +++ b/src/plugins/cppeditor/quickfixes/cppquickfixassistant.h @@ -3,7 +3,7 @@ #pragma once -#include "cppsemanticinfo.h" +#include "../cppsemanticinfo.h" #include #include diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixes.cpp similarity index 99% rename from src/plugins/cppeditor/cppquickfixes.cpp rename to src/plugins/cppeditor/quickfixes/cppquickfixes.cpp index f31086b46aa..68ade8b5e02 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/quickfixes/cppquickfixes.cpp @@ -3,24 +3,24 @@ #include "cppquickfixes.h" -#include "baseeditordocumentprocessor.h" -#include "cppcodestylesettings.h" -#include "cppeditordocument.h" -#include "cppeditortr.h" -#include "cppeditorwidget.h" -#include "cppfilesettingspage.h" -#include "cppfunctiondecldeflink.h" +#include "../baseeditordocumentprocessor.h" +#include "../cppcodestylesettings.h" +#include "../cppeditordocument.h" +#include "../cppeditortr.h" +#include "../cppeditorwidget.h" +#include "../cppfilesettingspage.h" +#include "../cppfunctiondecldeflink.h" +#include "../cpplocatordata.h" +#include "../cpppointerdeclarationformatter.h" +#include "../cpprefactoringchanges.h" +#include "../cpptoolsreuse.h" +#include "../includeutils.h" +#include "../indexitem.h" +#include "../insertionpointlocator.h" +#include "../symbolfinder.h" #include "cppinsertvirtualmethods.h" -#include "cpplocatordata.h" -#include "cpppointerdeclarationformatter.h" #include "cppquickfixassistant.h" #include "cppquickfixprojectsettings.h" -#include "cpprefactoringchanges.h" -#include "cpptoolsreuse.h" -#include "includeutils.h" -#include "indexitem.h" -#include "insertionpointlocator.h" -#include "symbolfinder.h" #include #include diff --git a/src/plugins/cppeditor/cppquickfixes.h b/src/plugins/cppeditor/quickfixes/cppquickfixes.h similarity index 100% rename from src/plugins/cppeditor/cppquickfixes.h rename to src/plugins/cppeditor/quickfixes/cppquickfixes.h diff --git a/src/plugins/cppeditor/cppquickfixprojectsettings.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.cpp similarity index 98% rename from src/plugins/cppeditor/cppquickfixprojectsettings.cpp rename to src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.cpp index 3f3f4bc366b..03131034331 100644 --- a/src/plugins/cppeditor/cppquickfixprojectsettings.cpp +++ b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.cpp @@ -3,8 +3,8 @@ #include "cppquickfixprojectsettings.h" -#include "cppeditorconstants.h" -#include "cppeditortr.h" +#include "../cppeditorconstants.h" +#include "../cppeditortr.h" #include diff --git a/src/plugins/cppeditor/cppquickfixprojectsettings.h b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.h similarity index 100% rename from src/plugins/cppeditor/cppquickfixprojectsettings.h rename to src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.h diff --git a/src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.cpp similarity index 98% rename from src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp rename to src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.cpp index feb9777e45b..8046d80a601 100644 --- a/src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp +++ b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.cpp @@ -3,8 +3,8 @@ #include "cppquickfixprojectsettingswidget.h" -#include "cppeditorconstants.h" -#include "cppeditortr.h" +#include "../cppeditorconstants.h" +#include "../cppeditortr.h" #include "cppquickfixprojectsettings.h" #include "cppquickfixsettingswidget.h" diff --git a/src/plugins/cppeditor/cppquickfixprojectsettingswidget.h b/src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.h similarity index 100% rename from src/plugins/cppeditor/cppquickfixprojectsettingswidget.h rename to src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.h diff --git a/src/plugins/cppeditor/cppquickfixsettings.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixsettings.cpp similarity index 99% rename from src/plugins/cppeditor/cppquickfixsettings.cpp rename to src/plugins/cppeditor/quickfixes/cppquickfixsettings.cpp index 4ce10822678..e08de44675f 100644 --- a/src/plugins/cppeditor/cppquickfixsettings.cpp +++ b/src/plugins/cppeditor/quickfixes/cppquickfixsettings.cpp @@ -3,8 +3,8 @@ #include "cppquickfixsettings.h" -#include "cppcodestylesettings.h" -#include "cppeditorconstants.h" +#include "../cppcodestylesettings.h" +#include "../cppeditorconstants.h" #include diff --git a/src/plugins/cppeditor/cppquickfixsettings.h b/src/plugins/cppeditor/quickfixes/cppquickfixsettings.h similarity index 100% rename from src/plugins/cppeditor/cppquickfixsettings.h rename to src/plugins/cppeditor/quickfixes/cppquickfixsettings.h diff --git a/src/plugins/cppeditor/cppquickfixsettingspage.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixsettingspage.cpp similarity index 92% rename from src/plugins/cppeditor/cppquickfixsettingspage.cpp rename to src/plugins/cppeditor/quickfixes/cppquickfixsettingspage.cpp index 4e1297f5c2e..5933694bbc8 100644 --- a/src/plugins/cppeditor/cppquickfixsettingspage.cpp +++ b/src/plugins/cppeditor/quickfixes/cppquickfixsettingspage.cpp @@ -3,8 +3,8 @@ #include "cppquickfixsettingspage.h" -#include "cppeditorconstants.h" -#include "cppeditortr.h" +#include "../cppeditorconstants.h" +#include "../cppeditortr.h" #include "cppquickfixsettingswidget.h" #include diff --git a/src/plugins/cppeditor/cppquickfixsettingspage.h b/src/plugins/cppeditor/quickfixes/cppquickfixsettingspage.h similarity index 100% rename from src/plugins/cppeditor/cppquickfixsettingspage.h rename to src/plugins/cppeditor/quickfixes/cppquickfixsettingspage.h diff --git a/src/plugins/cppeditor/cppquickfixsettingswidget.cpp b/src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.cpp similarity index 99% rename from src/plugins/cppeditor/cppquickfixsettingswidget.cpp rename to src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.cpp index c589a26b9d2..9445ed3c54e 100644 --- a/src/plugins/cppeditor/cppquickfixsettingswidget.cpp +++ b/src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.cpp @@ -3,7 +3,7 @@ #include "cppquickfixsettingswidget.h" -#include "cppeditortr.h" +#include "../cppeditortr.h" #include "cppquickfixsettings.h" #include diff --git a/src/plugins/cppeditor/cppquickfixsettingswidget.h b/src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.h similarity index 100% rename from src/plugins/cppeditor/cppquickfixsettingswidget.h rename to src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.h