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

List:       kde-commits
Subject:    branches/KDE/4.3/kdepim/kalarm
From:       Benjamin Reed <ranger () befunk ! com>
Date:       2009-09-29 14:51:39
Message-ID: 1254235899.642402.11668.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1029329 by reed:

backport r1017719 from trunk (fix kalarm moc generation on !X11)

 M  +2 -2      functions.cpp  
 M  +0 -4      functions_p.h  


--- branches/KDE/4.3/kdepim/kalarm/functions.cpp #1029328:1029329
@@ -1296,13 +1296,13 @@
 #endif
 }
 
-#ifdef Q_WS_X11
 /******************************************************************************
 * Called when a window is created, to minimise it.
 * This code is taken from kstart in kdebase.
 */
 void Private::windowAdded(WId w)
 {
+#ifdef Q_WS_X11
 	static const int SUPPORTED_TYPES = NET::NormalMask | NET::DesktopMask | \
                NET::DockMask
 	                                 | NET::ToolbarMask | NET::MenuMask | \
                NET::DialogMask
 	                                 | NET::OverrideMask | NET::TopMenuMask | \
NET::UtilityMask | NET::SplashMask; @@ -1333,8 +1333,8 @@
 	XMapWindow(QX11Info::display(), w);
 	XSync(QX11Info::display(), False);
 	QApplication::flush();
+#endif
 }
-#endif
 
 /******************************************************************************
 * The "Don't show again" option for error messages is personal to the user on a
--- branches/KDE/4.3/kdepim/kalarm/functions_p.h #1029328:1029329
@@ -22,9 +22,7 @@
 #define FUNCTIONS_P_H
 
 #include "kalarm.h"   //krazy:exclude=includes (kalarm.h must be first)
-#ifdef Q_WS_X11
 #include <kwindowsystem.h>
-#endif
 #include <QObject>
 
 namespace KAlarm
@@ -45,9 +43,7 @@
 	}
 
     public slots:
-#ifdef Q_WS_X11
 	void windowAdded(WId);
-#endif
 
     private:
 	static Private* mInstance;


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