From 0fcafd86e761bcb80f68bf2ae1bf01c5ea785655 Mon Sep 17 00:00:00 2001
From: Robert Adam <dev@robert-adam.de>
Date: Wed, 10 Jun 2020 18:47:03 +0200
Subject: [PATCH] REFAC(deprecated): Use QFlag default constructor

Qt 5.15 has introduced a default constructor for a QFlag that will be
equivalent of setting it equal to a zero literal (setting it to no
flag).
---
 src/ACL.cpp               | 6 ++++++
 src/mumble/MainWindow.cpp | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/ACL.cpp b/src/ACL.cpp
index 9a02ca28f..ba9ab5ec0 100644
--- a/src/ACL.cpp
+++ b/src/ACL.cpp
@@ -104,7 +104,13 @@ QFlags<ChanACL::Perm> ChanACL::effectivePermissions(ServerUser *p, Channel *chan
 		return static_cast<Permissions>(All &~ (Speak|Whisper));
 	}
 
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+	// Qt 5.15 introduced a default constructor that initializes the flags to be set to no flags
+	Permissions granted;
+#else
+	// Before Qt 5.15 we have emulate the default constructor by assigning a literal zero
 	Permissions granted = 0;
+#endif
 
 	if (cache) {
 		QHash<Channel *, Permissions> *h = cache->value(p);
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
index 41c6669e4..a9cb3d015 100644
--- a/src/mumble/MainWindow.cpp
+++ b/src/mumble/MainWindow.cpp
@@ -3198,9 +3198,14 @@ void MainWindow::serverDisconnected(QAbstractSocket::SocketError err, QString re
 			g.l->log(Log::ServerDisconnected, tr("Disconnected from server."));
 		}
 
+#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
+		// Qt 5.15 introduced a default constructor that initializes the flags to be set to no flags
+		Qt::WindowFlags wf;
+#elif defined(Q_OS_MAC)
+		Qt::WindowFlags wf = Qt::Sheet;
+#else
+		// Before Qt 5.15 we have emulate the default constructor by assigning a literal zero
 		Qt::WindowFlags wf = 0;
-#ifdef Q_OS_MAC
-		wf = Qt::Sheet;
 #endif
 
 		bool matched = true;