- make opie compilable against qte 2.3.10 snapshot

  check QT_VERSION against 0x030000 instead of 300

3 files changed, 4 insertions, 4 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
@@ -244,25 +244,25 @@ void TEWidget::fontChange(const QFont &)
   //  font_w = fm.maxWidth();
   font_w = fm.width("m");
   font_a = fm.ascent();
   printf("font h=%d max_width=%d width_m=%d assent=%d\n", font_h,
 	 fm.maxWidth(), font_w, font_a);
 
   //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();
 }
 
 void TEWidget::setVTFont(const QFont& f)
 {
   QFrame::setFont(f);
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
@@ -36,25 +36,25 @@
 #include <qlayout.h>
 #include <qtimer.h>
 #include <qdir.h>
 
 /* STD */
 #include <unistd.h>
 #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 ) {
         clearTableFlags();
         setTableFlags( Tbl_vScrollBar | Tbl_autoHScrollBar );
 }
 
     void find( const QString &txt, bool caseSensitive,
                             bool backwards );
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
@@ -24,25 +24,25 @@
                              Boston, MA 02111-1307, USA.
 
 */
 #include <qpe/version.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #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>
 #include <qpe/config.h>
 
 #include <opie2/odevice.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -127,25 +127,25 @@ void LoginWindowImpl::receive ( const QCString &msg, const QByteArray &data )
 
 void LoginWindowImpl::calcMaxWindowRect ( )
 {
 #ifdef Q_WS_QWS
 	QRect wr;
 	int displayWidth = qApp-> desktop ( )-> width ( );
 	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
 }
 
 
 void LoginWindowImpl::keyPressEvent ( QKeyEvent *e )
 {
 	switch ( e-> key ( )) {
 		case HardKey_Suspend:   suspend ( );