# HG changeset patch
# User Juuso Lapinlampi <wubthecaptain@gmail.com>
# Date 1545020847 0
#      Mon Dec 17 04:27:27 2018 +0000
# Node ID 0c37673ed9ed58c71d90d5153337dfbe86b7462e
# Parent  37a862bf69001cc311979720ba74dcaa792473b0
Replace deprecated Q_OS_MAC definitions from Qt

Q_OS_MAC is a deprecated synonym for Q_OS_DARWIN, and is not meant to be
used at least since Qt 5.6.

This commit replaces all occurences of Q_OS_MAC with Q_OS_DARWIN. To my
awareness, no other deprecated definitions (such as Q_OS_OSX) are used
as of Qt 5.12 (the latest upstream dependency available).

Fixes: #3580
See: https://doc.qt.io/qt-5/qtglobal.html

diff -r 37a862bf6900 -r 0c37673ed9ed src/core/apprunner.cpp
--- a/src/core/apprunner.cpp	Sat Oct 27 21:30:28 2018 +0200
+++ b/src/core/apprunner.cpp	Mon Dec 17 04:27:27 2018 +0000
@@ -45,7 +45,7 @@
 	}
 }
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
 QString AppRunner::findBundleBinary(const QFileInfo &file)
 {
 	// Scan the plist file for where the real binary is in a bundle.  We have
@@ -89,7 +89,7 @@
 
 	int result;
 
-	#ifdef Q_OS_MAC
+	#ifdef Q_OS_DARWIN
 	if( cmdInfo.executable.isBundle() )
 	{
 		result = QProcess::startDetached(cmdInfo.executable.absoluteFilePath() + AppRunner::findBundleBinary(cmdInfo.executable), args, cmdInfo.applicationDir.absolutePath());
diff -r 37a862bf6900 -r 0c37673ed9ed src/core/apprunner.h
--- a/src/core/apprunner.h	Sat Oct 27 21:30:28 2018 +0200
+++ b/src/core/apprunner.h	Mon Dec 17 04:27:27 2018 +0000
@@ -67,7 +67,7 @@
 		 */
 		static void cleanArguments(QStringList& args);
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
 		static QString findBundleBinary(const QFileInfo &file);
 #endif
 
diff -r 37a862bf6900 -r 0c37673ed9ed src/core/commandline.cpp
--- a/src/core/commandline.cpp	Sat Oct 27 21:30:28 2018 +0200
+++ b/src/core/commandline.cpp	Mon Dec 17 04:27:27 2018 +0000
@@ -71,7 +71,7 @@
 
 void CommandLine::escapeExecutable(QString& arg)
 {
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
 	QFileInfo binary = arg;
 	if(binary.isBundle())
 		arg += AppRunner::findBundleBinary(binary);
diff -r 37a862bf6900 -r 0c37673ed9ed src/core/datapaths.cpp
--- a/src/core/datapaths.cpp	Sat Oct 27 21:30:28 2018 +0200
+++ b/src/core/datapaths.cpp	Mon Dec 17 04:27:27 2018 +0000
@@ -147,7 +147,7 @@
 		d->cacheDirectory = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
 		d->dataDirectory = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
 		d->configDirectory = systemAppDataDirectory("Library/Preferences/Doomseeker");
 #else
 		d->configDirectory = systemAppDataDirectory(LEGACY_APPDATA_DIR_NAME);
@@ -204,7 +204,7 @@
 		{
 			failedDirs << configDirError;
 		}
-#if !defined(Q_OS_MAC)
+#if !defined(Q_OS_DARWIN)
 		else if (appDataDir.exists(".doomseeker"))
 		{
 			// Migrate config from old versions of Doomseeker (pre 1.2)
@@ -224,7 +224,7 @@
 	// ask about existence of a subdirectory inside the data directory.
 	if (!d->dataDirectory.exists(DEMOS_DIR_NAME))
 	{
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
 		const QString legacyPrefDirectory = "Library/Preferences/Doomseeker";
 #else
 		const QString legacyPrefDirectory = ".doomseeker";
@@ -354,7 +354,7 @@
 	paths.append(workingDirectory());
 	paths.append("./");
 
-#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN32)
+#if !defined(Q_OS_DARWIN) && !defined(Q_OS_WIN32)
 	// On systems where we install to a fixed location, if we see that we are
 	// running an installed binary, then we should only load plugins from the
 	// expected location.  Otherwise use it only as a last resort.
diff -r 37a862bf6900 -r 0c37673ed9ed src/core/gui/widgets/serversstatuswidget.cpp
--- a/src/core/gui/widgets/serversstatuswidget.cpp	Sat Oct 27 21:30:28 2018 +0200
+++ b/src/core/gui/widgets/serversstatuswidget.cpp	Mon Dec 17 04:27:27 2018 +0000
@@ -72,7 +72,7 @@
 	iconDisabled = QPixmap::fromImage(iconImage);
 
 	// Have an inset frame unless we're on the Mac
-#ifndef Q_OS_MAC
+#ifndef Q_OS_DARWIN
 	setFrameShape(QFrame::Panel);
 	setFrameShadow(QFrame::Sunken);
 #else
diff -r 37a862bf6900 -r 0c37673ed9ed src/core/main.cpp
--- a/src/core/main.cpp	Sat Oct 27 21:30:28 2018 +0200
+++ b/src/core/main.cpp	Mon Dec 17 04:27:27 2018 +0000
@@ -138,7 +138,7 @@
 	applyLogVerbosity();
 
 	Application::init(argumentsCount, arguments);
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
 	// In Mac OS X it is abnormal to have menu icons unless it's a shortcut to a file of some kind.
 	gApp->setAttribute(Qt::AA_DontShowIconsInMenus);
 #endif
diff -r 37a862bf6900 -r 0c37673ed9ed src/core/updater/updatechannel.cpp
--- a/src/core/updater/updatechannel.cpp	Sat Oct 27 21:30:28 2018 +0200
+++ b/src/core/updater/updatechannel.cpp	Mon Dec 17 04:27:27 2018 +0000
@@ -26,7 +26,7 @@
 
 #if defined(Q_OS_WIN32)
 #define UPDATE_PLATFORM "win32"
-#elif defined(Q_OS_MAC)
+#elif defined(Q_OS_DARWIN)
 #define UPDATE_PLATFORM "macosx"
 #else
 #ifdef WITH_AUTOUPDATES
diff -r 37a862bf6900 -r 0c37673ed9ed src/core/updater/updateinstaller.cpp
--- a/src/core/updater/updateinstaller.cpp	Sat Oct 27 21:30:28 2018 +0200
+++ b/src/core/updater/updateinstaller.cpp	Mon Dec 17 04:27:27 2018 +0000
@@ -180,7 +180,7 @@
 	QFile updaterProgramFile(updaterProgramPath);
 	QFileInfo programFileInfo(QCoreApplication::applicationFilePath());
 	QStringList args;
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
 	// On Mac we're updating the bundle, but we get the location of the binary (<stuff>/Contents/MacOS/)
 	args << "--install-dir" << (QCoreApplication::applicationDirPath() + "/../..");
 #else
diff -r 37a862bf6900 -r 0c37673ed9ed src/core/updater/updatepackagefilter.cpp
--- a/src/core/updater/updatepackagefilter.cpp	Sat Oct 27 21:30:28 2018 +0200
+++ b/src/core/updater/updatepackagefilter.cpp	Mon Dec 17 04:27:27 2018 +0000
@@ -144,7 +144,7 @@
 		// the version of Qt5 we're launching with requires Lion or
 		// higher.  Thus only 64-bit Intel Macs need to even bother
 		// checking this package.
-#if !defined(Q_OS_MAC) || defined(__x86_64__)
+#if !defined(Q_OS_DARWIN) || defined(__x86_64__)
 		if (QString(Version::qtPackageVersion()) != pkg.revision)
 		{
 			pkg.currentlyInstalledDisplayVersion = Version::qtPackageVersion();
diff -r 37a862bf6900 -r 0c37673ed9ed src/core/version.cpp
--- a/src/core/version.cpp	Sat Oct 27 21:30:28 2018 +0200
+++ b/src/core/version.cpp	Mon Dec 17 04:27:27 2018 +0000
@@ -39,7 +39,7 @@
 		return QString("Windows");
 	#elif defined(Q_OS_LINUX)
 		return QString("Linux");
-	#elif defined(Q_OS_MAC)
+	#elif defined(Q_OS_DARWIN)
 		return QString("MAC");
 	#else
 		return QString("Unknown OS for Version::operatingSystem()");
diff -r 37a862bf6900 -r 0c37673ed9ed src/plugins/zandronum/zandronumbinaries.cpp
--- a/src/plugins/zandronum/zandronumbinaries.cpp	Sat Oct 27 21:30:28 2018 +0200
+++ b/src/plugins/zandronum/zandronumbinaries.cpp	Mon Dec 17 04:27:27 2018 +0000
@@ -55,7 +55,7 @@
 #define TESTING_BINARY_URL TESTING_BINARY_URL_BASE"linux-x86_64.tar.bz2"
 #endif
 
-#ifndef Q_OS_MAC
+#ifndef Q_OS_DARWIN
 #define ZANDRONUM_BINARY_NAME "zandronum"
 #else
 #define ZANDRONUM_BINARY_NAME "Zandronum.app"
@@ -270,7 +270,7 @@
 
 bool ZandronumClientExeFile::downloadTestingBinaries(const QDir &destination, QWidget *parent)
 {
-#ifdef Q_OS_MAC
+#ifdef Q_OS_DARWIN
 	// Can't do anything for Mac OS X at this time. :/
 	return false;
 #else
@@ -415,7 +415,7 @@
 	content  = "#!/bin/sh\n";
 	content += "cd \"" + cdDir + "\" \n";
 	content += "export LANG=C\n";
-	#ifdef Q_OS_MAC
+	#ifdef Q_OS_DARWIN
 	content += "\"" + binaryPath + ZANDRONUM_APP_BUNDLE_BIN "\" \"$@\"\n";
 	#else
 	content += "\"" + binaryPath + "\" \"$@\"\n"; // "$@" deals with all the parameters
diff -r 37a862bf6900 -r 0c37673ed9ed src/plugins/zandronum/zandronumengineplugin.cpp
--- a/src/plugins/zandronum/zandronumengineplugin.cpp	Sat Oct 27 21:30:28 2018 +0200
+++ b/src/plugins/zandronum/zandronumengineplugin.cpp	Mon Dec 17 04:27:27 2018 +0000
@@ -70,7 +70,7 @@
 		EP_AllowsMOTD,
 		EP_AllowsUpnp,
 		EP_AllowsUpnpPort,
-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
+#if defined(Q_OS_WIN32) || defined(Q_OS_DARWIN)
 		EP_ClientOnly,
 #endif
 		EP_ClientExeName, "zandronum",