Qt: Remove a few more instances of QDialog::exec() (#3623)

Author: Pesa

src/duckstation-qt/aboutdialog.cpp

@@ -57,17 +57,18 @@ AboutDialog::~AboutDialog() = default;
 
 void AboutDialog::showThirdPartyNotices(QWidget* parent)
 {
-  QDialog dialog(parent);
-  dialog.setMinimumSize(700, 400);
-  dialog.setWindowTitle(tr("DuckStation Third-Party Notices"));
+  QDialog* const dialog = new QDialog(parent);
+  dialog->setAttribute(Qt::WA_DeleteOnClose);
+  dialog->setMinimumSize(700, 400);
+  dialog->setWindowTitle(tr("DuckStation Third-Party Notices"));
 
   QIcon icon;
   icon.addFile(QString::fromUtf8(":/icons/duck.png"), QSize(), QIcon::Normal, QIcon::Off);
-  dialog.setWindowIcon(icon);
+  dialog->setWindowIcon(icon);
 
-  QVBoxLayout* layout = new QVBoxLayout(&dialog);
+  QVBoxLayout* layout = new QVBoxLayout(dialog);
 
-  QTextBrowser* tb = new QTextBrowser(&dialog);
+  QTextBrowser* tb = new QTextBrowser(dialog);
   tb->setAcceptRichText(true);
   tb->setReadOnly(true);
   tb->setOpenExternalLinks(true);
@@ -83,9 +84,9 @@ void AboutDialog::showThirdPartyNotices(QWidget* parent)
   }
   layout->addWidget(tb, 1);
 
-  QDialogButtonBox* bb = new QDialogButtonBox(QDialogButtonBox::Close, &dialog);
-  connect(bb, &QDialogButtonBox::rejected, &dialog, &QDialog::accept);
+  QDialogButtonBox* bb = new QDialogButtonBox(QDialogButtonBox::Close, dialog);
+  connect(bb, &QDialogButtonBox::rejected, dialog, &QDialog::accept);
   layout->addWidget(bb, 0);
 
-  dialog.exec();
+  dialog->open();
 }

src/duckstation-qt/aboutdialog.h

@@ -18,5 +18,4 @@ class AboutDialog final : public QDialog
 
 private:
   Ui::AboutDialog m_ui;
-
 };

src/duckstation-qt/achievementlogindialog.cpp

