Qt: Change settings dialogs to widgets/windows

Stops them breaking in Qt 6.6.
stenzek · Nov 6, 2023 · ac82585 · ac82585
1 parent 3ab27e7
commit ac82585
Show file tree

Hide file tree

Showing 50 changed files with 442 additions and 322 deletions.
diff --git a/src/duckstation-qt/CMakeLists.txt b/src/duckstation-qt/CMakeLists.txt
@@ -55,9 +55,9 @@ set(SRCS
   controllerledsettingsdialog.ui
   controllermacroeditwidget.ui
   controllermacrowidget.ui
-  controllersettingsdialog.cpp
-  controllersettingsdialog.h
-  controllersettingsdialog.ui
+  controllersettingswindow.cpp
+  controllersettingswindow.h
+  controllersettingswindow.ui
   controllersettingwidgetbinder.h
   coverdownloaddialog.cpp
   coverdownloaddialog.h
@@ -135,9 +135,9 @@ set(SRCS
   qtutils.cpp
   qtutils.h
   resource.h
-  settingsdialog.cpp
-  settingsdialog.h
-  settingsdialog.ui
+  settingswindow.cpp
+  settingswindow.h
+  settingswindow.ui
   settingwidgetbinder.h
   setupwizarddialog.cpp
   setupwizarddialog.h

diff --git a/src/duckstation-qt/achievementsettingswidget.cpp b/src/duckstation-qt/achievementsettingswidget.cpp
@@ -5,7 +5,7 @@
 #include "achievementlogindialog.h"
 #include "mainwindow.h"
 #include "qtutils.h"
-#include "settingsdialog.h"
+#include "settingswindow.h"
 #include "settingwidgetbinder.h"
 
 #include "core/achievements.h"
@@ -16,7 +16,7 @@
 #include <QtCore/QDateTime>
 #include <QtWidgets/QMessageBox>
 
-AchievementSettingsWidget::AchievementSettingsWidget(SettingsDialog* dialog, QWidget* parent)
+AchievementSettingsWidget::AchievementSettingsWidget(SettingsWindow* dialog, QWidget* parent)
   : QWidget(parent), m_dialog(dialog)
 {
   SettingsInterface* sif = dialog->getSettingsInterface();

diff --git a/src/duckstation-qt/achievementsettingswidget.h b/src/duckstation-qt/achievementsettingswidget.h
@@ -5,14 +5,14 @@
 #include <QtWidgets/QWidget>
 #include "ui_achievementsettingswidget.h"
 
-class SettingsDialog;
+class SettingsWindow;
 
 class AchievementSettingsWidget : public QWidget
 {
   Q_OBJECT
 
 public:
-  explicit AchievementSettingsWidget(SettingsDialog* dialog, QWidget* parent);
+  explicit AchievementSettingsWidget(SettingsWindow* dialog, QWidget* parent);
   ~AchievementSettingsWidget();
 
 private Q_SLOTS:
@@ -29,5 +29,5 @@ private Q_SLOTS:
 
   Ui::AchievementSettingsWidget m_ui;
 
-  SettingsDialog* m_dialog;
+  SettingsWindow* m_dialog;
 };
diff --git a/src/duckstation-qt/advancedsettingswidget.cpp b/src/duckstation-qt/advancedsettingswidget.cpp
@@ -5,10 +5,10 @@
 #include "core/gpu_types.h"
 #include "mainwindow.h"
 #include "qtutils.h"
-#include "settingsdialog.h"
+#include "settingswindow.h"
 #include "settingwidgetbinder.h"
 
-static QCheckBox* addBooleanTweakOption(SettingsDialog* dialog, QTableWidget* table, QString name, std::string section,
+static QCheckBox* addBooleanTweakOption(SettingsWindow* dialog, QTableWidget* table, QString name, std::string section,
                                         std::string key, bool default_value)
 {
   const int row = table->rowCount();
@@ -39,7 +39,7 @@ static QCheckBox* setBooleanTweakOption(QTableWidget* table, int row, bool value
   return cb;
 }
 
-static QSpinBox* addIntRangeTweakOption(SettingsDialog* dialog, QTableWidget* table, QString name, std::string section,
+static QSpinBox* addIntRangeTweakOption(SettingsWindow* dialog, QTableWidget* table, QString name, std::string section,
                                         std::string key, int min_value, int max_value, int default_value)
 {
   const int row = table->rowCount();
@@ -72,7 +72,7 @@ static QSpinBox* setIntRangeTweakOption(QTableWidget* table, int row, int value)
   return cb;
 }
 
-static QDoubleSpinBox* addFloatRangeTweakOption(SettingsDialog* dialog, QTableWidget* table, QString name,
+static QDoubleSpinBox* addFloatRangeTweakOption(SettingsWindow* dialog, QTableWidget* table, QString name,
                                                 std::string section, std::string key, float min_value, float max_value,
                                                 float step_value, float default_value)
 {
@@ -109,7 +109,7 @@ static QDoubleSpinBox* setFloatRangeTweakOption(QTableWidget* table, int row, fl
 }
 
 template<typename T>
-static QComboBox* addChoiceTweakOption(SettingsDialog* dialog, QTableWidget* table, QString name, std::string section,
+static QComboBox* addChoiceTweakOption(SettingsWindow* dialog, QTableWidget* table, QString name, std::string section,
                                        std::string key, std::optional<T> (*parse_callback)(const char*),
                                        const char* (*get_value_callback)(T), const char* (*get_display_callback)(T),
                                        u32 num_values, T default_value)
@@ -145,7 +145,7 @@ static void setChoiceTweakOption(QTableWidget* table, int row, T value)
   cb->setCurrentIndex(static_cast<int>(value));
 }
 
-static void addMSAATweakOption(SettingsDialog* dialog, QTableWidget* table, const QString& name)
+static void addMSAATweakOption(SettingsWindow* dialog, QTableWidget* table, const QString& name)
 {
   const int row = table->rowCount();
 
@@ -175,7 +175,7 @@ static void addMSAATweakOption(SettingsDialog* dialog, QTableWidget* table, cons
   table->setCellWidget(row, 1, msaa);
 }
 
-static void addDirectoryOption(SettingsDialog* dialog, QTableWidget* table, const QString& name, std::string section,
+static void addDirectoryOption(SettingsWindow* dialog, QTableWidget* table, const QString& name, std::string section,
                                std::string key)
 {
   const int row = table->rowCount();
@@ -221,7 +221,7 @@ static void setDirectoryOption(QTableWidget* table, int row, const char* value)
   valuew->setText(QString::fromUtf8(value));
 }
 
-AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsDialog* dialog, QWidget* parent)
+AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsWindow* dialog, QWidget* parent)
   : QWidget(parent), m_dialog(dialog)
 {
   SettingsInterface* sif = dialog->getSettingsInterface();

diff --git a/src/duckstation-qt/advancedsettingswidget.h b/src/duckstation-qt/advancedsettingswidget.h
@@ -7,14 +7,14 @@
 
 #include "ui_advancedsettingswidget.h"
 
-class SettingsDialog;
+class SettingsWindow;
 
 class AdvancedSettingsWidget : public QWidget
 {
   Q_OBJECT
 
 public:
-  explicit AdvancedSettingsWidget(SettingsDialog* dialog, QWidget* parent);
+  explicit AdvancedSettingsWidget(SettingsWindow* dialog, QWidget* parent);
   ~AdvancedSettingsWidget();
 
 private:
@@ -47,7 +47,7 @@ class AdvancedSettingsWidget : public QWidget
     };
   };
 
-  SettingsDialog* m_dialog;
+  SettingsWindow* m_dialog;
 
   Ui::AdvancedSettingsWidget m_ui;
 

diff --git a/src/duckstation-qt/audiosettingswidget.cpp b/src/duckstation-qt/audiosettingswidget.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "audiosettingswidget.h"
-#include "settingsdialog.h"
+#include "settingswindow.h"
 #include "settingwidgetbinder.h"
 
 #include "core/spu.h"
@@ -11,7 +11,7 @@
 
 #include <cmath>
 
-AudioSettingsWidget::AudioSettingsWidget(SettingsDialog* dialog, QWidget* parent) : QWidget(parent), m_dialog(dialog)
+AudioSettingsWidget::AudioSettingsWidget(SettingsWindow* dialog, QWidget* parent) : QWidget(parent), m_dialog(dialog)
 {
   SettingsInterface* sif = dialog->getSettingsInterface();
 

diff --git a/src/duckstation-qt/audiosettingswidget.h b/src/duckstation-qt/audiosettingswidget.h
@@ -7,14 +7,14 @@
 
 #include "ui_audiosettingswidget.h"
 
-class SettingsDialog;
+class SettingsWindow;
 
 class AudioSettingsWidget : public QWidget
 {
   Q_OBJECT
 
 public:
-  explicit AudioSettingsWidget(SettingsDialog* dialog, QWidget* parent);
+  explicit AudioSettingsWidget(SettingsWindow* dialog, QWidget* parent);
   ~AudioSettingsWidget();
 
 private Q_SLOTS:
@@ -29,5 +29,5 @@ private Q_SLOTS:
 private:
   Ui::AudioSettingsWidget m_ui;
 
-  SettingsDialog* m_dialog;
+  SettingsWindow* m_dialog;
 };
diff --git a/src/duckstation-qt/biossettingswidget.cpp b/src/duckstation-qt/biossettingswidget.cpp
@@ -4,7 +4,7 @@
 #include "biossettingswidget.h"
 #include "qthost.h"
 #include "qtutils.h"
-#include "settingsdialog.h"
+#include "settingswindow.h"
 #include "settingwidgetbinder.h"
 
 #include "core/bios.h"
@@ -13,7 +13,7 @@
 #include <QtWidgets/QFileDialog>
 #include <algorithm>
 
-BIOSSettingsWidget::BIOSSettingsWidget(SettingsDialog* dialog, QWidget* parent) : QWidget(parent), m_dialog(dialog)
+BIOSSettingsWidget::BIOSSettingsWidget(SettingsWindow* dialog, QWidget* parent) : QWidget(parent), m_dialog(dialog)
 {
   SettingsInterface* sif = dialog->getSettingsInterface();
 

diff --git a/src/duckstation-qt/biossettingswidget.h b/src/duckstation-qt/biossettingswidget.h
@@ -7,7 +7,7 @@
 
 #include "ui_biossettingswidget.h"
 
-class SettingsDialog;
+class SettingsWindow;
 
 enum class ConsoleRegion;
 namespace BIOS {
@@ -19,7 +19,7 @@ class BIOSSettingsWidget : public QWidget
   Q_OBJECT
 
 public:
-  explicit BIOSSettingsWidget(SettingsDialog* dialog, QWidget* parent);
+  explicit BIOSSettingsWidget(SettingsWindow* dialog, QWidget* parent);
   ~BIOSSettingsWidget();
 
   static void populateDropDownForRegion(ConsoleRegion region, QComboBox* cb,
@@ -34,5 +34,5 @@ private Q_SLOTS:
 private:
   Ui::BIOSSettingsWidget m_ui;
 
-  SettingsDialog* m_dialog;
+  SettingsWindow* m_dialog;
 };
diff --git a/src/duckstation-qt/consolesettingswidget.cpp b/src/duckstation-qt/consolesettingswidget.cpp
@@ -4,13 +4,13 @@
 #include "consolesettingswidget.h"
 #include "core/system.h"
 #include "qtutils.h"
-#include "settingsdialog.h"
+#include "settingswindow.h"
 #include "settingwidgetbinder.h"
 #include "util/cd_image.h"
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QPushButton>
 
-ConsoleSettingsWidget::ConsoleSettingsWidget(SettingsDialog* dialog, QWidget* parent)
+ConsoleSettingsWidget::ConsoleSettingsWidget(SettingsWindow* dialog, QWidget* parent)
   : QWidget(parent), m_dialog(dialog)
 {
   SettingsInterface* sif = dialog->getSettingsInterface();

diff --git a/src/duckstation-qt/consolesettingswidget.h b/src/duckstation-qt/consolesettingswidget.h
@@ -7,14 +7,14 @@
 
 #include "ui_consolesettingswidget.h"
 
-class SettingsDialog;
+class SettingsWindow;
 
 class ConsoleSettingsWidget : public QWidget
 {
   Q_OBJECT
 
 public:
-  explicit ConsoleSettingsWidget(SettingsDialog* dialog, QWidget* parent);
+  explicit ConsoleSettingsWidget(SettingsWindow* dialog, QWidget* parent);
   ~ConsoleSettingsWidget();
 
 private Q_SLOTS:
@@ -28,5 +28,5 @@ private Q_SLOTS:
 
   Ui::ConsoleSettingsWidget m_ui;
 
-  SettingsDialog* m_dialog;
+  SettingsWindow* m_dialog;
 };
diff --git a/src/duckstation-qt/controllerbindingwidgets.cpp b/src/duckstation-qt/controllerbindingwidgets.cpp
@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #include "controllerbindingwidgets.h"
-#include "controllersettingsdialog.h"
+#include "controllersettingswindow.h"
 #include "controllersettingwidgetbinder.h"
 #include "qthost.h"
 #include "qtutils.h"
-#include "settingsdialog.h"
+#include "settingswindow.h"
 #include "settingwidgetbinder.h"
 
 #include "core/controller.h"
@@ -28,7 +28,7 @@
 
 Log_SetChannel(ControllerBindingWidget);
 
-ControllerBindingWidget::ControllerBindingWidget(QWidget* parent, ControllerSettingsDialog* dialog, u32 port)
+ControllerBindingWidget::ControllerBindingWidget(QWidget* parent, ControllerSettingsWindow* dialog, u32 port)
   : QWidget(parent), m_dialog(dialog), m_config_section(Controller::GetSettingsSection(port)), m_port_number(port)
 {
   m_ui.setupUi(this);
@@ -344,7 +344,7 @@ ControllerMacroEditWidget::ControllerMacroEditWidget(ControllerMacroWidget* pare
 {
   m_ui.setupUi(this);
 
-  ControllerSettingsDialog* dialog = m_bwidget->getDialog();
+  ControllerSettingsWindow* dialog = m_bwidget->getDialog();
   const std::string& section = m_bwidget->getConfigSection();
   const Controller::ControllerInfo* cinfo = Controller::GetControllerInfo(m_bwidget->getControllerType());
   if (!cinfo)
@@ -448,7 +448,7 @@ void ControllerMacroEditWidget::updateFrequencyText()
 
 void ControllerMacroEditWidget::updateBinds()
 {
-  ControllerSettingsDialog* dialog = m_bwidget->getDialog();
+  ControllerSettingsWindow* dialog = m_bwidget->getDialog();
   const Controller::ControllerInfo* cinfo = Controller::GetControllerInfo(m_bwidget->getControllerType());
   if (!cinfo)
     return;

diff --git a/src/duckstation-qt/controllerbindingwidgets.h b/src/duckstation-qt/controllerbindingwidgets.h
@@ -22,7 +22,7 @@
 class QVBoxLayout;
 
 class InputBindingWidget;
-class ControllerSettingsDialog;
+class ControllerSettingsWindow;
 class ControllerCustomSettingsWidget;
 class ControllerMacroWidget;
 class ControllerMacroEditWidget;
@@ -35,12 +35,12 @@ class ControllerBindingWidget final : public QWidget
   Q_OBJECT
 
 public:
-  ControllerBindingWidget(QWidget* parent, ControllerSettingsDialog* dialog, u32 port);
+  ControllerBindingWidget(QWidget* parent, ControllerSettingsWindow* dialog, u32 port);
   ~ControllerBindingWidget();
 
   QIcon getIcon() const;
 
-  ALWAYS_INLINE ControllerSettingsDialog* getDialog() const { return m_dialog; }
+  ALWAYS_INLINE ControllerSettingsWindow* getDialog() const { return m_dialog; }
   ALWAYS_INLINE const std::string& getConfigSection() const { return m_config_section; }
   ALWAYS_INLINE ControllerType getControllerType() const { return m_controller_type; }
   ALWAYS_INLINE u32 getPortNumber() const { return m_port_number; }
@@ -62,7 +62,7 @@ private Q_SLOTS:
 
   Ui::ControllerBindingWidget m_ui;
 
-  ControllerSettingsDialog* m_dialog;
+  ControllerSettingsWindow* m_dialog;
 
   std::string m_config_section;
   ControllerType m_controller_type;
@@ -91,7 +91,7 @@ class ControllerMacroWidget : public QWidget
   void createWidgets(ControllerBindingWidget* parent);
 
   Ui::ControllerMacroWidget m_ui;
-  ControllerSettingsDialog* m_dialog;
+  ControllerSettingsWindow* m_dialog;
   std::array<ControllerMacroEditWidget*, NUM_MACROS> m_macros;
 };
 
@@ -156,7 +156,7 @@ class ControllerBindingWidget_Base : public QWidget
   ControllerBindingWidget_Base(ControllerBindingWidget* parent);
   virtual ~ControllerBindingWidget_Base();
 
-  ALWAYS_INLINE ControllerSettingsDialog* getDialog() const
+  ALWAYS_INLINE ControllerSettingsWindow* getDialog() const
   {
     return static_cast<ControllerBindingWidget*>(parent())->getDialog();
   }