| author | ar <ar> | 2005-01-21 19:56:15 (UTC) |
|---|---|---|
| committer | ar <ar> | 2005-01-21 19:56:15 (UTC) |
| commit | cd51d382be50bc021739395309e23760f1619759 (patch) (side-by-side diff) | |
| tree | e76155f772df7faea5fcf38667c6da8c916208db /library | |
| parent | fdc37fbd908472e28735a8f0b01e3e66a43535e0 (diff) | |
| download | opie-cd51d382be50bc021739395309e23760f1619759.zip opie-cd51d382be50bc021739395309e23760f1619759.tar.gz opie-cd51d382be50bc021739395309e23760f1619759.tar.bz2 | |
- make opie compilable against qte 2.3.10 snapshot
check QT_VERSION against 0x030000 instead of 300
| -rw-r--r-- | library/lightstyle.cpp | 10 | ||||
| -rw-r--r-- | library/lightstyle.h | 2 | ||||
| -rw-r--r-- | library/qpeapplication.cpp | 4 | ||||
| -rw-r--r-- | library/qpestyle.cpp | 4 | ||||
| -rw-r--r-- | library/qpestyle.h | 2 |
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 @@ -20,5 +20,5 @@ #include "lightstyle.h" -#if QT_VERSION < 300 +#if QT_VERSION < 0x030000 #define INCLUDE_MENUITEM_DEF @@ -160,5 +160,5 @@ void LightStyle::polish(QWidget *widget) widget->installEventFilter(this); -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 if (widget->inherits("QLineEdit")) { QLineEdit *lineedit = (QLineEdit *) widget; @@ -177,5 +177,5 @@ void LightStyle::unPolish(QWidget *widget) widget->removeEventFilter(this); -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 if (widget->inherits("QLineEdit")) { QLineEdit *lineedit = (QLineEdit *) widget; @@ -415,5 +415,5 @@ void LightStyle::drawComboButton(QPainter *p, int x, int y, int w, int h, int xpos = x; -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 if( QApplication::reverseLayout() ) xpos += indent; @@ -432,5 +432,5 @@ QRect LightStyle::comboButtonRect( int x, int y, int w, int h ) const r.setRight(r.right() - indent - 10); -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 if( QApplication::reverseLayout() ) r.moveBy( indent + 10, 0 ); diff --git a/library/lightstyle.h b/library/lightstyle.h index c377cc2..0392957 100644 --- a/library/lightstyle.h +++ b/library/lightstyle.h @@ -27,5 +27,5 @@ #endif // QT_H -#if QT_VERSION < 300 +#if QT_VERSION < 0x030000 #ifdef QT_PLUGIN_STYLE_LIGHT diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index af00f49..1c5ced3 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -61,5 +61,5 @@ #include "qpestyle.h" #include "styleinterface.h" -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 #include <qstylefactory.h> #else @@ -1844,5 +1844,5 @@ 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 @@ -24,5 +24,5 @@ #define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 #include <qdrawutil.h> @@ -430,5 +430,5 @@ 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()); diff --git a/library/qpestyle.h b/library/qpestyle.h index 19ef346..1bde0ff 100644 --- a/library/qpestyle.h +++ b/library/qpestyle.h @@ -26,5 +26,5 @@ #endif // QT_H -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 class Q_EXPORT QPEStyle : public QWindowsStyle |