- make opie compilable against qte 2.3.10 snapshot

  check QT_VERSION against 0x030000 instead of 300

26 files changed, 45 insertions, 45 deletions

diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp
index 5171bf1..bee58e7 100644
--- a/core/apps/embeddedkonsole/TEWidget.cpp
+++ b/core/apps/embeddedkonsole/TEWidget.cpp
@@ -253,7 +253,7 @@ void TEWidget::fontChange(const QFont &)
   //printf("charset: %s\n",QFont::encodingName(font().charSet()).ascii());
   //printf("rawname: %s\n",font().rawName().ascii());
   fontMap =
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
   strcmp(QFont::encodingName(font().charSet()).ascii(),"iso10646")
           ? vt100extended
           :
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index cabeb20..c7273c5 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -45,7 +45,7 @@
 using namespace Opie::Core;
 using namespace Opie::Ui;
 
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
 class QpeEditor : public QMultiLineEdit
 {
 
diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp
index 73c2cbe..ac24894 100644
--- a/core/opie-login/loginwindowimpl.cpp
+++ b/core/opie-login/loginwindowimpl.cpp
@@ -33,7 +33,7 @@
 #include <qlabel.h>
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
 #include <qgfx_qws.h>
 #endif
 #include <qwindowsystem_qws.h>
@@ -136,7 +136,7 @@ void LoginWindowImpl::calcMaxWindowRect ( )
         else
                 wr.setCoords( 0, 0, displayWidth-1, m_taskbar->y()-1 );
 
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
         wr = qt_screen-> mapToDevice ( wr, QSize ( qt_screen-> width ( ), qt_screen-> height ( )));
 #endif
 
diff --git a/freetype/fontfactoryttf_qws.h b/freetype/fontfactoryttf_qws.h
index 208ab61..ff0fcfc 100644
--- a/freetype/fontfactoryttf_qws.h
+++ b/freetype/fontfactoryttf_qws.h
@@ -23,7 +23,7 @@
 #define FONTFACTORY_FT_H
 
 #include <qfontmanager_qws.h>
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 # include <private/qfontdata_p.h>
 #else
 # include "qfontdata_p.h"
diff --git a/libopie2/opieui/oseparator.cpp b/libopie2/opieui/oseparator.cpp
index bbc4381..177368b 100644
--- a/libopie2/opieui/oseparator.cpp
+++ b/libopie2/opieui/oseparator.cpp
@@ -108,7 +108,7 @@ void OSeparator::drawFrame(QPainter *p)
       p2 = QPoint( p1.x(), r.height() );
    }
 
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
    style().drawSeparator( p, p1.x(), p1.y(), p2.x(), p2.y(), g, true, 1, midLineWidth() );
 #else
    QStyleOption opt( lineWidth(), midLineWidth() );
