[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] libs/kworkspace: Use #if Q_WS_X11 instead of #if
From:       Kurt Hindenburg <kurt.hindenburg () gmail ! com>
Date:       2011-12-31 16:32:31
Message-ID: 20111231163231.21F05A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 213a67021431e3c52c38257bf07515361620d0cd by Kurt Hindenburg.
Committed on 31/12/2011 at 17:29.
Pushed by hindenburg into branch 'master'.

Use #if Q_WS_X11 instead of #if not Q_WS_WIN/WIN32

This allows to be built on Mac OSX/Lion

M  +2    -2    libs/kworkspace/kwindowlistmenu.cpp
M  +1    -1    libs/kworkspace/kworkspace_p.h

http://commits.kde.org/kde-workspace/213a67021431e3c52c38257bf07515361620d0cd

diff --git a/libs/kworkspace/kwindowlistmenu.cpp b/libs/kworkspace/kwindowlistmenu.cpp
index 4f94c41..0ea159c 100644
--- a/libs/kworkspace/kwindowlistmenu.cpp
+++ b/libs/kworkspace/kwindowlistmenu.cpp
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <QtDBus/QtDBus>
 #include <klocale.h>
 #include <kstringhandler.h>
-#ifndef WIN32
+#ifdef Q_WS_X11
 #include <fixx11h.h>
 #endif
 #include <kstyle.h>
@@ -74,7 +74,7 @@ KWindowListMenu::~KWindowListMenu()
 
 static bool standaloneDialog( const KWindowInfo* info, const QList<KWindowInfo*>& list )
 {
-#ifndef Q_WS_WIN
+#ifdef Q_WS_X11
   WId group = info->groupLeader();
 
   if ( group == 0 )
diff --git a/libs/kworkspace/kworkspace_p.h b/libs/kworkspace/kworkspace_p.h
index 1f0dd3d..2302288 100644
--- a/libs/kworkspace/kworkspace_p.h
+++ b/libs/kworkspace/kworkspace_p.h
@@ -40,7 +40,7 @@ class KRequestShutdownHelper
     private slots:
         void processData();
     private:
-#ifndef Q_WS_WIN
+#ifdef Q_WS_X11
         SmcConn connection() const { return conn; }
         SmcConn conn;
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]