diff --git a/src/duckstation-qt/achievementsettingswidget.cpp b/src/duckstation-qt/achievementsettingswidget.cpp index 3bf1cce75..d80d9444c 100644 --- a/src/duckstation-qt/achievementsettingswidget.cpp +++ b/src/duckstation-qt/achievementsettingswidget.cpp @@ -220,8 +220,7 @@ void AchievementSettingsWidget::onLoginLogoutPressed() } AchievementLoginDialog login(this, Achievements::LoginRequestReason::UserInitiated); - int res = login.exec(); - if (res == QDialog::Rejected) + if (login.exec() == QDialog::Rejected) return; updateLoginState(); diff --git a/src/duckstation-qt/controllerbindingwidgets.cpp b/src/duckstation-qt/controllerbindingwidgets.cpp index a97268ca5..fc1e88e85 100644 --- a/src/duckstation-qt/controllerbindingwidgets.cpp +++ b/src/duckstation-qt/controllerbindingwidgets.cpp @@ -401,7 +401,7 @@ bool ControllerBindingWidget::doMultipleDeviceAutomaticBinding(QWidget* parent, connect(&bb, &QDialogButtonBox::rejected, &dialog, &QDialog::reject); layout->addWidget(&bb); - if (dialog.exec() == 0) + if (dialog.exec() == QDialog::Rejected) return false; auto lock = Host::GetSettingsLock(); diff --git a/src/duckstation-qt/debuggerwindow.cpp b/src/duckstation-qt/debuggerwindow.cpp index 934b87add..051db92a3 100644 --- a/src/duckstation-qt/debuggerwindow.cpp +++ b/src/duckstation-qt/debuggerwindow.cpp @@ -186,7 +186,7 @@ void DebuggerWindow::onFollowAddressTriggered() void DebuggerWindow::onAddBreakpointTriggered() { DebuggerAddBreakpointDialog dlg(this); - if (!dlg.exec()) + if (dlg.exec() == QDialog::Rejected) return; addBreakpoint(dlg.getType(), dlg.getAddress()); diff --git a/src/duckstation-qt/gamecheatsettingswidget.cpp b/src/duckstation-qt/gamecheatsettingswidget.cpp index b172bc4ea..a4f0653ca 100644 --- a/src/duckstation-qt/gamecheatsettingswidget.cpp +++ b/src/duckstation-qt/gamecheatsettingswidget.cpp @@ -635,7 +635,7 @@ void GameCheatSettingsWidget::newCode() { Cheats::CodeInfo new_code; CheatCodeEditorDialog dlg(this, &new_code, getGroupNames()); - if (!dlg.exec()) + if (dlg.exec() == QDialog::Rejected) { // cancelled return; @@ -653,7 +653,7 @@ void GameCheatSettingsWidget::editCode(const std::string_view code_name) return; CheatCodeEditorDialog dlg(this, code, getGroupNames()); - if (!dlg.exec()) + if (dlg.exec() == QDialog::Rejected) { // no changes return; @@ -949,7 +949,7 @@ void CheatCodeEditorDialog::onRangeMaxChanged(int value) void CheatCodeEditorDialog::onEditChoiceClicked() { GameCheatCodeChoiceEditorDialog dlg(this, m_new_options); - if (dlg.exec()) + if (dlg.exec() == QDialog::Accepted) m_new_options = dlg.getNewOptions(); } diff --git a/src/duckstation-qt/graphicssettingswidget.cpp b/src/duckstation-qt/graphicssettingswidget.cpp index 2edce53ec..005e028e0 100644 --- a/src/duckstation-qt/graphicssettingswidget.cpp +++ b/src/duckstation-qt/graphicssettingswidget.cpp @@ -1331,7 +1331,7 @@ void GraphicsSettingsWidget::onTextureReplacementOptionsClicked() idlg.setLabelText(tr("Texture Replacement Configuration (config.yaml)")); idlg.setTextValue(QString::fromStdString(config.ExportToYAML(false))); idlg.setOkButtonText(tr("Save")); - if (idlg.exec()) + if (idlg.exec() != QDialog::Rejected) { const QString path = QFileDialog::getSaveFileName(&dlg, tr("Save Configuration"), QString(), tr("Configuration Files (config.yaml)")); diff --git a/src/duckstation-qt/inputbindingwidgets.cpp b/src/duckstation-qt/inputbindingwidgets.cpp index 155b3aec2..911a57f75 100644 --- a/src/duckstation-qt/inputbindingwidgets.cpp +++ b/src/duckstation-qt/inputbindingwidgets.cpp @@ -471,7 +471,7 @@ void InputVibrationBindingWidget::onClicked() input_dialog.setComboBoxEditable(false); input_dialog.setComboBoxItems(std::move(input_options)); input_dialog.setTextValue(current); - if (input_dialog.exec() == 0) + if (input_dialog.exec() == QDialog::Rejected) return; const QString new_value(input_dialog.textValue()); diff --git a/src/duckstation-qt/mainwindow.cpp b/src/duckstation-qt/mainwindow.cpp index ed0361cd9..d04e8b627 100644 --- a/src/duckstation-qt/mainwindow.cpp +++ b/src/duckstation-qt/mainwindow.cpp @@ -697,7 +697,7 @@ std::string MainWindow::getDeviceDiscPath(const QString& title) input_dialog.setOptions(QInputDialog::UseListViewForComboBoxItems); input_dialog.setComboBoxEditable(false); input_dialog.setComboBoxItems(std::move(input_options)); - if (input_dialog.exec() == 0) + if (input_dialog.exec() == QDialog::Rejected) return ret; const int selected_index = input_dialog.comboBoxItems().indexOf(input_dialog.textValue()); @@ -1065,7 +1065,7 @@ const GameList::Entry* MainWindow::resolveDiscSetEntry(const GameList::Entry* en const int res = dlg.exec(); lock.lock(); - return res ? GameList::GetEntryForPath(dlg.getSelectedDiscPath()) : nullptr; + return res == QDialog::Accepted ? GameList::GetEntryForPath(dlg.getSelectedDiscPath()) : nullptr; } std::shared_ptr MainWindow::getSystemBootParameters(std::string file) diff --git a/src/duckstation-qt/memorycardeditorwindow.cpp b/src/duckstation-qt/memorycardeditorwindow.cpp index fe1744132..902071e3a 100644 --- a/src/duckstation-qt/memorycardeditorwindow.cpp +++ b/src/duckstation-qt/memorycardeditorwindow.cpp @@ -721,13 +721,10 @@ MemoryCardRenameFileDialog::~MemoryCardRenameFileDialog() = default; std::string MemoryCardRenameFileDialog::promptForNewName(QWidget* parent, std::string_view old_name) { MemoryCardRenameFileDialog dlg(parent, old_name); + if (dlg.exec() == QDialog::Rejected) + return {}; - std::string ret; - if (dlg.exec() != 1) - return ret; - - ret = dlg.m_ui.fullFilename->text().toStdString(); - return ret; + return dlg.m_ui.fullFilename->text().toStdString(); } void MemoryCardRenameFileDialog::setupAdditionalUi()