- make opie compilable against qte 2.3.10 snapshot

  check QT_VERSION against 0x030000 instead of 300

5 files changed, 11 insertions, 11 deletions

diff --git a/library/lightstyle.cpp b/library/lightstyle.cpp
index f18bdca..3bd1623 100644
--- a/library/lightstyle.cpp
+++ b/library/lightstyle.cpp
@@ -19,7 +19,7 @@
 **********************************************************************/
 #include "lightstyle.h"
 
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
 
 #define INCLUDE_MENUITEM_DEF
 #include "qmenubar.h"
@@ -159,7 +159,7 @@ void LightStyle::polish(QWidget *widget)
     if (widget->inherits("QPushButton"))
         widget->installEventFilter(this);
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
     if (widget->inherits("QLineEdit")) {
         QLineEdit *lineedit = (QLineEdit *) widget;
         lineedit->setFrameShape(QFrame::StyledPanel);
@@ -176,7 +176,7 @@ void LightStyle::unPolish(QWidget *widget)
     if (widget->inherits("QPushButton"))
         widget->removeEventFilter(this);
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
     if (widget->inherits("QLineEdit")) {
         QLineEdit *lineedit = (QLineEdit *) widget;
         lineedit->setLineWidth(1);
@@ -414,7 +414,7 @@ void LightStyle::drawComboButton(QPainter *p, int x, int y, int w, int h,
     int indent = ((y + h) / 2) - 3;
     int xpos = x;
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
     if( QApplication::reverseLayout() )
         xpos += indent;
     else
@@ -431,7 +431,7 @@ QRect LightStyle::comboButtonRect( int x, int y, int w, int h ) const
     int indent = ((y + h) / 2) - 3;
     r.setRight(r.right() - indent - 10);
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
     if( QApplication::reverseLayout() )
         r.moveBy( indent + 10, 0 );
 #endif
diff --git a/library/lightstyle.h b/library/lightstyle.h
index c377cc2..0392957 100644
--- a/library/lightstyle.h
+++ b/library/lightstyle.h
@@ -26,7 +26,7 @@
 #include <qwindowsstyle.h>
 #endif // QT_H
 
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
 
 #ifdef QT_PLUGIN_STYLE_LIGHT
 #  define Q_EXPORT_STYLE_LIGHT
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index af00f49..1c5ced3 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -60,7 +60,7 @@
 #include "qpeapplication.h"
 #include "qpestyle.h"
 #include "styleinterface.h"
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 #include <qstylefactory.h>
 #else
 #include <qplatinumstyle.h>
@@ -1843,7 +1843,7 @@ bool QPEApplication::keepRunning() const
 */
 void QPEApplication::internalSetStyle( const QString &style )
 {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
     if ( style == "QPE" ) {
         setStyle( new QPEStyle );
     }
diff --git a/library/qpestyle.cpp b/library/qpestyle.cpp
index b61ada4..0566f6b 100644
--- a/library/qpestyle.cpp
+++ b/library/qpestyle.cpp
@@ -23,7 +23,7 @@
 
 #define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2)
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 
 #include <qdrawutil.h>
 #include <qcombobox.h>
@@ -429,7 +429,7 @@ QSize QPEStyle::sizeFromContents( ContentsType contents, const QWidget *widget,
 
 QPEStyle::QPEStyle()
 {
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
     setButtonMargin(buttonMargin());
     setScrollBarExtent(scrollBarExtent().width(),scrollBarExtent().height());
 #endif
diff --git a/library/qpestyle.h b/library/qpestyle.h
index 19ef346..1bde0ff 100644
--- a/library/qpestyle.h
+++ b/library/qpestyle.h
@@ -25,7 +25,7 @@
 #include "qwindowsstyle.h"
 #endif // QT_H
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 
 class Q_EXPORT QPEStyle : public QWindowsStyle
 {