summaryrefslogtreecommitdiff
path: root/quacker/quacker.cpp
diff options
context:
space:
mode:
authorJohn Fultz <jfultz@wolfram.com>2023-07-19 22:30:09 -0500
committerJohn Fultz <jfultz@wolfram.com>2023-07-19 22:38:25 -0500
commit320c83c069f5fb2adb7fa9deeef1e16fe55232ae (patch)
tree963d585a2825897e40ce6d4a17ab6e1cc479f0cb /quacker/quacker.cpp
parenteb8deb67284b5950a4748a091f52d1eb11284c39 (diff)
Fix QMessageBox deprecations.
Qt6 complains about the versions of the static function signatures we’re using for generating various QMessageBoxes. Except for the “Show plaintext board” dialog, which seems to be having some “special” issues in Qt6.
Diffstat (limited to 'quacker/quacker.cpp')
-rw-r--r--quacker/quacker.cpp25
1 files changed, 14 insertions, 11 deletions
diff --git a/quacker/quacker.cpp b/quacker/quacker.cpp
index ba3ad6a..17b982e 100644
--- a/quacker/quacker.cpp
+++ b/quacker/quacker.cpp
@@ -121,17 +121,18 @@ void TopLevel::closeEvent(QCloseEvent *closeEvent)
{
switch (askToSave())
{
- case 0:
+ case QMessageBox::Save:
qApp->processEvents();
save();
// fall through
- case 1:
+ case QMessageBox::Discard:
closeEvent->accept();
break;
- case 2:
+ case QMessageBox::Cancel:
+ default:
closeEvent->ignore();
}
}
@@ -698,13 +699,14 @@ void TopLevel::open()
{
switch (askToSave())
{
- case 0:
+ case QMessageBox::Save:
save();
- case 1:
+ case QMessageBox::Discard:
break;
- case 2:
+ case QMessageBox::Cancel:
+ default:
return;
}
}
@@ -759,13 +761,14 @@ void TopLevel::newGame()
{
switch (askToSave())
{
- case 0:
+ case QMessageBox::Save:
save();
- case 1:
+ case QMessageBox::Discard:
break;
- case 2:
+ case QMessageBox::Cancel:
+ default:
return;
}
}
@@ -858,9 +861,9 @@ void TopLevel::plugIntoHistoryMatrix(HistoryView *view)
connect(this, SIGNAL(historyChanged(const Quackle::History &)), view, SLOT(historyChanged(const Quackle::History &)));
}
-int TopLevel::askToSave()
+QMessageBox::StandardButton TopLevel::askToSave()
{
- return QMessageBox::warning(this, tr("Unsaved Moves - Quackle"), dialogText(tr("There are unsaved moves in the current game. Save them?")), tr("&Save"), tr("&Discard"), tr("&Cancel"), 0, 2);
+ return QMessageBox::warning(this, tr("Unsaved Moves - Quackle"), dialogText(tr("There are unsaved moves in the current game. Save them?")), QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Save);
}
void TopLevel::generateList()