From 9aff30f7c7d4fa9b1dd728b35d2ca7e6884b9b2f Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 19 Jan 2024 18:36:11 +0100
Subject: [PATCH] CppEditor: Hide CppFileSettingsPage class in .cpp

Change-Id: Ic095d7d45681a1970fb8362667f50d632ee6d3e5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/cppeditor/cppeditorplugin.cpp     |  1 -
 src/plugins/cppeditor/cppfilesettingspage.cpp | 18 ++++++++++++------
 src/plugins/cppeditor/cppfilesettingspage.h   |  6 ------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp
index 336196601c1..4b3c1baba28 100644
--- a/src/plugins/cppeditor/cppeditorplugin.cpp
+++ b/src/plugins/cppeditor/cppeditorplugin.cpp
@@ -180,7 +180,6 @@ public:
 
     CppModelManager modelManager;
     CppToolsSettings settings;
-    CppFileSettingsPage m_cppFileSettingsPage;
     CppCodeModelSettingsPage m_cppCodeModelSettingsPage;
     CppCodeStyleSettingsPage m_cppCodeStyleSettingsPage;
     CppProjectUpdaterFactory m_cppProjectUpdaterFactory;
diff --git a/src/plugins/cppeditor/cppfilesettingspage.cpp b/src/plugins/cppeditor/cppfilesettingspage.cpp
index bc1f3188002..55a81cd8041 100644
--- a/src/plugins/cppeditor/cppfilesettingspage.cpp
+++ b/src/plugins/cppeditor/cppfilesettingspage.cpp
@@ -452,13 +452,17 @@ void CppFileSettingsWidget::slotEdit()
 
 // CppFileSettingsPage
 
-CppFileSettingsPage::CppFileSettingsPage()
+class CppFileSettingsPage final : public Core::IOptionsPage
 {
-    setId(Constants::CPP_FILE_SETTINGS_ID);
-    setDisplayName(Tr::tr("File Naming"));
-    setCategory(Constants::CPP_SETTINGS_CATEGORY);
-    setWidgetCreator([] { return new CppFileSettingsWidget(&globalCppFileSettings()); });
-}
+public:
+    CppFileSettingsPage()
+    {
+        setId(Constants::CPP_FILE_SETTINGS_ID);
+        setDisplayName(Tr::tr("File Naming"));
+        setCategory(Constants::CPP_SETTINGS_CATEGORY);
+        setWidgetCreator([] { return new CppFileSettingsWidget(&globalCppFileSettings()); });
+    }
+};
 
 CppFileSettingsForProject::CppFileSettingsForProject(ProjectExplorer::Project *project)
     : m_project(project)
@@ -606,6 +610,8 @@ void setupCppFileSettings()
 {
     static CppFileSettingsProjectPanelFactory theCppFileSettingsProjectPanelFactory;
 
+    static CppFileSettingsPage theCppFileSettingsPage;
+
     globalCppFileSettings().fromSettings(Core::ICore::settings());
     globalCppFileSettings().addMimeInitializer();
 }
diff --git a/src/plugins/cppeditor/cppfilesettingspage.h b/src/plugins/cppeditor/cppfilesettingspage.h
index c4be53aa5cc..46037282486 100644
--- a/src/plugins/cppeditor/cppfilesettingspage.h
+++ b/src/plugins/cppeditor/cppfilesettingspage.h
@@ -67,12 +67,6 @@ private:
     bool m_useGlobalSettings = true;
 };
 
-class CppFileSettingsPage : public Core::IOptionsPage
-{
-public:
-    CppFileSettingsPage();
-};
-
 CppFileSettings &globalCppFileSettings();
 
 void setupCppFileSettings();