diff --git a/libopie2/qt3/opieui/oeditlistbox.h b/libopie2/qt3/opieui/oeditlistbox.h
index 63fab11..c9c207d 100644
--- a/libopie2/qt3/opieui/oeditlistbox.h
+++ b/libopie2/qt3/opieui/oeditlistbox.h
@@ -27,7 +27,7 @@ class OLineEdit;
 class OComboBox;
 class QPushButton;
 
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
     enum StringComparisonMode {
         CaseSensitive   = 0x00001, // 0 0001
         BeginsWith      = 0x00002, // 0 0010
diff --git a/libopie2/qt3/opieui/ojanuswidget.cpp b/libopie2/qt3/opieui/ojanuswidget.cpp
index 063e393..8bdbc03 100644
--- a/libopie2/qt3/opieui/ojanuswidget.cpp
+++ b/libopie2/qt3/opieui/ojanuswidget.cpp
@@ -772,7 +772,7 @@ QSize OJanusWidget::minimumSizeHint() const
 
     if( mFace == TreeList )
     {
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
       s1.rwidth() += style().splitterWidth();
 #else
       s1.rwidth() += style().pixelMetric( QStyle::PM_SplitterWidth );
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
 {
diff --git a/noncore/apps/opie-console/TEWidget.cpp b/noncore/apps/opie-console/TEWidget.cpp
index 98c1793..1199e4f 100644
--- a/noncore/apps/opie-console/TEWidget.cpp
+++ b/noncore/apps/opie-console/TEWidget.cpp
@@ -264,7 +264,7 @@ void TEWidget::fontChange(const QFont &)
 //printf("charset: %s\n",QFont::encodingName(font().charSet()).ascii());
 //printf("rawname: %s\n",font().rawName().ascii());
   fontMap =
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
   strcmp(QFont::encodingName(font().charSet()).ascii(),"iso10646")
           ? vt100extended
           :
diff --git a/noncore/apps/tinykate/libkate/qt3back/qregexp3.cpp b/noncore/apps/tinykate/libkate/qt3back/qregexp3.cpp
index 78635b2..7b30b1a 100644
--- a/noncore/apps/tinykate/libkate/qt3back/qregexp3.cpp
+++ b/noncore/apps/tinykate/libkate/qt3back/qregexp3.cpp
@@ -34,11 +34,11 @@
 ** not clear to you.
 **
 **********************************************************************/
-#if QT_VERSION >=300
+#if QT_VERSION >= 0x030000
 #error QRegExp3 is now in QT 3 use QRegExp instead
 #endif
 
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
 #include "./qregexp3.h"
 #else
 #include "qregexp.h"
diff --git a/noncore/apps/tinykate/libkate/qt3back/qregexp3.h b/noncore/apps/tinykate/libkate/qt3back/qregexp3.h
index 5b75131..fd6bc78 100644
--- a/noncore/apps/tinykate/libkate/qt3back/qregexp3.h
+++ b/noncore/apps/tinykate/libkate/qt3back/qregexp3.h
@@ -42,7 +42,7 @@
 #endif // QT_H
 
 
-#if QT_VERSION >=300
+#if QT_VERSION >= 0x030000
 #include <qregexp.h>
 #else
 class QRegExpEngine;
@@ -107,5 +107,5 @@ private:
     QRegExpEngine *eng;
     QRegExpPrivate *priv;
 };
-#endif // QT_VERSION >= 300
+#endif // QT_VERSION >= 0x030000
 #endif // QREGEXP_H
diff --git a/noncore/apps/zsafe/shadedlistitem.cpp b/noncore/apps/zsafe/shadedlistitem.cpp
index 72c6261..7f340f9 100644
--- a/noncore/apps/zsafe/shadedlistitem.cpp
+++ b/noncore/apps/zsafe/shadedlistitem.cpp
@@ -52,7 +52,7 @@ ShadedListItem::~ShadedListItem()
 void ShadedListItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment)
 {
     QColorGroup colors(cg);
-#if QT_VERSION >=300
+#if QT_VERSION >= 0x030000
     const QColorGroup::ColorRole crole = QColorGroup::Base;
     // const QWidget::BackgroundMode bgmode = lv->viewport()->backgroundMode();
     // const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode(bgmode);
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index 1670f93..9ec5af9 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -372,7 +372,7 @@ void WellenreiterConfigWindow::load()
     QString interface = c->readEntry( "name", "<none>" );
     if ( interface != "<none>" )
     {
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
         interfaceName->insertItem( interface, 0 );
         interfaceName->setCurrentItem( 0 );
 #else
@@ -380,7 +380,7 @@ void WellenreiterConfigWindow::load()
 #endif
 
         QString device = c->readEntry( "type", "<select>" );
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
         for ( int i = 0; i < deviceType->count(); ++i )
         {
             if ( deviceType->text( i ) == device )
@@ -427,7 +427,7 @@ void WellenreiterConfigWindow::load()
 
     c->setGroup( "GPS" );
     enableGPS->setChecked( c->readBoolEntry( "use", false ) );
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
     gpsdHost->insertItem( c->readEntry( "host", "localhost" ), 0 );
     gpsdHost->setCurrentItem( 0 );
 #else
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 9638686..088171c 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -63,7 +63,7 @@
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 #include <qstylefactory.h>
 #endif
 #include <qtoolbutton.h>
@@ -130,7 +130,7 @@ QWidget *Appearance::createStyleTab ( QWidget *parent, Config &cfg )
     QString s = cfg. readEntry ( "Style", "Light" );
 
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
     m_style_list->insertStringList(QStyleFactory::styles());
 #else
     m_style_list-> insertItem ( new StyleListItem ( "Windows", new QWindowsStyle ( )));
diff --git a/noncore/settings/doctab/doctab.cpp b/noncore/settings/doctab/doctab.cpp
index feaf538..72eda6b 100644
--- a/noncore/settings/doctab/doctab.cpp
+++ b/noncore/settings/doctab/doctab.cpp
@@ -43,7 +43,7 @@
 #include <qspinbox.h>
 #include <qlistbox.h>
 #include <qdir.h>
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 #include <qstylefactory.h>
 #endif
 
diff --git a/noncore/settings/language/language.cpp b/noncore/settings/language/language.cpp
index 14750ac..bf90576 100644
--- a/noncore/settings/language/language.cpp
+++ b/noncore/settings/language/language.cpp
@@ -43,7 +43,7 @@
 #include <qspinbox.h>
 #include <qlistbox.h>
 #include <qdir.h>
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 #include <qstylefactory.h>
 #endif
 
diff --git a/noncore/settings/networksettings/interfaces/module.h b/noncore/settings/networksettings/interfaces/module.h
index 9dc913e..13189c3 100644
--- a/noncore/settings/networksettings/interfaces/module.h
+++ b/noncore/settings/networksettings/interfaces/module.h
@@ -2,7 +2,7 @@
 #define NETCONF_MODULE_H
 
 #include <qobject.h>
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
 #include <qlist.h>
 #else
 #include <qptrlist.h>
diff --git a/noncore/settings/networksettings/mainwindow/addconnectionimp.cpp b/noncore/settings/networksettings/mainwindow/addconnectionimp.cpp
index 84f1cf6..9049af4 100644
--- a/noncore/settings/networksettings/mainwindow/addconnectionimp.cpp
+++ b/noncore/settings/networksettings/mainwindow/addconnectionimp.cpp
@@ -1,6 +1,6 @@
 #include "addconnectionimp.h"
 #include <qlistview.h>
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
 #include <qlist.h>
 #else
 #include <qptrlist.h>
diff --git a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
index 5f23aea..8feb7a5 100644
--- a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
@@ -25,7 +25,7 @@
 #include <qmessagebox.h>
 
 
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
 #include <qlist.h>
 #else
 #include <qptrlist.h>
diff --git a/noncore/unsupported/qpdf/QOutputDev.cpp b/noncore/unsupported/qpdf/QOutputDev.cpp
index 022d938..487177c 100644
--- a/noncore/unsupported/qpdf/QOutputDev.cpp
+++ b/noncore/unsupported/qpdf/QOutputDev.cpp
@@ -594,7 +594,7 @@ int QOutputDev::convertSubpath ( GfxState *state, GfxSubpath *subpath, QPointArr
                         tmp. setPoints ( 4, lrint ( x0 ), lrint ( y0 ), lrint ( x1 ), lrint ( y1 ),
                                             lrint ( x2 ), lrint ( y2 ), lrint ( x3 ), lrint ( y3 ));
 
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
                         tmp = tmp. quadBezier ( );
 
                         for ( uint loop = 0; loop < tmp. count ( ); loop++ ) {
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 52419ad..0459caf 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -17,7 +17,7 @@
 #include <qheader.h>
 #include <qfiledialog.h>
 #include <qregexp.h>
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 #include <qsettings.h>
 #endif
 
@@ -30,7 +30,7 @@
 #include "images.c"
 
 static QApplication *configApp;
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 static QSettings *configSettings;
 #endif
 
@@ -102,7 +102,7 @@ void ConfigList::updateMenuList(P* parent, struct menu* menu)
         }
 }
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 /*
  * set the new data
  * TODO check the value
@@ -215,7 +215,7 @@ void ConfigItem::updateMenu(void)
                 const char* data;
 
                 data = sym_get_string_value(sym);
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                 int i = list->mapIdx(dataColIdx);
                 if (i >= 0)
                         setRenameEnabled(i, TRUE);
@@ -490,7 +490,7 @@ void ConfigList::changeValue(ConfigItem* item)
         case S_INT:
         case S_HEX:
         case S_STRING:
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                 if (colMap[dataColIdx] >= 0)
                         item->startRename(colMap[dataColIdx]);
                 else
@@ -751,7 +751,7 @@ ConfigMainWindow::ConfigMainWindow(void)
 
         QWidget *d = configApp->desktop();
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
         width = configSettings->readNumEntry("/kconfig/qconf/window width", d->width() - 64);
         height = configSettings->readNumEntry("/kconfig/qconf/window height", d->height() - 64);
         resize(width, height);
@@ -1266,7 +1266,7 @@ int main(int ac, char** av)
 
         progname = av[0];
         configApp = new QApplication(ac, av);
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
         configSettings = new QSettings;
 #endif
         if (ac > 1 && av[1][0] == '-') {
@@ -1293,7 +1293,7 @@ int main(int ac, char** av)
         configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit()));
         configApp->exec();
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
         configSettings->writeEntry("/kconfig/qconf/window x", v->pos().x());
         configSettings->writeEntry("/kconfig/qconf/window y", v->pos().y());
         configSettings->writeEntry("/kconfig/qconf/window width", v->size().width());
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index c548884..dee5254 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -141,7 +141,7 @@ public:
         }
         ~ConfigItem(void);
         void init(void);
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
         void okRename(int col);
 #endif
         void updateMenu(void);