From b1c2d010c134196bed739937c5b434fe8436ca92 Mon Sep 17 00:00:00 2001
From: Craig Watson <craig@watsons.ch>
Date: Mon, 9 May 2016 14:48:54 +0200
Subject: [PATCH] Removed remaining occurences of Q_WS_*

---
 src/core/UBApplicationController.cpp | 8 +-------
 src/frameworks/UBFileSystemUtils.cpp | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp
index f1cfa729..eb3d858b 100644
--- a/src/core/UBApplicationController.cpp
+++ b/src/core/UBApplicationController.cpp
@@ -67,7 +67,7 @@
 
 
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 #include <Carbon/Carbon.h>
 #endif
 
@@ -121,12 +121,6 @@ UBApplicationController::UBApplicationController(UBBoardView *pControlView,
 
     networkAccessManager = new QNetworkAccessManager (this);
     QTimer::singleShot (1000, this, SLOT (checkAtLaunch()));
-
-
-#ifdef Q_WS_X11
-    mMainWindow->setStyleSheet("QToolButton { font-size: 11px}");
-#endif
-
 }
 
 
diff --git a/src/frameworks/UBFileSystemUtils.cpp b/src/frameworks/UBFileSystemUtils.cpp
index ec625841..1be67088 100644
--- a/src/frameworks/UBFileSystemUtils.cpp
+++ b/src/frameworks/UBFileSystemUtils.cpp
@@ -57,7 +57,7 @@ UBFileSystemUtils::~UBFileSystemUtils()
 
 QString UBFileSystemUtils::removeLocalFilePrefix(QString input)
 {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     if(input.startsWith("file:///"))
         return input.mid(8);
     else