Description: new defines for Qt5
 replace Q_WS_* by new Q_OS_*
Author: Laurence Abbott <laurence.abbott@york.ac.uk> 
Tested-By: Christian T. Steigies <cts@debian.org>
Last-Update: 2019-08-29
Index: gle-graphics/src/gui/qgle_statics.cpp
===================================================================
--- gle-graphics.orig/src/gui/qgle_statics.cpp
+++ gle-graphics/src/gui/qgle_statics.cpp
@@ -25,7 +25,7 @@
 #include "drawingobject.h"
 
 #include <math.h>
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
 	#include <windows.h>
 #endif
 
@@ -379,7 +379,7 @@ int QGLE::computeAutoScaleDPIFromPts(con
 QString QGLE::GetExeName()
 {
 	QString result = QString::null;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
 	char name[1024];
 	DWORD res = GetModuleFileNameA(NULL, name, 1023);
 	if (res > 0)
@@ -387,7 +387,7 @@ QString QGLE::GetExeName()
 		name[res] = 0;
 		result = name;
 	}
-#elif defined Q_WS_X11
+#elif defined Q_OS_LINUX
 	return(QFileInfo("/proc/self/exe").readLink());
 #else
 	return(QApplication::applicationFilePath());
@@ -417,10 +417,10 @@ QString QGLE::GetDirName(QString fname)
 
 QRegExp QGLE::fileRegExp()
 {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
 	QRegExp rx("(file:///)?(.*\\.(?:gle|eps))", Qt::CaseInsensitive);
 #else
-//#elif defined(Q_WS_X11)
+//#elif defined(Q_OS_LINUX)
 	QRegExp rx("(file://)?(.*\\.(?:gle|eps))", Qt::CaseInsensitive);
 #endif
 	return(rx);
@@ -428,11 +428,11 @@ QRegExp QGLE::fileRegExp()
 
 QString QGLE::gsLibFileName()
 {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
 	return(QObject::tr("gsdll32.dll"));
-#elif defined(Q_WS_X11)
+#elif defined(Q_OS_LINUX)
 	return(QObject::tr("libgs.so"));
-#elif defined(Q_WS_MAC)
+#elif defined(Q_OS_MACOS)
 	return(QObject::tr("libgs.dylib"));
 #else
 #error "What operating system are you using?"
@@ -441,11 +441,11 @@ QString QGLE::gsLibFileName()
 
 QString QGLE::libraryFilter()
 {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
 	return(QObject::tr("DLLs (*.dll)"));
-#elif defined(Q_WS_X11)
+#elif defined(Q_OS_LINUX)
 	return(QObject::tr("Shared objects (*.so*)"));
-#elif defined(Q_WS_MAC)
+#elif defined(Q_OS_MACOS)
 	return(QObject::tr("Dynamic libraries (*.dylib);; Ghostscript framework (*)"));
 #else
 #error What operating system are you using?
@@ -454,20 +454,20 @@ QString QGLE::libraryFilter()
 
 QString QGLE::gleExecutableName()
 {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
 	return(QString("gle.exe"));
 #else
-//#elif defined(Q_WS_X11)
+//#elif defined(Q_OS_LINUX)
 	return(QString("gle"));
 #endif
 }
 
 QString QGLE::executableFilter()
 {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
 	return(QObject::tr("Executables (*.exe)"));
 #else
-//#elif defined(Q_WS_X11)
+//#elif defined(Q_OS_LINUX)
 	return(QObject::tr("All files (*)"));
 #endif
 }
Index: gle-graphics/src/gui/qgslibloader.cpp
===================================================================
--- gle-graphics.orig/src/gui/qgslibloader.cpp
+++ gle-graphics/src/gui/qgslibloader.cpp
@@ -26,7 +26,7 @@
 #include "qgs.h"
 #include "qgle_statics.h"
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
 	#include <windows.h>
 #endif
 
@@ -102,7 +102,7 @@ void GSLibFunctions::StripWhiteSpace(QSt
 	}
 }
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
 
 void GSLibFunctions::tryLocation(const char* str) {
 }
@@ -232,7 +232,7 @@ void GSLibFunctions::freeLibrary() {
 
 #endif
 
-#if defined(Q_WS_X11) || defined(Q_WS_MAC)
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
 
 #include <dlfcn.h>
 
@@ -268,7 +268,7 @@ int GSLibFunctions::loadLibrary(const QS
 	gsapi_revision_t rv;
 	/* Try to load the library */
 	if (location == "") {
-		#ifdef Q_WS_X11
+		#ifdef Q_OS_LINUX
 		#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__) || defined (__sparc64__)
 		// try 64 bit libraries on 64 bit system
 		tryLocationLoop("/usr/lib64");
@@ -276,8 +276,8 @@ int GSLibFunctions::loadLibrary(const QS
 		#endif // 64 bit
 		tryLocationLoop("/usr/lib");
 		tryLocationLoop("/usr/local/lib");
-		#endif // Q_WS_X11
-		#ifdef Q_WS_MAC
+		#endif // Q_OS_LINUX
+		#ifdef Q_OS_MACOS
 		tryLocation("/usr/lib/libgs.dylib");
 		tryLocation("/usr/local/lib/libgs.dylib");
 		#endif
