- 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
@@ -250,13 +250,13 @@ void TEWidget::fontChange(const QFont &)
   //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();
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
@@ -42,13 +42,13 @@
 #include <sys/stat.h>
 #include <stdlib.h> //getenv
 
 using namespace Opie::Core;
 using namespace Opie::Ui;
 
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
 class QpeEditor : public QMultiLineEdit
 {
 
 public:
     QpeEditor( QWidget *parent, const char * name = 0 )
             : QMultiLineEdit( parent, name ) {
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
@@ -30,13 +30,13 @@
 #include <qlineedit.h>
 #include <qtimer.h>
 #include <qcombobox.h>
 #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>
 
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
@@ -133,13 +133,13 @@ void LoginWindowImpl::calcMaxWindowRect ( )
 	QRect ir = m_input-> inputRect ( );
 	if ( ir.isValid() )
 		wr.setCoords( 0, 0, displayWidth-1, ir.top()-1 );
 	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
 
 	QWSServer::setMaxWindowRect( wr );
 #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
@@ -20,13 +20,13 @@
 
 
 #ifndef FONTFACTORY_FT_H
 #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"
 #endif
 
 
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
@@ -105,13 +105,13 @@ void OSeparator::drawFrame(QPainter *p)
    }
    else {
       p1 = QPoint( r.x()+r.width()/2, 0 );
       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() );
    style().drawPrimitive( QStyle::PE_Separator, p, QRect( p1, p2 ), g, QStyle::Style_Sunken, opt );
 #endif
 }
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
@@ -24,13 +24,13 @@
 #include <qlistbox.h>
 
 class OLineEdit;
 class OComboBox;
 class QPushButton;
 
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
     enum StringComparisonMode {
         CaseSensitive   = 0x00001, // 0 0001
         BeginsWith      = 0x00002, // 0 0010
         EndsWith        = 0x00004, // 0 0100
         Contains        = 0x00008, // 0 1000
         ExactMatch      = 0x00010  // 1 0000
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
@@ -769,13 +769,13 @@ QSize OJanusWidget::minimumSizeHint() const
     QSize s2(0,0);
     QSize s3(0,0);
     QSize s4( mPageStack->sizeHint() );
 
     if( mFace == TreeList )
     {
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
       s1.rwidth() += style().splitterWidth();
 #else
       s1.rwidth() += style().pixelMetric( QStyle::PM_SplitterWidth );
 #endif
       s2 = mTreeList->minimumSize();
     }
diff --git a/library/lightstyle.cpp b/library/lightstyle.cpp
index f18bdca..3bd1623 100644
--- a/library/lightstyle.cpp
+++ b/library/lightstyle.cpp
@@ -16,13 +16,13 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "lightstyle.h"
 
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
 
 #define INCLUDE_MENUITEM_DEF
 #include "qmenubar.h"
 #include "qapplication.h"
 #include "qpainter.h"
 #include "qpalette.h"
@@ -156,13 +156,13 @@ QSize LightStyle::indicatorSize() const
 
 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);
 	lineedit->setLineWidth(2);
     }
 #endif
@@ -173,13 +173,13 @@ void LightStyle::polish(QWidget *widget)
 
 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);
 	lineedit->setFrameShape(QFrame::WinPanel);
     }
 #endif
@@ -411,13 +411,13 @@ void LightStyle::drawComboButton(QPainter *p, int x, int y, int w, int h,
 			g, TRUE);
     }
 
     int indent = ((y + h) / 2) - 3;
     int xpos = x;
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
     if( QApplication::reverseLayout() )
         xpos += indent;
     else
 #endif
         xpos += w - indent - 5;
 
