- make opie compilable against qte 2.3.10 snapshot

  check QT_VERSION against 0x030000 instead of 300

2 files changed, 4 insertions, 4 deletions

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
@@ -13,53 +13,53 @@
 ** as defined by Trolltech AS of Norway and appearing in the file
 ** LICENSE.QPL included in the packaging of this file.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
 ** licenses may use this file in accordance with the Qt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
 **   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>
 
 /* QT */
 #include <qarray.h>
 #include <qbitarray.h>
 #include <qcache.h>
 #include <qintdict.h>
 #include <qmap.h>
 #include <qstring.h>
 #include <qtl.h>
 #include <qvector.h>
 
 /* STD */
 #include <limits.h>
 
 /*
   WARNING!  Be sure to read qregexp.tex before modifying this file.
 */
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
@@ -21,49 +21,49 @@
 ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
 ** licenses may use this file in accordance with the Qt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
 **   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.
 **
 **********************************************************************/
 
 #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:
     QRegExp3();
     QRegExp3( const QString& pattern, bool caseSensitive = TRUE,
 	     bool wildcard = FALSE );
     QRegExp3( const QRegExp3& rx );
     ~QRegExp3();
     QRegExp3& operator=( const QRegExp3& rx );
 
     bool operator==( const QRegExp3& rx ) const;
     bool operator!=( const QRegExp3& rx ) const { return !operator==( rx ); }
 
     bool isEmpty() const;
     bool isValid() const;
     QString pattern() const;
     void setPattern( const QString& pattern );
     bool caseSensitive() const;
     void setCaseSensitive( bool sensitive );
@@ -86,26 +86,26 @@ public:
 #ifdef QCHAR_SUPPORT
     int search(const QChar *str,int start=0);
     int search(const QChar *str,int start=0) const;
     int searchRev(const QChar *str,int start=-1);
     int searchRev(const QChar *str,int start=-1) const ;
     bool exactMatch(const QChar *str);
     bool exactMatch(const QChar *str) const;
 // end QChar versions	
 #endif
     int searchRev( const QString& str, int start = -1 );
     int searchRev( const QString& str, int start = -1 ) const;
     int matchedLength();
 #ifndef QT_NO_REGEXP_CAPTURE
     QStringList capturedTexts();
     QString cap( int nth = 0 );
     int pos( int nth = 0 );
 #endif
 
 private:
     void compile( bool caseSensitive );
 
     QRegExpEngine *eng;
     QRegExpPrivate *priv;
 };
-#endif // QT_VERSION >= 300
+#endif // QT_VERSION >= 0x030000
 #endif // QREGEXP_H