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

List:       kde-commits
Subject:    KDE/kdebase/workspace/klipper
From:       Carlo Segato <brandon.ml () gmail ! com>
Date:       2010-02-15 17:58:32
Message-ID: 1266256712.163017.17556.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1090648 by segato:

compile fixes for windows

 M  +4 -1      klipper.cpp  
 M  +2 -0      klipper.h  


--- trunk/KDE/kdebase/workspace/klipper/klipper.cpp #1090647:1090648
@@ -22,7 +22,9 @@
    Boston, MA 02110-1301, USA.
 */
 
+#ifdef Q_WS_X11
 #include <config-X11.h>
+#endif
 
 #include <QtDBus/QDBusConnection>
 
@@ -1190,7 +1192,6 @@
 #endif
 KlipperEmptyDetector::KlipperEmptyDetector()
 : m_xfixes_event_base( -1 )
-, m_xa_clipboard( None )
 {
 #ifdef HAVE_XFIXES
     m_xa_clipboard = XInternAtom( QX11Info::display(), "CLIPBOARD", False );
@@ -1210,6 +1211,7 @@
 #endif
 }
 
+#ifdef Q_WS_X11
 bool KlipperEmptyDetector::x11Event( XEvent* e )
 {
 #ifdef HAVE_XFIXES
@@ -1237,5 +1239,6 @@
 #endif
     return false;
 }
+#endif
 
 #include "klipper.moc"
--- trunk/KDE/kdebase/workspace/klipper/klipper.h #1090647:1090648
@@ -53,7 +53,9 @@
 signals:
     void changed( QClipboard::Mode m );
 protected:
+#ifdef Q_WS_X11
     virtual bool x11Event( XEvent* e );
+#endif
 private:
     int m_xfixes_event_base;
     unsigned int m_xa_clipboard;
[prev in list] [next in list] [prev in thread] [next in thread]