[Kst] extragear/graphics/kst/kst/extdate

Marc-Antoine Miville-Deschenes mamd at cita.utoronto.ca
Mon Dec 12 21:52:37 CET 2005


SVN commit 487996 by mamd:

make it compile with KDE 3.1 libraries


 M  +4 -0      extdatepicker.h  
 M  +4 -0      extdatetbl.cpp  
 M  +4 -0      extdatetime.h  


--- trunk/extragear/graphics/kst/kst/extdate/extdatepicker.h #487995:487996
@@ -25,6 +25,10 @@
 
 #include "extdatetime.h"
 
+#ifndef KDE_DEPRECATED
+#define KDE_DEPRECATED
+#endif
+
 class QLineEdit;
 class QToolButton;
 class ExtDateValidator;
--- trunk/extragear/graphics/kst/kst/extdate/extdatetbl.cpp #487995:487996
@@ -923,7 +923,11 @@
 KPopupFrame::popup(const QPoint &pos)
 {
   // Make sure the whole popup is visible.
+#if KDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
   QRect d = KGlobalSettings::desktopGeometry(pos);
+#else
+  QRect d = QApplication::desktop()->geometry();
+#endif
 
   int x = pos.x();
   int y = pos.y();
--- trunk/extragear/graphics/kst/kst/extdate/extdatetime.h #487995:487996
@@ -20,8 +20,12 @@
 #include "qstring.h"
 #include "qnamespace.h"
 #include "qdatetime.h"
+#include <kdeversion.h>
+#if KDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
 #include <kdemacros.h>
+#endif
 
+
 #define INVALID_DAY LONG_MIN
 
 class ExtDateTime;


More information about the Kst mailing list