@@ -20,7 +20,7 @@ AchievementLoginDialog::AchievementLoginDialog(QWidget* parent, Achievements::Lo
   title_font.setPixelSize(20);
   m_ui.titleLabel->setFont(title_font);
   setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-  setAttribute(Qt::WA_DeleteOnClose, true);
+  setAttribute(Qt::WA_DeleteOnClose);
 
   // Adjust text if needed based on reason.
   if (reason == Achievements::LoginRequestReason::TokenInvalid)

src/duckstation-qt/achievementlogindialog.h

@@ -10,7 +10,7 @@ namespace Achievements {
 enum class LoginRequestReason;
 }
 
-class AchievementLoginDialog : public QDialog
+class AchievementLoginDialog final : public QDialog
 {
   Q_OBJECT
 

src/duckstation-qt/achievementlogindialog.ui

@@ -2,9 +2,6 @@
 <ui version="4.0">
  <class>AchievementLoginDialog</class>
  <widget class="QDialog" name="AchievementLoginDialog">
-  <property name="windowModality">
-   <enum>Qt::WindowModality::WindowModal</enum>
-  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -28,9 +25,6 @@
   <property name="windowTitle">
    <string comment="Window title">RetroAchievements Login</string>
   </property>
-  <property name="modal">
-   <bool>true</bool>
-  </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="2" column="0">
     <widget class="QLabel" name="label_4">

src/duckstation-qt/achievementsettingswidget.cpp

@@ -240,7 +240,7 @@ void AchievementSettingsWidget::onLoginLogoutPressed()
 
   AchievementLoginDialog* login = new AchievementLoginDialog(this, Achievements::LoginRequestReason::UserInitiated);
   connect(login, &AchievementLoginDialog::accepted, this, &AchievementSettingsWidget::onLoginCompleted);
-  login->show();
+  login->open();
 }
 
 void AchievementSettingsWidget::onLoginCompleted()

src/duckstation-qt/audiosettingswidget.cpp

@@ -281,9 +281,10 @@ void AudioSettingsWidget::onOutputMutedChanged(int new_state)
 
 void AudioSettingsWidget::onStretchSettingsClicked()
 {
-  QDialog dlg(QtUtils::GetRootWidget(this));
+  QDialog* const dlg = new QDialog(QtUtils::GetRootWidget(this));
+  dlg->setAttribute(Qt::WA_DeleteOnClose);
   Ui::AudioStretchSettingsDialog dlgui;
-  dlgui.setupUi(&dlg);
+  dlgui.setupUi(dlg);
   dlgui.icon->setPixmap(QIcon::fromTheme(QStringLiteral("volume-up-line")).pixmap(32));
   dlgui.buttonBox->button(QDialogButtonBox::Close)->setDefault(true);
 
@@ -302,8 +303,8 @@ void AudioSettingsWidget::onStretchSettingsClicked()
   SettingWidgetBinder::BindWidgetToBoolSetting(sif, dlgui.useAAFilter, "Audio", "StretchUseAAFilter",
                                                AudioStreamParameters::DEFAULT_STRETCH_USE_AA_FILTER);
 
-  connect(dlgui.buttonBox, &QDialogButtonBox::rejected, &dlg, &QDialog::accept);
-  connect(dlgui.buttonBox->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked, this, [this, &dlg]() {
+  connect(dlgui.buttonBox, &QDialogButtonBox::rejected, dlg, &QDialog::accept);
+  connect(dlgui.buttonBox->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked, this, [this, dlg]() {
     m_dialog->setIntSettingValue("Audio", "StretchSequenceLengthMS",
                                  m_dialog->isPerGameSettings() ?
                                    std::nullopt :
@@ -325,12 +326,12 @@ void AudioSettingsWidget::onStretchSettingsClicked()
                                     std::nullopt :
                                     std::optional<bool>(AudioStreamParameters::DEFAULT_STRETCH_USE_AA_FILTER));
 
-    dlg.reject();
+    dlg->reject();
 
     QMetaObject::invokeMethod(this, &AudioSettingsWidget::onStretchSettingsClicked, Qt::QueuedConnection);
   });
 
-  dlg.exec();
+  dlg->open();
 }
 
 void AudioSettingsWidget::resetVolume(bool fast_forward)

src/duckstation-qt/consolesettingswidget.cpp

@@ -194,7 +194,6 @@ void ConsoleSettingsWidget::onEnableCPUClockSpeedControlChecked(int state)
 
     QMessageBox* const mb = QtUtils::NewMessageBox(QMessageBox::Warning, tr("CPU Overclocking Warning"), message,
                                                    QMessageBox::NoButton, QMessageBox::NoButton, Qt::WindowModal, this);
-    mb->setAttribute(Qt::WA_DeleteOnClose, true);
     const QPushButton* const yes_button =
       mb->addButton(tr("Yes, I will confirm bugs without overclocking before reporting."), QMessageBox::YesRole);
     const QPushButton* const no_button = mb->addButton(tr("No, take me back to safety."), QMessageBox::NoRole);

src/duckstation-qt/controllerbindingwidgets.cpp

@@ -368,101 +368,13 @@ void ControllerBindingWidget::doDeviceAutomaticBinding(const QString& device)
 
 void ControllerBindingWidget::onMultipleDeviceAutomaticBindingTriggered()
 {
-  // force a refresh after mapping
-  if (doMultipleDeviceAutomaticBinding(this, m_dialog, m_port_number))
-    onTypeChanged();
-}
-
-bool ControllerBindingWidget::doMultipleDeviceAutomaticBinding(QWidget* parent, ControllerSettingsWindow* parent_dialog,
-                                                               u32 port)
-{
-  QDialog dialog(parent);
-
-  QVBoxLayout* layout = new QVBoxLayout(&dialog);
-  QLabel help(tr("Select the devices from the list below that you want to bind to this controller."), &dialog);
-  layout->addWidget(&help);
-
-  QListWidget list(&dialog);
-  list.setSelectionMode(QListWidget::SingleSelection);
-  layout->addWidget(&list);
-
-  for (const InputDeviceListModel::Device& dev : g_emu_thread->getInputDeviceListModel()->getDeviceList())
-  {
-    QListWidgetItem* item = new QListWidgetItem;
-    item->setText(QStringLiteral("%1 (%2)").arg(dev.identifier).arg(dev.display_name));
-    item->setData(Qt::UserRole, dev.identifier);
-    item->setIcon(InputDeviceListModel::getIconForKey(dev.key));
-    item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
-    item->setCheckState(Qt::Unchecked);
-    list.addItem(item);
-  }
-
-  QDialogButtonBox bb(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, &dialog);
-  connect(&bb, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
-  connect(&bb, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
-  layout->addWidget(&bb);
-
-  if (dialog.exec() == QDialog::Rejected)
-    return false;
-
-  auto lock = Host::GetSettingsLock();
-  const bool global = (!parent_dialog || parent_dialog->isEditingGlobalSettings());
-  SettingsInterface& si =
-    *(global ? Host::Internal::GetBaseSettingsLayer() : parent_dialog->getEditingSettingsInterface());
-
-  // first device should clear mappings
-  bool tried_any = false;
-  bool mapped_any = false;
-  const int count = list.count();
-  for (int i = 0; i < count; i++)
-  {
-    QListWidgetItem* item = list.item(i);
-    if (item->checkState() != Qt::Checked)
-      continue;
-
-    tried_any = true;
-
-    const QString identifier = item->data(Qt::UserRole).toString();
-    std::vector<std::pair<GenericInputBinding, std::string>> mapping =
-      InputManager::GetGenericBindingMapping(identifier.toStdString());
-    if (mapping.empty())
-    {
-      lock.unlock();
-      QtUtils::MessageBoxCritical(
-        parent, tr("Automatic Mapping"),
-        tr("No generic bindings were generated for device '%1'. The controller/source may not "
-           "support automatic mapping.")
-          .arg(identifier));
-      lock.lock();
-      continue;
-    }
-
-    mapped_any |= InputManager::MapController(si, port, mapping, !mapped_any);
-  }
-
-  lock.unlock();
-
-  if (!tried_any)
-  {
-    QtUtils::MessageBoxInformation(parent, tr("Automatic Mapping"), tr("No devices were selected."));
-    return false;
-  }
+  QDialog* const dialog = new MultipleDeviceAutobindDialog(this, m_dialog, m_port_number);
+  dialog->setAttribute(Qt::WA_DeleteOnClose);
 
-  if (mapped_any)
-  {
-    if (global)
-    {
-      QtHost::SaveGameSettings(&si, false);
-      g_emu_thread->reloadGameSettings(false);
-    }
-    else
-    {
-      QtHost::QueueSettingsSave();
-      g_emu_thread->reloadInputBindings();
-    }
-  }
+  // force a refresh after mapping
+  connect(dialog, &QDialog::accepted, this, [this] { onTypeChanged(); });
 
-  return mapped_any;
+  dialog->open();
 }
 
 void ControllerBindingWidget::saveAndRefresh()
@@ -1077,3 +989,98 @@ ControllerCustomSettingsDialog::ControllerCustomSettingsDialog(QWidget* parent,
 }
 
 ControllerCustomSettingsDialog::~ControllerCustomSettingsDialog() = default;
+
+MultipleDeviceAutobindDialog::MultipleDeviceAutobindDialog(QWidget* parent, ControllerSettingsWindow* settings_window,
+                                                           u32 port)
+  : QDialog(parent), m_settings_window(settings_window), m_port(port)
+{
+  QVBoxLayout* layout = new QVBoxLayout(this);
+  layout->addWidget(new QLabel(tr("Select the devices from the list below that you want to bind to this controller.")));
+
+  m_list = new QListWidget;
+  m_list->setSelectionMode(QListWidget::SingleSelection);
+  layout->addWidget(m_list);
+
+  for (const InputDeviceListModel::Device& dev : g_emu_thread->getInputDeviceListModel()->getDeviceList())
+  {
+    QListWidgetItem* item = new QListWidgetItem;
+    item->setIcon(InputDeviceListModel::getIconForKey(dev.key));
+    item->setText(QStringLiteral("%1 (%2)").arg(dev.identifier).arg(dev.display_name));
+    item->setData(Qt::UserRole, dev.identifier);
+    item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
+    item->setCheckState(Qt::Unchecked);
+    m_list->addItem(item);
+  }
+
+  QDialogButtonBox* bb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+  connect(bb, &QDialogButtonBox::accepted, this, &MultipleDeviceAutobindDialog::doAutomaticBinding);
+  connect(bb, &QDialogButtonBox::rejected, this, &QDialog::reject);
+  layout->addWidget(bb);
+}
+
+MultipleDeviceAutobindDialog::~MultipleDeviceAutobindDialog() = default;
+
+void MultipleDeviceAutobindDialog::doAutomaticBinding()
+{
+  auto lock = Host::GetSettingsLock();
+  const bool global = (!m_settings_window || m_settings_window->isEditingGlobalSettings());
+  SettingsInterface* si =
+    global ? Host::Internal::GetBaseSettingsLayer() : m_settings_window->getEditingSettingsInterface();
+
+  // first device should clear mappings
+  bool tried_any = false;
+  bool mapped_any = false;
+  const int count = m_list->count();
+  for (int i = 0; i < count; i++)
+  {
+    const QListWidgetItem* item = m_list->item(i);
+    if (item->checkState() != Qt::Checked)
+      continue;
+
+    tried_any = true;
+
+    const QString identifier = item->data(Qt::UserRole).toString();
+    std::vector<std::pair<GenericInputBinding, std::string>> mapping =
+      InputManager::GetGenericBindingMapping(identifier.toStdString());
+    if (mapping.empty())
+    {
+      lock.unlock();
+      QtUtils::MessageBoxCritical(
+        this, tr("Automatic Mapping"),
+        tr("No generic bindings were generated for device '%1'. The controller/source may not "
+           "support automatic mapping.")
+          .arg(identifier));
+      lock.lock();
+      continue;
+    }
+
+    mapped_any |= InputManager::MapController(*si, m_port, mapping, !mapped_any);
+  }
+
+  lock.unlock();
+
+  if (!tried_any)
+  {
+    QtUtils::MessageBoxInformation(this, tr("Automatic Mapping"), tr("No devices were selected."));
+    return;
+  }
+
+  if (mapped_any)
+  {
+    if (global)
+    {
+      QtHost::SaveGameSettings(si, false);
+      g_emu_thread->reloadGameSettings(false);
+    }
+    else
+    {
+      QtHost::QueueSettingsSave();
+      g_emu_thread->reloadInputBindings();
+    }
+    accept();
+  }
+  else
+  {
+    reject();
+  }
+}

src/duckstation-qt/controllerbindingwidgets.h

@@ -38,8 +38,6 @@ class ControllerBindingWidget final : public QWidget
   ALWAYS_INLINE u32 getPortNumber() const { return m_port_number; }
   ALWAYS_INLINE const QIcon& getIcon() { return m_icon; }
 
-  static bool doMultipleDeviceAutomaticBinding(QWidget* parent, ControllerSettingsWindow* parent_dialog, u32 port);
-
 private:
   void populateControllerTypes();
   void populateWidgets();
@@ -142,11 +140,29 @@ class ControllerCustomSettingsWidget : public QWidget
 
 //////////////////////////////////////////////////////////////////////////
 
-class ControllerCustomSettingsDialog : public QDialog
+class ControllerCustomSettingsDialog final : public QDialog
 {
 public:
-  explicit ControllerCustomSettingsDialog(QWidget* parent, SettingsInterface* sif, const std::string& section,
-                                          std::span<const SettingInfo> settings, const char* tr_context,
-                                          const QString& window_title);
+  ControllerCustomSettingsDialog(QWidget* parent, SettingsInterface* sif, const std::string& section,
+                                 std::span<const SettingInfo> settings, const char* tr_context,
+                                 const QString& window_title);
   ~ControllerCustomSettingsDialog();
 };
+
+//////////////////////////////////////////////////////////////////////////
+
+class MultipleDeviceAutobindDialog final : public QDialog
+{
+  Q_OBJECT
+
+public:
+  MultipleDeviceAutobindDialog(QWidget* parent, ControllerSettingsWindow* settings_window, u32 port);
+  ~MultipleDeviceAutobindDialog();
+
+private:
+  void doAutomaticBinding();
+
+  QListWidget* m_list;
+  ControllerSettingsWindow* m_settings_window;
+  u32 m_port;
+};