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.

5 files changed, 34 insertions, 26 deletions

diff --git a/quacker/boardsetupdialog.cpp b/quacker/boardsetupdialog.cpp
index 23b88bd..79ae8cf 100644
--- a/quacker/boardsetupdialog.cpp
+++ b/quacker/boardsetupdialog.cpp
@@ -258,8 +258,8 @@ void BoardSetupDialog::deleteBoard()
 	message += m_originalName;
 	message += "\"?";
 	if (QMessageBox::warning(NULL, QString("Confirm Deletion"), message,
-			QMessageBox::Yes | QMessageBox::Default,
-			QMessageBox::No | QMessageBox::Escape) == QMessageBox::Yes)
+			QMessageBox::Yes | QMessageBox::No,
+			QMessageBox::No) == QMessageBox::Yes)
 	{
 		CustomQSettings settings;
 		settings.beginGroup("quackle/boardparameters");
diff --git a/quacker/letterbox.cpp b/quacker/letterbox.cpp
index 91c2ad9..2df5e55 100644
--- a/quacker/letterbox.cpp
+++ b/quacker/letterbox.cpp
@@ -65,16 +65,17 @@ bool Letterbox::tryToClose()
 	{
 		switch (askToSave())
 		{
-		case 0:
+		case QMessageBox::Save:
 			qApp->processEvents();
 			writeFile();
 
 			// fall through
 
-		case 1:
+		case QMessageBox::Discard:
 			return true;
 
-		case 2:
+		case QMessageBox::Cancel:
+		default:
 			return false;
 		}
 	}
@@ -115,13 +116,14 @@ void Letterbox::open()
 	{
 		switch (askToSave())
 		{
-		case 0:
+		case QMessageBox::Save:
 			writeFile();
 
-		case 1:
+		case QMessageBox::Discard:
 			break;
 
-		case 2:
+		case QMessageBox::Cancel:
+		default:
 			return;
 		}
 	}
@@ -145,13 +147,14 @@ void Letterbox::openParticularFile(const QString &filename)
 		{
 			switch (askToSave())
 			{
-				case 0:
+				case QMessageBox::Save:
 					writeFile();
 
-				case 1:
+				case QMessageBox::Discard:
 					break;
 
-				case 2:
+				case QMessageBox::Cancel:
+				default:
 					return;
 			}
 		}
@@ -186,9 +189,9 @@ bool Letterbox::dictCheck()
 	return true;
 }
 
-int Letterbox::askToSave()
+QMessageBox::StandardButton Letterbox::askToSave()
 {
-	return QMessageBox::warning(this, tr("Unsaved Results - Quackle Letterbox"), tr("There are unsaved results in the current Letterbox list. Save them?"), tr("&Save"), tr("&Discard"), tr("&Cancel"), 0, 2);
+	return QMessageBox::warning(this, tr("Unsaved Results - Quackle Letterbox"), tr("There are unsaved results in the current Letterbox list. Save them?"), QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Save);
 }
 
 void Letterbox::generateList()
diff --git a/quacker/letterbox.h b/quacker/letterbox.h
index 703b1be..66de0a5 100644
--- a/quacker/letterbox.h
+++ b/quacker/letterbox.h
@@ -21,6 +21,7 @@
 
 #include <QElapsedTimer>
 #include <QMainWindow>
+#include <QMessageBox>
 #include <QValidator>
 #include <QTextEdit>
 #include <QTime>
@@ -189,7 +190,7 @@ protected:
 	static Letterbox *m_self;
 
 	// returns 0 for save, 1 for discard, 2 for cancel
-	int askToSave();
+	QMessageBox::StandardButton askToSave();
 
 	// used to know when to update UI when querying anagrammer
 	bool m_initializationChuu;
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()
diff --git a/quacker/quacker.h b/quacker/quacker.h
index 3bfeb38..83813c7 100644
--- a/quacker/quacker.h
+++ b/quacker/quacker.h
@@ -23,6 +23,7 @@
 
 #include <QMainWindow>
 #include <QMap>
+#include <QMessageBox>
 
 #include <datamanager.h>
 #include "oppothread.h"
@@ -252,7 +253,7 @@ private:
 	void loadSettings();
 
 	// returns 0 for save, 1 for discard, 2 for cancel
-	int askToSave();
+	QMessageBox::StandardButton askToSave();
 
 	// returns true if user wants to make play anyway
 	bool askToCarryOn(const QString &text);