github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-28 14:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: Simplify connecting to QDialogButtonBox signals

Browse Source
This commit is contained in:
Davide Pesavento 2025-06-21 15:10:21 -04:00 committed by Connor McLaughlin
parent 175ed8caf3
commit 842f7414d9
8 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/duckstation-qt/aboutdialog.cpp
View File

@ -81,7 +81,7 @@ void AboutDialog::showThirdPartyNotices(QWidget* parent)
layout->addWidget(tb, 1); layout->addWidget(tb, 1);
QDialogButtonBox* bb = new QDialogButtonBox(QDialogButtonBox::Close, &dialog); 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); layout->addWidget(bb, 0);
dialog.exec(); dialog.exec();

2
src/duckstation-qt/audiosettingswidget.cpp
View File

@ -303,7 +303,7 @@ void AudioSettingsWidget::onStretchSettingsClicked()
SettingWidgetBinder::BindWidgetToBoolSetting(sif, dlgui.useAAFilter, "Audio", "StretchUseAAFilter", SettingWidgetBinder::BindWidgetToBoolSetting(sif, dlgui.useAAFilter, "Audio", "StretchUseAAFilter",
AudioStreamParameters::DEFAULT_STRETCH_USE_AA_FILTER); 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]() { connect(dlgui.buttonBox->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked, this, [this, &dlg]() {
m_dialog->setIntSettingValue("Audio", "StretchSequenceLengthMS", m_dialog->setIntSettingValue("Audio", "StretchSequenceLengthMS",
m_dialog->isPerGameSettings() ? m_dialog->isPerGameSettings() ?

2
src/duckstation-qt/controllerglobalsettingswidget.cpp
View File

@ -133,7 +133,7 @@ ControllerLEDSettingsDialog::ControllerLEDSettingsDialog(QWidget* parent, Contro
linkButton(m_ui.SDL2LED, 2); linkButton(m_ui.SDL2LED, 2);
linkButton(m_ui.SDL3LED, 3); 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; ControllerLEDSettingsDialog::~ControllerLEDSettingsDialog() = default;

3
src/duckstation-qt/debuggermodels.cpp
View File

@ -455,8 +455,7 @@ void DebuggerStackModel::invalidateView()
DebuggerAddBreakpointDialog::DebuggerAddBreakpointDialog(QWidget* parent /*= nullptr*/) : QDialog(parent) DebuggerAddBreakpointDialog::DebuggerAddBreakpointDialog(QWidget* parent /*= nullptr*/) : QDialog(parent)
{ {
m_ui.setupUi(this); m_ui.setupUi(this);
connect(m_ui.buttonBox->button(QDialogButtonBox::Ok), &QAbstractButton::clicked, this, connect(m_ui.buttonBox, &QDialogButtonBox::accepted, this, &DebuggerAddBreakpointDialog::okClicked);
&DebuggerAddBreakpointDialog::okClicked);
} }
DebuggerAddBreakpointDialog::~DebuggerAddBreakpointDialog() = default; DebuggerAddBreakpointDialog::~DebuggerAddBreakpointDialog() = default;

9
src/duckstation-qt/gamecheatsettingswidget.cpp
View File

@ -821,7 +821,7 @@ CheatCodeEditorDialog::CheatCodeEditorDialog(GameCheatSettingsWidget* parent, Ch
connect(m_ui.rangeMax, &QSpinBox::valueChanged, this, &CheatCodeEditorDialog::onRangeMaxChanged); connect(m_ui.rangeMax, &QSpinBox::valueChanged, this, &CheatCodeEditorDialog::onRangeMaxChanged);
connect(m_ui.editChoice, &QPushButton::clicked, this, &CheatCodeEditorDialog::onEditChoiceClicked); connect(m_ui.editChoice, &QPushButton::clicked, this, &CheatCodeEditorDialog::onEditChoiceClicked);
connect(m_ui.buttonBox, &QDialogButtonBox::accepted, this, &CheatCodeEditorDialog::saveClicked); 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; CheatCodeEditorDialog::~CheatCodeEditorDialog() = default;
@ -929,11 +929,6 @@ void CheatCodeEditorDialog::saveClicked()
accept(); accept();
} }
void CheatCodeEditorDialog::cancelClicked()
{
reject();
}
void CheatCodeEditorDialog::onOptionTypeChanged(int index) void CheatCodeEditorDialog::onOptionTypeChanged(int index)
{ {
m_ui.editChoice->setVisible(index == 1); 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.add, &QToolButton::clicked, this, &GameCheatCodeChoiceEditorDialog::onAddClicked);
connect(m_ui.remove, &QToolButton::clicked, this, &GameCheatCodeChoiceEditorDialog::onRemoveClicked); connect(m_ui.remove, &QToolButton::clicked, this, &GameCheatCodeChoiceEditorDialog::onRemoveClicked);
connect(m_ui.buttonBox, &QDialogButtonBox::accepted, this, &GameCheatCodeChoiceEditorDialog::onSaveClicked); 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); m_ui.optionList->setRootIsDecorated(false);
for (const Cheats::CodeOption& opt : options) for (const Cheats::CodeOption& opt : options)

1
src/duckstation-qt/gamecheatsettingswidget.h
View File

@ -104,7 +104,6 @@ public:
private Q_SLOTS: private Q_SLOTS:
void onGroupSelectedIndexChanged(int index); void onGroupSelectedIndexChanged(int index);
void saveClicked(); void saveClicked();
void cancelClicked();
void onOptionTypeChanged(int index); void onOptionTypeChanged(int index);
void onRangeMinChanged(int value); void onRangeMinChanged(int value);

2
src/duckstation-qt/gamesummarywidget.cpp
View File

@ -408,7 +408,7 @@ void GameSummaryWidget::onCompatibilityCommentsClicked()
layout->addWidget(tb, 1); layout->addWidget(tb, 1);
QDialogButtonBox* bb = new QDialogButtonBox(QDialogButtonBox::Close, &dlg); 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); layout->addWidget(bb);
dlg.exec(); dlg.exec();

2
src/duckstation-qt/inputbindingdialog.cpp
View File

@ -30,7 +30,7 @@ InputBindingDialog::InputBindingDialog(SettingsInterface* sif, InputBindingInfo:
connect(m_ui.addBinding, &QPushButton::clicked, this, &InputBindingDialog::onAddBindingButtonClicked); connect(m_ui.addBinding, &QPushButton::clicked, this, &InputBindingDialog::onAddBindingButtonClicked);
connect(m_ui.removeBinding, &QPushButton::clicked, this, &InputBindingDialog::onRemoveBindingButtonClicked); connect(m_ui.removeBinding, &QPushButton::clicked, this, &InputBindingDialog::onRemoveBindingButtonClicked);
connect(m_ui.clearBindings, &QPushButton::clicked, this, &InputBindingDialog::onClearBindingsButtonClicked); 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(); updateList();
// Only show the sensitivity controls for binds where it's applicable. // Only show the sensitivity controls for binds where it's applicable.