From 019d16fad73e5ec4af735e30688e067fb8c6cc2c Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 3 Feb 2020 09:18:49 +0100
Subject: [PATCH] ClangTools: Move OptionsPage to the usual place

Change-Id: Ic70274a7066c1335ae0263f57d29b1c543b94ffe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/clangtools/clangtoolsplugin.cpp | 19 -------------------
 src/plugins/clangtools/settingswidget.cpp   | 16 ++++++++++++++++
 src/plugins/clangtools/settingswidget.h     |  6 ++++++
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp
index 104f8ff41cf..6d9e8b8aa55 100644
--- a/src/plugins/clangtools/clangtoolsplugin.cpp
+++ b/src/plugins/clangtools/clangtoolsplugin.cpp
@@ -36,8 +36,6 @@
 #include "clangtoolsunittests.h"
 #endif
 
-#include <debugger/analyzer/analyzericons.h>
-
 #include <utils/qtcassert.h>
 
 #include <coreplugin/icore.h>
@@ -46,7 +44,6 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/coreconstants.h>
-#include <coreplugin/dialogs/ioptionspage.h>
 
 #include <cpptools/cpptoolsconstants.h>
 #include <cpptools/cppmodelmanager.h>
@@ -74,22 +71,6 @@ ProjectPanelFactory *projectPanelFactory()
     return m_projectPanelFactoryInstance;
 }
 
-class ClangToolsOptionsPage : public IOptionsPage
-{
-public:
-    ClangToolsOptionsPage()
-    {
-        setId(Constants::SETTINGS_PAGE_ID);
-        setDisplayName(QCoreApplication::translate(
-                           "ClangTools::Internal::ClangToolsOptionsPage",
-                           "Clang Tools"));
-        setCategory("T.Analyzer");
-        setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer"));
-        setCategoryIconPath(Analyzer::Icons::SETTINGSCATEGORY_ANALYZER);
-        setWidgetCreator([] { return new SettingsWidget; });
-    }
-};
-
 class ClangToolsPluginPrivate
 {
 public:
diff --git a/src/plugins/clangtools/settingswidget.cpp b/src/plugins/clangtools/settingswidget.cpp
index 4c5dea996be..9b41ce631ba 100644
--- a/src/plugins/clangtools/settingswidget.cpp
+++ b/src/plugins/clangtools/settingswidget.cpp
@@ -33,6 +33,8 @@
 #include <cpptools/clangdiagnosticconfigsmodel.h>
 #include <cpptools/clangdiagnosticconfigsselectionwidget.h>
 
+#include <debugger/analyzer/analyzericons.h>
+
 #include <utils/optional.h>
 
 namespace ClangTools {
@@ -147,5 +149,19 @@ QString SettingsWidget::clazyStandalonePath() const
     return m_ui->clazyStandalonePathChooser->rawPath();
 }
 
+// ClangToolsOptionsPage
+
+ClangToolsOptionsPage::ClangToolsOptionsPage()
+{
+    setId(Constants::SETTINGS_PAGE_ID);
+    setDisplayName(QCoreApplication::translate(
+                       "ClangTools::Internal::ClangToolsOptionsPage",
+                       "Clang Tools"));
+    setCategory("T.Analyzer");
+    setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer"));
+    setCategoryIconPath(Analyzer::Icons::SETTINGSCATEGORY_ANALYZER);
+    setWidgetCreator([] { return new SettingsWidget; });
+}
+
 } // namespace Internal
 } // namespace ClangTools
diff --git a/src/plugins/clangtools/settingswidget.h b/src/plugins/clangtools/settingswidget.h
index 8680581cac7..00ef916e7af 100644
--- a/src/plugins/clangtools/settingswidget.h
+++ b/src/plugins/clangtools/settingswidget.h
@@ -56,5 +56,11 @@ private:
     ClangToolsSettings *m_settings;
 };
 
+class ClangToolsOptionsPage final : public Core::IOptionsPage
+{
+public:
+    ClangToolsOptionsPage();
+};
+
 } // namespace Internal
 } // namespace ClangTools