4 files changed, 9 insertions, 9 deletions

diff --git a/libopie2/opieui/olistview.cpp b/libopie2/opieui/olistview.cpp
index 67b4b83..4386e0e 100644
--- a/libopie2/opieui/olistview.cpp
+++ b/libopie2/opieui/olistview.cpp
@@ -54,62 +54,62 @@ OListView::OListView( QWidget *parent, const char *name, WFlags fl )
     m_columnSeparator = QPen( QColor( 150, 160, 170 ), 0, DotLine );
     m_fullWidth = true;
     connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*)));
 }
 
 OListView::~OListView()
 {
 }
 
 void OListView::setFullWidth( bool fullWidth )
 {
     m_fullWidth = fullWidth;
-    #if QT_VERSION > 290
+    #if QT_VERSION >= 0x030000
     header()->setStretchEnabled( fullWidth, columns()-1 );
     #endif
 }
 
 bool OListView::fullWidth() const
 {
     return m_fullWidth;
 }
 
 int OListView::addColumn( const QString& label, int width )
 {
     int result = QListView::addColumn( label, width );
-    #if QT_VERSION > 290
+    #if QT_VERSION >= 0x030000
     if (m_fullWidth) {
         header()->setStretchEnabled( false, columns()-2 );
         header()->setStretchEnabled( true, columns()-1  );
     }
     #endif
     return result;
 }
 
 int OListView::addColumn( const QIconSet& iconset, const QString& label, int width )
 {
     int result = QListView::addColumn( iconset, label, width );
-    #if QT_VERSION > 290
+    #if QT_VERSION >= 0x030000
     if (m_fullWidth) {
         header()->setStretchEnabled( false, columns()-2 );
         header()->setStretchEnabled( true, columns()-1 );
     }
     #endif
     return result;
 }
 
 void OListView::removeColumn( int index )
 {
     QListView::removeColumn(index);
-    #if QT_VERSION > 290
+    #if QT_VERSION >= 0x030000
     if ( m_fullWidth && index == columns() )
     {
         header()->setStretchEnabled( true, columns()-1 );
     }
     #endif
 }
 
 const QColor& OListView::alternateBackground() const
 {
     return m_alternateBackground;
 }
 
diff --git a/libopie2/opieui/opopupmenu.cpp b/libopie2/opieui/opopupmenu.cpp
index 50c613f..5ce048e 100644
--- a/libopie2/opieui/opopupmenu.cpp
+++ b/libopie2/opieui/opopupmenu.cpp
@@ -76,25 +76,25 @@ void OPopupTitle::setText( const QString &text )
 void OPopupTitle::setIcon( const QPixmap &pix )
 {
     miniicon = pix;
     int w = miniicon.width()+fontMetrics().width(titleStr);
     int h = QMAX( fontMetrics().height(), miniicon.height() );
     setMinimumSize( w+16, h+8 );
 }
 
 void OPopupTitle::paintEvent(QPaintEvent *)
 {
     QRect r(rect());
     QPainter p(this);
-    #if QT_VERSION > 290
+    #if QT_VERSION >= 0x030000
     qApp->style().drawPrimitive(QStyle::PE_HeaderSection, &p, r, palette().active());
     #else
     #warning OPopupMenu is not fully functional on Qt2
     #endif
 
     if (!miniicon.isNull())
         p.drawPixmap(4, (r.height()-miniicon.height())/2, miniicon);
 
     if (!titleStr.isNull())
     {
         p.setPen(palette().active().text());
         QFont f = p.font();
@@ -540,25 +540,25 @@ void OPopupMenu::ctxMenuHiding()
 
 bool OPopupMenu::eventFilter(QObject* obj, QEvent* event)
 {
     if (d->m_ctxMenu && obj == this)
     {
         if (event->type() == QEvent::MouseButtonRelease)
         {
             if (d->m_ctxMenu->isVisible())
             {
                 return true;
             }
         }
-        #if QT_VERSION > 290
+        #if QT_VERSION >= 0x030000
         else if (event->type() == QEvent::ContextMenu)
         #else
         else if ( (event->type() == QEvent::MouseButtonPress) &&
                   ( (QMouseEvent*) event )->button() == QMouseEvent::RightButton )
         #endif
         {
             showCtxMenu(mapFromGlobal(QCursor::pos()));
             return true;
         }
     }
 
     return QWidget::eventFilter(obj, event);
diff --git a/libopie2/opieui/oselector.cpp b/libopie2/opieui/oselector.cpp
index 05543c5..936dfe6 100644
--- a/libopie2/opieui/oselector.cpp
+++ b/libopie2/opieui/oselector.cpp
@@ -130,25 +130,25 @@ void OXYSelector::mousePressEvent( QMouseEvent *e )
 
 void OXYSelector::mouseMoveEvent( QMouseEvent *e )
 {
     int xVal, yVal;
     valuesFromPosition( e->pos().x() - 2, e->pos().y() - 2, xVal, yVal );
     setValues( xVal, yVal );
 
     emit valueChanged( xPos, yPos );
 }
 
 void OXYSelector::wheelEvent( QWheelEvent *e )
 {
-    #if QT_VERSION > 290
+    #if QT_VERSION >= 0x030000
     if ( e->orientation() == Qt::Horizontal )
         setValues( xValue() + e->delta()/120, yValue() );
     else
         setValues( xValue(), yValue() + e->delta()/120 );
 
     emit valueChanged( xPos, yPos );
     #else
     Q_UNUSED( e )
     #endif
 }
 
 void OXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const
diff --git a/libopie2/opieui/oselector.h b/libopie2/opieui/oselector.h
index fe75a46..3dbdb38 100644
--- a/libopie2/opieui/oselector.h
+++ b/libopie2/opieui/oselector.h
@@ -199,40 +199,40 @@ public:
   void setValue(int value)
   { QRangeControl::setValue(value); }
 
   /**
    * @returns the value.
    */
   int value() const
   { return QRangeControl::value(); }
 
   /**
    * Sets the min value.
    */
-  #if ( QT_VERSION > 290 )
+  #if ( QT_VERSION >= 0x030000 )
   void setMinValue(int value) { QRangeControl::setMinValue(value); }
   #else
   void setMinValue(int value) { QRangeControl::setRange(value,QRangeControl::maxValue()); }
   #endif
 
   /**
    * @return the min value.
    */
   int minValue() const
   { return QRangeControl::minValue(); }
 
   /**
    * Sets the max value.
    */
-  #if ( QT_VERSION > 290 )
+  #if ( QT_VERSION >= 0x030000 )
   void setMaxValue(int value) { QRangeControl::setMaxValue(value); }
   #else
   void setMaxValue(int value) { QRangeControl::setRange(QRangeControl::minValue(),value); }
   #endif
 
   /**
    * @return the max value.
    */
   int maxValue() const
   { return QRangeControl::maxValue(); }
 
 signals: