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

List:       kde-commits
Subject:    [kde4support] src/kdeui: compile on OS X
From:       Harald Fernengel <harry () kdevelop ! org>
Date:       2014-02-12 15:02:26
Message-ID: E1WDbKU-0005nY-TZ () scm ! kde ! org
[Download RAW message or body]

Git commit 38b85f15ef83083f35586888400bff35a0691727 by Harald Fernengel.
Committed on 12/02/2014 at 13:11.
Pushed by harald into branch 'master'.

compile on OS X

REVIEW: 115699

M  +1    -1    src/kdeui/kapplication.cpp
M  +4    -6    src/kdeui/kmenubar.cpp

http://commits.kde.org/kde4support/38b85f15ef83083f35586888400bff35a0691727

diff --git a/src/kdeui/kapplication.cpp b/src/kdeui/kapplication.cpp
index 47e4983..f7a7c8e 100644
--- a/src/kdeui/kapplication.cpp
+++ b/src/kdeui/kapplication.cpp
@@ -58,8 +58,8 @@
 
 #if HAVE_X11
 #include <qx11info_x11.h>
-#include <kstartupinfo.h>
 #endif
+#include <kstartupinfo.h>
 
 #include <sys/types.h>
 #if HAVE_SYS_STAT_H
diff --git a/src/kdeui/kmenubar.cpp b/src/kdeui/kmenubar.cpp
index f2dc2b1..545ac14 100644
--- a/src/kdeui/kmenubar.cpp
+++ b/src/kdeui/kmenubar.cpp
@@ -37,11 +37,11 @@
 #include <kglobalsettings.h>
 #include <qapplication.h>
 #include <kdebug.h>
-#include <kmanagerselection.h>
 #include <kconfiggroup.h>
 #include <kwindowsystem.h>
 
 #if HAVE_X11
+#include <kmanagerselection.h>
 #include <qx11info_x11.h>
 
 #include <X11/Xlib.h>
@@ -99,7 +99,9 @@ public:
 #endif
     QTimer selection_timer;
     QSize min_size;
+#if HAVE_X11
     static Atom makeSelectionAtom();
+#endif
 };
 
 #if HAVE_X11
@@ -118,11 +120,9 @@ void initAtoms()
     selection_atom = atoms[ 0 ];
     msg_type_atom = atoms[ 1 ];
 }
-#endif
 
 Atom KMenuBar::KMenuBarPrivate::makeSelectionAtom()
 {
-#if HAVE_X11
     if (!QX11Info::isPlatformX11()) {
         return 0;
     }
@@ -130,10 +130,8 @@ Atom KMenuBar::KMenuBarPrivate::makeSelectionAtom()
         initAtoms();
     }
     return selection_atom;
-#else
-    return 0;
-#endif
 }
+#endif
 
 KMenuBar::KMenuBar(QWidget *parent)
     : QMenuBar(parent), d(new KMenuBarPrivate)
[prev in list] [next in list] [prev in thread] [next in thread]