diff --git a/src/duckstation-qt/aboutdialog.cpp b/src/duckstation-qt/aboutdialog.cpp index 0a1868cdf..ed7b49aad 100644 --- a/src/duckstation-qt/aboutdialog.cpp +++ b/src/duckstation-qt/aboutdialog.cpp @@ -81,7 +81,7 @@ void AboutDialog::showThirdPartyNotices(QWidget* parent) layout->addWidget(tb, 1); QDialogButtonBox* bb = new QDialogButtonBox(QDialogButtonBox::Close, &dialog); - connect(bb->button(QDialogButtonBox::Close), &QPushButton::clicked, &dialog, &QDialog::done); + connect(bb, &QDialogButtonBox::rejected, &dialog, &QDialog::accept); layout->addWidget(bb, 0); dialog.exec(); diff --git a/src/duckstation-qt/audiosettingswidget.cpp b/src/duckstation-qt/audiosettingswidget.cpp index b9e121f33..45c425859 100644 --- a/src/duckstation-qt/audiosettingswidget.cpp +++ b/src/duckstation-qt/audiosettingswidget.cpp @@ -303,7 +303,7 @@ void AudioSettingsWidget::onStretchSettingsClicked() SettingWidgetBinder::BindWidgetToBoolSetting(sif, dlgui.useAAFilter, "Audio", "StretchUseAAFilter", AudioStreamParameters::DEFAULT_STRETCH_USE_AA_FILTER); - connect(dlgui.buttonBox->button(QDialogButtonBox::Close), &QPushButton::clicked, &dlg, &QDialog::accept); + 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() ? diff --git a/src/duckstation-qt/controllerglobalsettingswidget.cpp b/src/duckstation-qt/controllerglobalsettingswidget.cpp index f07097444..b20fcf6db 100644 --- a/src/duckstation-qt/controllerglobalsettingswidget.cpp +++ b/src/duckstation-qt/controllerglobalsettingswidget.cpp @@ -133,7 +133,7 @@ ControllerLEDSettingsDialog::ControllerLEDSettingsDialog(QWidget* parent, Contro linkButton(m_ui.SDL2LED, 2); linkButton(m_ui.SDL3LED, 3); - connect(m_ui.buttonBox->button(QDialogButtonBox::Close), &QPushButton::clicked, this, &QDialog::accept); + connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &QDialog::accept); } ControllerLEDSettingsDialog::~ControllerLEDSettingsDialog() = default; diff --git a/src/duckstation-qt/debuggermodels.cpp b/src/duckstation-qt/debuggermodels.cpp index 8fa2db694..671a2db7e 100644 --- a/src/duckstation-qt/debuggermodels.cpp +++ b/src/duckstation-qt/debuggermodels.cpp @@ -455,8 +455,7 @@ void DebuggerStackModel::invalidateView() DebuggerAddBreakpointDialog::DebuggerAddBreakpointDialog(QWidget* parent /*= nullptr*/) : QDialog(parent) { m_ui.setupUi(this); - connect(m_ui.buttonBox->button(QDialogButtonBox::Ok), &QAbstractButton::clicked, this, - &DebuggerAddBreakpointDialog::okClicked); + connect(m_ui.buttonBox, &QDialogButtonBox::accepted, this, &DebuggerAddBreakpointDialog::okClicked); } DebuggerAddBreakpointDialog::~DebuggerAddBreakpointDialog() = default; diff --git a/src/duckstation-qt/gamecheatsettingswidget.cpp b/src/duckstation-qt/gamecheatsettingswidget.cpp index d7037692a..b172bc4ea 100644 --- a/src/duckstation-qt/gamecheatsettingswidget.cpp +++ b/src/duckstation-qt/gamecheatsettingswidget.cpp @@ -821,7 +821,7 @@ CheatCodeEditorDialog::CheatCodeEditorDialog(GameCheatSettingsWidget* parent, Ch connect(m_ui.rangeMax, &QSpinBox::valueChanged, this, &CheatCodeEditorDialog::onRangeMaxChanged); connect(m_ui.editChoice, &QPushButton::clicked, this, &CheatCodeEditorDialog::onEditChoiceClicked); connect(m_ui.buttonBox, &QDialogButtonBox::accepted, this, &CheatCodeEditorDialog::saveClicked); - connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &CheatCodeEditorDialog::cancelClicked); + connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); } CheatCodeEditorDialog::~CheatCodeEditorDialog() = default; @@ -929,11 +929,6 @@ void CheatCodeEditorDialog::saveClicked() accept(); } -void CheatCodeEditorDialog::cancelClicked() -{ - reject(); -} - void CheatCodeEditorDialog::onOptionTypeChanged(int index) { m_ui.editChoice->setVisible(index == 1); @@ -1020,7 +1015,7 @@ GameCheatCodeChoiceEditorDialog::GameCheatCodeChoiceEditorDialog(QWidget* parent connect(m_ui.add, &QToolButton::clicked, this, &GameCheatCodeChoiceEditorDialog::onAddClicked); connect(m_ui.remove, &QToolButton::clicked, this, &GameCheatCodeChoiceEditorDialog::onRemoveClicked); connect(m_ui.buttonBox, &QDialogButtonBox::accepted, this, &GameCheatCodeChoiceEditorDialog::onSaveClicked); - connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &CheatCodeEditorDialog::reject); + connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); m_ui.optionList->setRootIsDecorated(false); for (const Cheats::CodeOption& opt : options) diff --git a/src/duckstation-qt/gamecheatsettingswidget.h b/src/duckstation-qt/gamecheatsettingswidget.h index b49306d2d..233fd327c 100644 --- a/src/duckstation-qt/gamecheatsettingswidget.h +++ b/src/duckstation-qt/gamecheatsettingswidget.h @@ -104,7 +104,6 @@ public: private Q_SLOTS: void onGroupSelectedIndexChanged(int index); void saveClicked(); - void cancelClicked(); void onOptionTypeChanged(int index); void onRangeMinChanged(int value); diff --git a/src/duckstation-qt/gamesummarywidget.cpp b/src/duckstation-qt/gamesummarywidget.cpp index 07aebe21a..ac8a65deb 100644 --- a/src/duckstation-qt/gamesummarywidget.cpp +++ b/src/duckstation-qt/gamesummarywidget.cpp @@ -408,7 +408,7 @@ void GameSummaryWidget::onCompatibilityCommentsClicked() layout->addWidget(tb, 1); QDialogButtonBox* bb = new QDialogButtonBox(QDialogButtonBox::Close, &dlg); - connect(bb->button(QDialogButtonBox::Close), &QPushButton::clicked, &dlg, &QDialog::accept); + connect(bb, &QDialogButtonBox::rejected, &dlg, &QDialog::accept); layout->addWidget(bb); dlg.exec(); diff --git a/src/duckstation-qt/inputbindingdialog.cpp b/src/duckstation-qt/inputbindingdialog.cpp index 8e3aaf698..3dbfdffa7 100644 --- a/src/duckstation-qt/inputbindingdialog.cpp +++ b/src/duckstation-qt/inputbindingdialog.cpp @@ -30,7 +30,7 @@ InputBindingDialog::InputBindingDialog(SettingsInterface* sif, InputBindingInfo: connect(m_ui.addBinding, &QPushButton::clicked, this, &InputBindingDialog::onAddBindingButtonClicked); connect(m_ui.removeBinding, &QPushButton::clicked, this, &InputBindingDialog::onRemoveBindingButtonClicked); connect(m_ui.clearBindings, &QPushButton::clicked, this, &InputBindingDialog::onClearBindingsButtonClicked); - connect(m_ui.buttonBox, &QDialogButtonBox::rejected, [this]() { reject(); }); + connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &QDialog::accept); updateList(); // Only show the sensitivity controls for binds where it's applicable.