@@ -428,13 +428,13 @@ void LightStyle::drawComboButton(QPainter *p, int x, int y, int w, int h,
 QRect LightStyle::comboButtonRect( int x, int y, int w, int h ) const
 {
     QRect r(x + 3, y + 3, w - 6, h - 6);
     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
 
     return r;
 }
diff --git a/library/lightstyle.h b/library/lightstyle.h
index c377cc2..0392957 100644
--- a/library/lightstyle.h
+++ b/library/lightstyle.h
@@ -23,13 +23,13 @@
 
 #ifndef QT_H
 #include <qstyle.h>
 #include <qwindowsstyle.h>
 #endif // QT_H
 
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
 
 #ifdef QT_PLUGIN_STYLE_LIGHT
 #  define Q_EXPORT_STYLE_LIGHT
 #else
 #  define Q_EXPORT_STYLE_LIGHT Q_EXPORT
 #endif // 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
@@ -57,13 +57,13 @@
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 #define QTOPIA_INTERNAL_INITAPP
 #include "qpeapplication.h"
 #include "qpestyle.h"
 #include "styleinterface.h"
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 #include <qstylefactory.h>
 #else
 #include <qplatinumstyle.h>
 #include <qwindowsstyle.h>
 #include <qmotifstyle.h>
 #include <qmotifplusstyle.h>
@@ -1840,13 +1840,13 @@ bool QPEApplication::keepRunning() const
 
 /*!
   \internal
 */
 void QPEApplication::internalSetStyle( const QString &style )
 {
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
     if ( style == "QPE" ) {
         setStyle( new QPEStyle );
     }
     else {
         QStyle *s = QStyleFactory::create( style );
         if ( s )
diff --git a/library/qpestyle.cpp b/library/qpestyle.cpp
index b61ada4..0566f6b 100644
--- a/library/qpestyle.cpp
+++ b/library/qpestyle.cpp
@@ -20,13 +20,13 @@
 
 #include "qpestyle.h"
 
 
 #define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2)
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 
 #include <qdrawutil.h>
 #include <qcombobox.h>
 #include <qtabbar.h>
 
 QPEStyle::QPEStyle()
@@ -426,13 +426,13 @@ QSize QPEStyle::sizeFromContents( ContentsType contents, const QWidget *widget,
 
 #define INCLUDE_MENUITEM_DEF
 #include <qmenudata.h>
 
 QPEStyle::QPEStyle()
 {
-#if QT_VERSION < 300
+#if QT_VERSION < 0x030000
     setButtonMargin(buttonMargin());
     setScrollBarExtent(scrollBarExtent().width(),scrollBarExtent().height());
 #endif
 }
 
 QPEStyle::~QPEStyle()
diff --git a/library/qpestyle.h b/library/qpestyle.h
index 19ef346..1bde0ff 100644
--- a/library/qpestyle.h
+++ b/library/qpestyle.h
@@ -22,13 +22,13 @@
 #define QPESTYLE_H
 
 #ifndef QT_H
 #include "qwindowsstyle.h"
 #endif // QT_H
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 
 class Q_EXPORT QPEStyle : public QWindowsStyle
 {
 public:
     QPEStyle();
     virtual ~QPEStyle();
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
@@ -261,13 +261,13 @@ void TEWidget::fontChange(const QFont &)
 //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();
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
@@ -31,17 +31,17 @@
 ** 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 */
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
@@ -39,13 +39,13 @@
 #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
@@ -104,8 +104,8 @@ public:
 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
@@ -49,13 +49,13 @@ 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
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
@@ -369,21 +369,21 @@ void WellenreiterConfigWindow::load()
 
     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;
@@ -424,13 +424,13 @@ void WellenreiterConfigWindow::load()
     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 ) );
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
@@ -60,13 +60,13 @@
 #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>
@@ -127,13 +127,13 @@ QWidget *Appearance::createStyleTab ( QWidget *parent, Config &cfg )
     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
@@ -40,13 +40,13 @@
 #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>
 
 
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
@@ -40,13 +40,13 @@
 #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>
 
 
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,11 +1,11 @@
 #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"
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,9 +1,9 @@
 #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
@@ -22,13 +22,13 @@
 #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>
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
@@ -591,13 +591,13 @@ int QOutputDev::convertSubpath ( GfxState *state, GfxSubpath *subpath, QPointArr
 			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 ( ));
 			}
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
@@ -14,26 +14,26 @@
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qaction.h>
 #include <qheader.h>
 #include <qfiledialog.h>
 #include <qregexp.h>
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 #include <qsettings.h>
 #endif
 
 #include <stdlib.h>
 
 #include "lkc.h"
 #include "qconf.h"
 
 #include "qconf.moc"
 #include "images.c"
 
 static QApplication *configApp;
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 static QSettings *configSettings;
 #endif
 
 /*
  * update all the children of a menu entry
  *   removes/adds the entries from the parent widget as necessary
@@ -99,13 +99,13 @@ void ConfigList::updateMenuList(P* parent, struct menu* menu)
 				last = last->nextSibling();
 			delete item;
 		}
 	}
 }
 
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 /*
  * set the new data
  * TODO check the value
  */
 void ConfigItem::okRename(int col)
 {
@@ -212,13 +212,13 @@ void ConfigItem::updateMenu(void)
 	case S_INT:
 	case S_HEX:
 	case S_STRING:
 		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);
 #endif
 		setText(dataColIdx, data);
 		if (type == S_STRING)
@@ -487,13 +487,13 @@ void ConfigList::changeValue(ConfigItem* item)
 		if (oldexpr != newexpr)
 			parent()->updateList(item);
 		break;
 	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
 #endif
 			parent()->lineEdit->show(item);
 		break;
@@ -748,13 +748,13 @@ ConfigMainWindow::ConfigMainWindow(void)
 	QSplitter* split2;
 	bool ok;
 	int x, y, width, height;
 
 	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);
 	x = configSettings->readNumEntry("/kconfig/qconf/window x", 0, &ok);
 	if (ok)
 		y = configSettings->readNumEntry("/kconfig/qconf/window y", 0, &ok);
@@ -1263,13 +1263,13 @@ int main(int ac, char** av)
 #ifndef LKC_DIRECT_LINK
 	kconfig_load();
 #endif
 
 	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] == '-') {
 		switch (av[1][1]) {
 		case 'h':
 		case '?':
@@ -1290,13 +1290,13 @@ int main(int ac, char** av)
 
 	//zconfdump(stdout);
 	v->show();
 	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());
 	configSettings->writeEntry("/kconfig/qconf/window height", v->size().height());
 	delete configSettings;
 #endif
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
@@ -138,13 +138,13 @@ public:
 	: Parent(parent, after), menu(0), visible(v), goParent(true)
 	{
 		init();
 	}
 	~ConfigItem(void);
 	void init(void);
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 	void okRename(int col);
 #endif
 	void updateMenu(void);
 	void testUpdateMenu(bool v);
 	ConfigList* listView() const
 	{