Use Qt syntax for ifdef/if defined and include QtGlobal

bagong · Feb 16, 2016 · 0418264 · 0418264
1 parent 0bf8729
commit 0418264
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/QtCollider/style/ProxyStyle.cpp b/QtCollider/style/ProxyStyle.cpp
@@ -2,6 +2,7 @@
 
 #include "../QcApplication.h"
 
+#include <QtGlobal>
 #include <QWebView>
 #include <QStyleOptionSlider>
 #include <QPainter>
@@ -13,15 +14,14 @@
 using namespace QtCollider;
 
 static bool AlwaysShowScrollbars() {
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MAC)
   return QtCollider::Mac::AlwaysShowScrollbars();
 
-#elif Q_OS_X11
+#elif defined(Q_OS_X11)
   return !QcApplication::SystemHasMouseWheel();
 
-// Creates a build error in VStudio 2013 C1017
-// #elif Q_OS_WIN
-//  return !QcApplication::SystemHasMouseWheel();
+#elif defined(Q_OS_WIN)
+  return !QcApplication::SystemHasMouseWheel();
 
 #else
   return !QcApplication::SystemHasMouseWheel();