- make opie compilable against qte 2.3.10 snapshot

  change QT_VERSION > 290 into QT_VERSION <= 0x030000

4 files changed, 10 insertions, 10 deletions

diff --git a/libopie2/qt3/opiecore/osortablevaluelist.h b/libopie2/qt3/opiecore/osortablevaluelist.h
index f66cf25..a3f75b4 100644
--- a/libopie2/qt3/opiecore/osortablevaluelist.h
+++ b/libopie2/qt3/opiecore/osortablevaluelist.h
@@ -31,7 +31,7 @@
 #ifndef OSORTABLEVALUELIST_H
 #define OSORTABLEVALUELIST_H
 
-#if QT_VERSION > 290
+#if QT_VERSION >= 0x030000
 #include <qtl.h>
 #include <qpair.h>
 #else
diff --git a/libopie2/qt3/opieui/ocombobox.cpp b/libopie2/qt3/opieui/ocombobox.cpp
index bd330e0..130112c 100644
--- a/libopie2/qt3/opieui/ocombobox.cpp
+++ b/libopie2/qt3/opieui/ocombobox.cpp
@@ -318,7 +318,7 @@ void OComboBox::create( WId id, bool initializeWindow, bool destroyOldWindow )
 
 void OComboBox::setLineEdit( OLineEdit *edit )
 {
-    #if QT_VERSION > 290
+    #if QT_VERSION >= 0x030000
     QComboBox::setLineEdit( edit );
     if ( !edit->inherits( "OLineEdit" ) )
         d->olineEdit = 0;
@@ -352,7 +352,7 @@ void OComboBox::setLineEdit( OLineEdit *edit )
 void OComboBox::deleteWordForward()
 {
     lineEdit()->cursorWordForward(TRUE);
-    #if QT_VERSION > 290
+    #if QT_VERSION >= 0x030000
     if ( lineEdit()->hasSelectedText() )
     #else
     if ( lineEdit()->hasMarkedText() )
@@ -365,7 +365,7 @@ void OComboBox::deleteWordForward()
 void OComboBox::deleteWordBack()
 {
     lineEdit()->cursorWordBackward(TRUE);
-    #if QT_VERSION > 290
+    #if QT_VERSION >= 0x030000
     if ( lineEdit()->hasSelectedText() )
     #else
     if ( lineEdit()->hasMarkedText() )
diff --git a/libopie2/qt3/opieui/oeditlistbox.cpp b/libopie2/qt3/opieui/oeditlistbox.cpp
index 0e95274..dcc697d 100644
--- a/libopie2/qt3/opieui/oeditlistbox.cpp
+++ b/libopie2/qt3/opieui/oeditlistbox.cpp
@@ -192,7 +192,7 @@ void OEditListBox::typedSomething(const QString& text)
         }
         else
         {
-            #if QT_VERSION > 290
+            #if QT_VERSION >= 0x030000
             StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive );
             bool enable = (m_listBox->findItem( text, mode ) == 0L);
             #else
@@ -267,7 +267,7 @@ void OEditListBox::addItem()
             alreadyInList = true;
         else
         {
-            #if QT_VERSION > 290
+            #if QT_VERSION >= 0x030000
             StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive );
             alreadyInList =(m_listBox->findItem(currentTextLE, mode) != 0);
             #else
@@ -300,7 +300,7 @@ void OEditListBox::addItem()
 int OEditListBox::currentItem() const 
 {
     int nr = m_listBox->currentItem();
-    #if QT_VERSION > 290
+    #if QT_VERSION >= 0x030000
     if(nr >= 0 && !m_listBox->item(nr)->isSelected()) return -1;
     #else
     if(nr >= 0 && !m_listBox->isSelected(m_listBox->item(nr))) return -1;
diff --git a/libopie2/qt3/opieui/olineedit.cpp b/libopie2/qt3/opieui/olineedit.cpp
index 6f66fc7..b150987 100644
--- a/libopie2/qt3/opieui/olineedit.cpp
+++ b/libopie2/qt3/opieui/olineedit.cpp
@@ -145,7 +145,7 @@ void OLineEdit::rotateText( OCompletionBase::KeyBindingType type )
        // Skip rotation if previous/next match is null or the same text
        if ( input.isNull() || input == displayText() )
             return;
-       #if QT_VERSION > 290
+       #if QT_VERSION >= 0x030000
        setCompletedText( input, hasSelectedText() );
        #else
        setCompletedText( input, hasMarkedText() );
@@ -271,7 +271,7 @@ void OLineEdit::keyPressEvent( QKeyEvent *e )
                 QLineEdit::keyPressEvent ( e );
                 QString txt = text();
                 int len = txt.length();
-                #if QT_VERSION > 290
+                #if QT_VERSION >= 0x030000
                 if ( !hasSelectedText() && len && cursorPosition() == len )
                 #else
                 if ( !hasMarkedText() && len && cursorPosition() == len )
@@ -436,7 +436,7 @@ QPopupMenu *OLineEdit::createPopupMenu()
     if ( !m_bEnableMenu )
         return 0;
 
-    #if QT_VERSION > 290
+    #if QT_VERSION >= 0x030000
     QPopupMenu *popup = QLineEdit::createPopupMenu();
     #else
     QPopupMenu *popup = new QPopupMenu();