CppEditor: Give C++ file name settings a per-project variant

Fixes: QTCREATORBUG-22033
Change-Id: If37517bb091438e70c5af5102bf833ed46d0c951
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>

5 files changed, 22 insertions, 21 deletions

diff --git a/src/plugins/designer/cpp/formclasswizard.cpp b/src/plugins/designer/cpp/formclasswizard.cpp
index 593c9db95f1..1582cd26de5 100644
--- a/src/plugins/designer/cpp/formclasswizard.cpp
+++ b/src/plugins/designer/cpp/formclasswizard.cpp
@@ -6,6 +6,8 @@
 #include <designer/designerconstants.h>
 #include <designer/qtdesignerformclasscodegenerator.h>
 #include <cppeditor/cppeditorconstants.h>
+#include <cppeditor/cpptoolsreuse.h>
+#include <projectexplorer/projecttree.h>
 #include <qtsupport/qtsupportconstants.h>
 
 #include <QDebug>
@@ -22,12 +24,12 @@ FormClassWizard::FormClassWizard()
 
 QString FormClassWizard::headerSuffix() const
 {
-    return preferredSuffix(CppEditor::Constants::CPP_HEADER_MIMETYPE);
+    return CppEditor::preferredCxxHeaderSuffix(ProjectExplorer::ProjectTree::currentProject());
 }
 
 QString FormClassWizard::sourceSuffix() const
 {
-    return preferredSuffix(CppEditor::Constants::CPP_SOURCE_MIMETYPE);
+    return CppEditor::preferredCxxSourceSuffix(ProjectExplorer::ProjectTree::currentProject());
 }
 
 QString FormClassWizard::formSuffix() const
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp
index 3d6d760332a..cc912683f69 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.cpp
+++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp
@@ -9,6 +9,7 @@
 
 #include <cppeditor/abstracteditorsupport.h>
 #include <designer/formtemplatewizardpage.h>
+#include <projectexplorer/projecttree.h>
 #include <qtsupport/codegenerator.h>
 #include <utils/filepath.h>
 
@@ -68,7 +69,8 @@ FormClassWizardParameters FormClassWizardDialog::parameters() const
     m_classPage->getParameters(&rc);
     // Name the ui class in the Ui namespace after the class specified
     rc.uiTemplate = QtSupport::CodeGenerator::changeUiClassName(m_rawFormTemplate, rc.className);
-    rc.usePragmaOnce = CppEditor::AbstractEditorSupport::usePragmaOnce();
+    rc.usePragmaOnce = CppEditor::AbstractEditorSupport::usePragmaOnce(
+        ProjectExplorer::ProjectTree::currentProject());
     return rc;
 }
 
diff --git a/src/plugins/designer/cpp/formclasswizardpage.cpp b/src/plugins/designer/cpp/formclasswizardpage.cpp
index f8113c65754..9ec4ebfa279 100644
--- a/src/plugins/designer/cpp/formclasswizardpage.cpp
+++ b/src/plugins/designer/cpp/formclasswizardpage.cpp
@@ -8,9 +8,9 @@
 #include "../designertr.h"
 
 #include <coreplugin/icore.h>
-
 #include <cppeditor/cppeditorconstants.h>
-
+#include <cppeditor/cpptoolsreuse.h>
+#include <projectexplorer/projecttree.h>
 #include <utils/mimeutils.h>
 #include <utils/wizard.h>
 
