QtSupport: Move CodeGenSettingsPage to new layout

Change-Id: I3377ec8bfb2c753c05d56c7fd87d754af26bffae
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/qtsupport/codegensettingspage.cpp

@@ -25,7 +25,9 @@
 
 #include "codegensettingspage.h"
 
+#include "codegensettings.h"
 #include "qtsupportconstants.h"
+#include "ui_codegensettingspagewidget.h"
 
 #include <coreplugin/icore.h>
 #include <cpptools/cpptoolsconstants.h>
@@ -37,6 +39,22 @@ namespace Internal {
 
 // ---------- CodeGenSettingsPageWidget
 
+class CodeGenSettingsPageWidget : public Core::IOptionsPageWidget
+{
+    Q_DECLARE_TR_FUNCTIONS(QtSupport::Internal::CodeGenSettingsPage)
+
+public:
+    CodeGenSettingsPageWidget();
+
+private:
+    void apply() final;
+
+    int uiEmbedding() const;
+    void setUiEmbedding(int);
+
+    Ui::CodeGenSettingsPageWidget m_ui;
+};
+
 CodeGenSettingsPageWidget::CodeGenSettingsPageWidget()
 {
     m_ui.setupUi(this);

src/plugins/qtsupport/codegensettingspage.h

@@ -25,32 +25,12 @@
 
 #pragma once
 
-#include "ui_codegensettingspagewidget.h"
-
-#include "codegensettings.h"
-
 #include <coreplugin/dialogs/ioptionspage.h>
 
 namespace QtSupport {
 namespace Internal {
 
-class CodeGenSettingsPageWidget : public Core::IOptionsPageWidget
+class CodeGenSettingsPage final : public Core::IOptionsPage
-{
-    Q_OBJECT
-
-public:
-    CodeGenSettingsPageWidget();
-
-private:
-    void apply() final;
-
-    int uiEmbedding() const;
-    void setUiEmbedding(int);
-
-    Ui::CodeGenSettingsPageWidget m_ui;
-};
-
-class CodeGenSettingsPage : public Core::IOptionsPage
 {
 public:
     CodeGenSettingsPage();