12 files changed, 17 insertions, 17 deletions

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
@@ -259,17 +259,17 @@ void TEWidget::fontChange(const QFont &)
   font_w = fm.maxWidth();
   font_a = fm.ascent();
 //printf("font_h: %d\n",font_h);
 //printf("font_w: %d\n",font_w);
 //printf("font_a: %d\n",font_a);
 //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
           :
 #endif
   identicalMap;
   propagateSize();
   update();
 }
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
@@ -29,21 +29,21 @@
 **   information about Qt Commercial License Agreements.
 ** See http://www.trolltech.com/qpl/ for QPL licensing information.
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** 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"
 #endif
 
 /* OPIE */
 #include <opie2/odebug.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
@@ -37,17 +37,17 @@
 
 #ifndef QREGEXP3_H
 #define QREGEXP3_H
 #ifndef QT_H
 #include "qstringlist.h"
 #endif // QT_H
 
 
-#if QT_VERSION >=300
+#if QT_VERSION >= 0x030000
 #include <qregexp.h>
 #else
 class QRegExpEngine;
 struct QRegExpPrivate;
 
 class Q_EXPORT QRegExp3
 {
 public:
@@ -102,10 +102,10 @@ public:
 #endif
 
 private:
     void compile( bool caseSensitive );
 
     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
@@ -47,17 +47,17 @@ 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);
 #else
     const QColorGroup::ColorRole crole = QColorGroup::Base;
 #endif
     if (oddRow) {
         colors.setColor(crole, *ZSafe::oddRowColor);
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
@@ -367,25 +367,25 @@ void WellenreiterConfigWindow::load()
 
     OConfig* c = oApp->config();
 
     c->setGroup( "Interface" );
 
     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
         interfaceName->setCurrentText( interface );
 #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 )
             {
                 deviceType->setCurrentItem( i );
                 break;
             }
         }
@@ -422,17 +422,17 @@ void WellenreiterConfigWindow::load()
     newClientAction->setCurrentItem( c->readNumEntry( "newClientAction", 2 ) ); // Default: Play Click
     newClientScript->setText( c->readEntry( "newClientScript", "" ) );
     newStationAction->setCurrentItem( c->readNumEntry( "newStationAction", 2 ) ); // Default: Play Click
     newStationScript->setText( c->readEntry( "newStationScript", "" ) );
     synchronizeActionsAndScripts(); // needed for showing/hiding the script QLineEdit on demand
 
     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
     gpsdHost->setCurrentText( c->readEntry( "host", "localhost" ) );
 #endif
     gpsdPort->setValue( c->readNumEntry( "port", 2947 ) );
     startGPS->setChecked( c->readBoolEntry( "start", false ) );
     commandGPS->setText( c->readEntry( "command", "gpsd -p /dev/ttyS3 -s 57600" ) );
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
@@ -58,17 +58,17 @@
 #include <qdir.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 #include <qstylefactory.h>
 #endif
 #include <qtoolbutton.h>
 #include <qwindowsstyle.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qvbox.h>
 #include <qwhatsthis.h>
@@ -125,17 +125,17 @@ QWidget *Appearance::createStyleTab ( QWidget *parent, Config &cfg )
     m_style_settings = new QPushButton ( tr( "Settings..." ), tab );
     connect ( m_style_settings, SIGNAL( clicked()), this, SLOT( styleSettingsClicked()));
     vertLayout-> addWidget ( m_style_settings );
     QWhatsThis::add( m_style_settings, tr( "Click here to configure the currently selected style.\n\nNote:  This option is not available for all styles." ) );
 
     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 ( )));
     m_style_list-> insertItem ( new StyleListItem ( "Light", new LightStyle ( )));
     m_style_list-> insertItem ( new StyleListItem ( "QPE", new QPEStyle ( )));
 #endif
 
     {
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
@@ -38,17 +38,17 @@
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qdatastream.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qspinbox.h>
 #include <qlistbox.h>
 #include <qdir.h>
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 #include <qstylefactory.h>
 #endif
 
 #include <stdlib.h>
 
 
 DocTabSettings::DocTabSettings( QWidget* parent, const char* name, WFlags fl )
                 : DocTabSettingsBase( parent, name, TRUE, fl )
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
@@ -38,17 +38,17 @@
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qdatastream.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qspinbox.h>
 #include <qlistbox.h>
 #include <qdir.h>
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 #include <qstylefactory.h>
 #endif
 
 #include <stdlib.h>
 
 
 LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags fl )
                 : LanguageSettingsBase( parent, name, TRUE, fl )
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
@@ -1,13 +1,13 @@
 #ifndef NETCONF_MODULE_H
 #define NETCONF_MODULE_H
 
 #include <qobject.h>
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
 #include <qlist.h>
 #else
 #include <qptrlist.h>
 #endif
 #include <qmap.h>
 #include "interface.h"
 
 class QWidget;
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,11 +1,11 @@
 #include "addconnectionimp.h"
 #include <qlistview.h>
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
 #include <qlist.h>
 #else
 #include <qptrlist.h>
 #endif
 #include <qlabel.h>
 #include <qheader.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
@@ -20,17 +20,17 @@
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qlabel.h>
 #include <qtabwidget.h> // in order to disable the profiles tab
 #include <qmessagebox.h>
 
 
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
 #include <qlist.h>
 #else
 #include <qptrlist.h>
 #endif
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qregexp.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
@@ -589,17 +589,17 @@ int QOutputDev::convertSubpath ( GfxState *state, GfxSubpath *subpath, QPointArr
                         state-> transform ( subpath-> getX ( i ),     subpath-> getY ( i ),     &x1, &y1 );
                         state-> transform ( subpath-> getX ( i + 1 ), subpath-> getY ( i + 1 ), &x2, &y2 );
                         state-> transform ( subpath-> getX ( i + 2 ), subpath-> getY ( i + 2 ), &x3, &y3 );
 
                         QPointArray tmp;
                         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++ ) {
                                 QPoint p = tmp. point ( loop );
                                 points. putPoints ( points. count ( ), 1, p. x ( ), p. y ( ));
                         }
 #else
                         tmp = tmp. cubicBezier ( );