From 81dfcb48597bfa0091d85ea929d2f1ec63236f2c Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 12 Jul 2022 17:43:55 +0200
Subject: [PATCH] ProjectExplorer: inline codestylesettingspropertiespage.ui

Change-Id: I8682685d554fce5d618da913d35720465ac52278
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/projectexplorer/CMakeLists.txt    |  2 +-
 .../codestylesettingspropertiespage.cpp       | 41 +++++++++++----
 .../codestylesettingspropertiespage.h         |  7 +--
 .../codestylesettingspropertiespage.ui        | 50 -------------------
 .../projectexplorer/projectexplorer.qbs       |  2 +-
 5 files changed, 33 insertions(+), 69 deletions(-)
 delete mode 100644 src/plugins/projectexplorer/codestylesettingspropertiespage.ui

diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt
index 120efbf6306..e060e73993c 100644
--- a/src/plugins/projectexplorer/CMakeLists.txt
+++ b/src/plugins/projectexplorer/CMakeLists.txt
@@ -25,7 +25,7 @@ add_qtc_plugin(ProjectExplorer
     buildtargetinfo.h
     buildtargettype.h
     clangparser.cpp clangparser.h
-    codestylesettingspropertiespage.cpp codestylesettingspropertiespage.h codestylesettingspropertiespage.ui
+    codestylesettingspropertiespage.cpp codestylesettingspropertiespage.h
     compileoutputwindow.cpp compileoutputwindow.h
     configtaskhandler.cpp configtaskhandler.h
     copytaskhandler.cpp copytaskhandler.h
diff --git a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
index b31388b9f0c..53ee0ff9d87 100644
--- a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp
@@ -24,36 +24,55 @@
 ****************************************************************************/
 
 #include "codestylesettingspropertiespage.h"
+
 #include "editorconfiguration.h"
 #include "project.h"
+
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/icodestylepreferencesfactory.h>
 #include <texteditor/codestyleeditor.h>
 
-using namespace TextEditor;
-using namespace ProjectExplorer;
-using namespace ProjectExplorer::Internal;
+#include <utils/layoutbuilder.h>
 
-CodeStyleSettingsWidget::CodeStyleSettingsWidget(Project *project) : ProjectSettingsWidget(), m_project(project)
+#include <QComboBox>
+#include <QLabel>
+#include <QLayout>
+#include <QStackedWidget>
+
+using namespace TextEditor;
+
+namespace ProjectExplorer::Internal {
+
+CodeStyleSettingsWidget::CodeStyleSettingsWidget(Project *project)
 {
-    m_ui.setupUi(this);
+    auto languageComboBox = new QComboBox(this);
+    auto stackedWidget = new QStackedWidget(this);
+
     setUseGlobalSettingsCheckBoxVisible(false);
     setUseGlobalSettingsLabelVisible(false);
 
-    const EditorConfiguration *config = m_project->editorConfiguration();
+    const EditorConfiguration *config = project->editorConfiguration();
 
     for (ICodeStylePreferencesFactory *factory : TextEditorSettings::codeStyleFactories()) {
         Utils::Id languageId = factory->languageId();
         ICodeStylePreferences *codeStylePreferences = config->codeStyle(languageId);
 
-        auto preview = factory->createCodeStyleEditor(codeStylePreferences, project, m_ui.stackedWidget);
+        auto preview = factory->createCodeStyleEditor(codeStylePreferences, project, stackedWidget);
         if (preview && preview->layout())
             preview->layout()->setContentsMargins(QMargins());
-        m_ui.stackedWidget->addWidget(preview);
-        m_ui.languageComboBox->addItem(factory->displayName());
+        stackedWidget->addWidget(preview);
+        languageComboBox->addItem(factory->displayName());
     }
 
-    connect(m_ui.languageComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
-            m_ui.stackedWidget, &QStackedWidget::setCurrentIndex);
+    connect(languageComboBox, &QComboBox::currentIndexChanged,
+            stackedWidget, &QStackedWidget::setCurrentIndex);
+
+    using namespace Utils::Layouting;
+
+    Column {
+        Row { new QLabel(tr("Language:")), languageComboBox, Stretch() },
+        stackedWidget
+    }.attachTo(this, false);
 }
 
+} // ProjectExplorer::Internal
diff --git a/src/plugins/projectexplorer/codestylesettingspropertiespage.h b/src/plugins/projectexplorer/codestylesettingspropertiespage.h
index e4ab5e1121c..77fc7427169 100644
--- a/src/plugins/projectexplorer/codestylesettingspropertiespage.h
+++ b/src/plugins/projectexplorer/codestylesettingspropertiespage.h
@@ -25,11 +25,10 @@
 
 #pragma once
 
-#include "ui_codestylesettingspropertiespage.h"
 #include <projectexplorer/projectsettingswidget.h>
 
 namespace ProjectExplorer {
-class EditorConfiguration;
+
 class Project;
 
 namespace Internal {
@@ -39,10 +38,6 @@ class CodeStyleSettingsWidget : public ProjectSettingsWidget
     Q_OBJECT
 public:
     explicit CodeStyleSettingsWidget(Project *project);
-
-private:
-    Ui::CodeStyleSettingsPropertiesPage m_ui;
-    Project *m_project;
 };
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/codestylesettingspropertiespage.ui b/src/plugins/projectexplorer/codestylesettingspropertiespage.ui
deleted file mode 100644
index 11503c0476c..00000000000
--- a/src/plugins/projectexplorer/codestylesettingspropertiespage.ui
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ProjectExplorer::Internal::CodeStyleSettingsPropertiesPage</class>
- <widget class="QWidget" name="ProjectExplorer::Internal::CodeStyleSettingsPropertiesPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>293</width>
-    <height>180</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QLabel" name="languageLabel">
-     <property name="text">
-      <string>Language:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="languageComboBox"/>
-   </item>
-   <item row="0" column="2">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>73</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" colspan="3">
-    <widget class="QStackedWidget" name="stackedWidget"/>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index b4afe27e97e..051fbd94164 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -42,7 +42,7 @@ Project {
                 "buildtargetinfo.h",
                 "buildtargettype.h",
                 "clangparser.cpp", "clangparser.h",
-                "codestylesettingspropertiespage.cpp", "codestylesettingspropertiespage.h", "codestylesettingspropertiespage.ui",
+                "codestylesettingspropertiespage.cpp", "codestylesettingspropertiespage.h",
                 "compileoutputwindow.cpp", "compileoutputwindow.h",
                 "configtaskhandler.cpp", "configtaskhandler.h",
                 "copytaskhandler.cpp", "copytaskhandler.h",