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: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/clangcodemodel/clangdquickfixes.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <cppeditor/cppquickfix.h>
+#include <cppeditor/quickfixes/cppquickfix.h>
 #include <languageclient/languageclientquickfix.h>
 
 namespace ClangCodeModel {

src/plugins/clangtools/documentquickfixfactory.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <cppeditor/cppquickfix.h>
+#include <cppeditor/quickfixes/cppquickfix.h>
 
 namespace ClangTools {
 namespace Internal {

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
 )

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",

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 <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/session.h>

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

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 <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>

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 <coreplugin/actionmanager/actionmanager.h>

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 <texteditor/texteditor.h>
 

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 <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>

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 <coreplugin/editormanager/editormanager.h>
 #include <projectexplorer/project.h>

src/plugins/cppeditor/quickfixes/cppinsertvirtualmethods.cpp

@@ -3,12 +3,12 @@
 
 #include "cppinsertvirtualmethods.h"
 
-#include "cppcodestylesettings.h"
+#include "../cppcodestylesettings.h"
-#include "cppeditortr.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 <coreplugin/icore.h>
 #include <texteditor/fontsettings.h>

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;

src/plugins/cppeditor/quickfixes/cppquickfix.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "cppeditor_global.h"
+#include "../cppeditor_global.h"
 #include "cppquickfixassistant.h"
 
 #include <texteditor/quickfix.h>

src/plugins/cppeditor/quickfixes/cppquickfix_test.cpp

@@ -3,14 +3,14 @@
 
 #include "cppquickfix_test.h"
 
-#include "cppcodestylepreferences.h"
+#include "../cppcodestylepreferences.h"
-#include "cppeditorwidget.h"
+#include "../cppeditorwidget.h"
-#include "cppmodelmanager.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 <projectexplorer/kitmanager.h>
 #include <projectexplorer/projectexplorer.h>

src/plugins/cppeditor/quickfixes/cppquickfix_test.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
+#include "../cpptoolstestcase.h"
 #include "cppquickfix.h"
-#include "cpptoolstestcase.h"
 
 #include <projectexplorer/headerpath.h>
 

src/plugins/cppeditor/quickfixes/cppquickfixassistant.cpp

@@ -3,10 +3,10 @@
 
 #include "cppquickfixassistant.h"
 
-#include "cppeditorwidget.h"
+#include "../cppeditorwidget.h"
-#include "cppmodelmanager.h"
+#include "../cppmodelmanager.h"
+#include "../cpprefactoringchanges.h"
 #include "cppquickfix.h"
-#include "cpprefactoringchanges.h"
 
 #include <texteditor/codeassist/genericproposal.h>
 #include <texteditor/codeassist/iassistprocessor.h>

src/plugins/cppeditor/quickfixes/cppquickfixassistant.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "cppsemanticinfo.h"
+#include "../cppsemanticinfo.h"
 
 #include <texteditor/codeassist/assistinterface.h>
 #include <texteditor/codeassist/iassistprovider.h>

src/plugins/cppeditor/quickfixes/cppquickfixes.cpp

@@ -3,24 +3,24 @@
 
 #include "cppquickfixes.h"
 
-#include "baseeditordocumentprocessor.h"
+#include "../baseeditordocumentprocessor.h"
-#include "cppcodestylesettings.h"
+#include "../cppcodestylesettings.h"
-#include "cppeditordocument.h"
+#include "../cppeditordocument.h"
-#include "cppeditortr.h"
+#include "../cppeditortr.h"
-#include "cppeditorwidget.h"
+#include "../cppeditorwidget.h"
-#include "cppfilesettingspage.h"
+#include "../cppfilesettingspage.h"
-#include "cppfunctiondecldeflink.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 <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>

src/plugins/cppeditor/quickfixes/cppquickfixprojectsettings.cpp

@@ -3,8 +3,8 @@
 
 #include "cppquickfixprojectsettings.h"
 
-#include "cppeditorconstants.h"
+#include "../cppeditorconstants.h"
-#include "cppeditortr.h"
+#include "../cppeditortr.h"
 
 #include <coreplugin/icore.h>
 

src/plugins/cppeditor/quickfixes/cppquickfixprojectsettingswidget.cpp

@@ -3,8 +3,8 @@
 
 #include "cppquickfixprojectsettingswidget.h"
 
-#include "cppeditorconstants.h"
+#include "../cppeditorconstants.h"
-#include "cppeditortr.h"
+#include "../cppeditortr.h"
 #include "cppquickfixprojectsettings.h"
 #include "cppquickfixsettingswidget.h"
 

src/plugins/cppeditor/quickfixes/cppquickfixsettings.cpp

@@ -3,8 +3,8 @@
 
 #include "cppquickfixsettings.h"
 
-#include "cppcodestylesettings.h"
+#include "../cppcodestylesettings.h"
-#include "cppeditorconstants.h"
+#include "../cppeditorconstants.h"
 
 #include <coreplugin/icore.h>
 

src/plugins/cppeditor/quickfixes/cppquickfixsettingspage.cpp

@@ -3,8 +3,8 @@
 
 #include "cppquickfixsettingspage.h"
 
-#include "cppeditorconstants.h"
+#include "../cppeditorconstants.h"
-#include "cppeditortr.h"
+#include "../cppeditortr.h"
 #include "cppquickfixsettingswidget.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>

src/plugins/cppeditor/quickfixes/cppquickfixsettingswidget.cpp

@@ -3,7 +3,7 @@
 
 #include "cppquickfixsettingswidget.h"
 
-#include "cppeditortr.h"
+#include "../cppeditortr.h"
 #include "cppquickfixsettings.h"
 
 #include <utils/layoutbuilder.h>