@@ -32,9 +32,9 @@ FormClassWizardPage::FormClassWizardPage()
 
     m_newClassWidget = new NewClassWidget(classGroupBox);
     m_newClassWidget->setHeaderExtension(
-            Utils::mimeTypeForName(CppEditor::Constants::CPP_HEADER_MIMETYPE).preferredSuffix());
+            CppEditor::preferredCxxHeaderSuffix(ProjectExplorer::ProjectTree::currentProject()));
     m_newClassWidget->setSourceExtension(
-            Utils::mimeTypeForName(CppEditor::Constants::CPP_SOURCE_MIMETYPE).preferredSuffix());
+            CppEditor::preferredCxxSourceSuffix(ProjectExplorer::ProjectTree::currentProject()));
     m_newClassWidget->setLowerCaseFiles(lowercaseHeaderFiles());
 
     connect(m_newClassWidget, &NewClassWidget::validChanged,
@@ -54,11 +54,7 @@ FormClassWizardPage::~FormClassWizardPage() = default;
 // Retrieve settings of CppEditor plugin.
 bool FormClassWizardPage::lowercaseHeaderFiles()
 {
-    QString lowerCaseSettingsKey = CppEditor::Constants::CPPEDITOR_SETTINGSGROUP;
-    lowerCaseSettingsKey += '/';
-    lowerCaseSettingsKey += CppEditor::Constants::LOWERCASE_CPPFILES_KEY;
-    const bool lowerCaseDefault = CppEditor::Constants::LOWERCASE_CPPFILES_DEFAULT;
-    return Core::ICore::settings()->value(lowerCaseSettingsKey, QVariant(lowerCaseDefault)).toBool();
+    return CppEditor::preferLowerCaseFileNames(ProjectExplorer::ProjectTree::currentProject());
 }
 
 void FormClassWizardPage::setClassName(const QString &suggestedClassName)
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 010ab85a82b..75a21d0b5d2 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -12,6 +12,7 @@
 #include <designer/cpp/formclasswizardpage.h>
 
 #include <cppeditor/cppeditorconstants.h>
+#include <cppeditor/cppeditorplugin.h>
 #include <cppeditor/cppeditorwidget.h>
 #include <cppeditor/cppmodelmanager.h>
 #include <cppeditor/cppsemanticinfo.h>
@@ -795,6 +796,6 @@ void QtCreatorIntegration::handleSymbolRenameStage2(
 void QtCreatorIntegration::slotSyncSettingsToDesigner()
 {
     // Set promotion-relevant parameters on integration.
-    setHeaderSuffix(Utils::mimeTypeForName(CppEditor::Constants::CPP_HEADER_MIMETYPE).preferredSuffix());
+    setHeaderSuffix(CppEditor::preferredCxxHeaderSuffix(ProjectTree::currentProject()));
     setHeaderLowercase(FormClassWizardPage::lowercaseHeaderFiles());
 }
diff --git a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
index d4d5e02a3c2..f5989840414 100644
--- a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
+++ b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
@@ -5,12 +5,13 @@
 #include "formtemplatewizardpage.h"
 #include <designer/cpp/formclasswizardparameters.h>
 
-#include <utils/codegeneration.h>
+#include <extensionsystem/pluginmanager.h>
 #include <coreplugin/icore.h>
 #include <cppeditor/abstracteditorsupport.h>
+#include <projectexplorer/projecttree.h>
 #include <qtsupport/codegenerator.h>
 #include <qtsupport/codegensettings.h>
-#include <extensionsystem/pluginmanager.h>
+#include <utils/codegeneration.h>
 
 #include <QTextStream>
 #include <QSettings>
@@ -70,12 +71,11 @@ bool QtDesignerFormClassCodeGenerator::generateCpp(const FormClassWizardParamete
 
     const QString unqualifiedClassName = namespaceList.takeLast();
 
-    const QString headerLicense =
-            CppEditor::AbstractEditorSupport::licenseTemplate(
-                FilePath::fromString(parameters.headerFile), parameters.className);
-    const QString sourceLicense =
-            CppEditor::AbstractEditorSupport::licenseTemplate(
-                FilePath::fromString(parameters.sourceFile), parameters.className);
+    ProjectExplorer::Project * const project = ProjectExplorer::ProjectTree::currentProject();
+    const QString headerLicense = CppEditor::AbstractEditorSupport::licenseTemplate(
+        project, FilePath::fromString(parameters.headerFile), parameters.className);
+    const QString sourceLicense = CppEditor::AbstractEditorSupport::licenseTemplate(
+        project, FilePath::fromString(parameters.sourceFile), parameters.className);
     // Include guards
     const QString guard = Utils::headerGuard(parameters.headerFile, namespaceList);