- make opie compilable against qte 2.3.10 snapshot

  check QT_VERSION against 0x030000 instead of 300

1 files changed, 2 insertions, 2 deletions

diff --git a/library/qpestyle.cpp b/library/qpestyle.cpp
index b61ada4..0566f6b 100644
--- a/library/qpestyle.cpp
+++ b/library/qpestyle.cpp
@@ -1,74 +1,74 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** 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/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #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()
 {
 }
 
 QPEStyle::~QPEStyle()
 {
 }
 
 void QPEStyle::drawPrimitive( PrimitiveElement pe, QPainter *p, const QRect &r,
 			      const QColorGroup &cg, SFlags flags, const QStyleOption &data) const
 {
     switch ( pe ) {
     case PE_ButtonTool:
 	{
 	    QColorGroup mycg = cg;
 	    if ( flags & Style_On ) {
 		QBrush fill( cg.mid(), Dense4Pattern );
 		mycg.setBrush( QColorGroup::Button, fill );
 	    }
 	    drawPrimitive( PE_ButtonBevel, p, r, mycg, flags, data );
 	    break;
 	}
     case PE_ButtonCommand:
     case PE_ButtonDefault:
     case PE_ButtonBevel:
     case PE_HeaderSection:
 	{
 	    QPen oldPen = p->pen();
 	    p->fillRect( r.x()+1, r.y()+1, r.width()-2, r.height()-2, cg.brush(QColorGroup::Button) );
 
 	    int x2 = r.right();
 	    int y2 = r.bottom();
 
 	    if ( flags & (Style_Sunken | Style_Down | Style_On) )
 		p->setPen( cg.dark() );
 	    else
 		p->setPen( cg.light() );
 	    p->drawLine( r.x(), r.y()+1, r.x(), y2-1 );
 	    p->drawLine( r.x()+1, r.y(), x2-1, r.y() );
 
 	    if ( flags & (Style_Sunken | Style_Down | Style_On) )
 		p->setPen( cg.light() );
 	    else
@@ -384,97 +384,97 @@ int QPEStyle::pixelMetric( PixelMetric metric, const QWidget *widget ) const
 	    break;
 	case PM_SliderLength:
 	    ret = 12;
 	    break;
 	default:
 	    ret = QWindowsStyle::pixelMetric( metric, widget );
 	    break;
     }
     return ret;
 }
 
 QSize QPEStyle::sizeFromContents( ContentsType contents, const QWidget *widget,
 				const QSize &contentsSize, const QStyleOption &data) const
 {
     QSize sz(contentsSize);
 
     switch ( contents ) {
     case CT_PopupMenuItem:
 	{
 	    if ( !widget || data.isDefault() )
 		break;
 	    sz = QWindowsStyle::sizeFromContents( contents, widget, contentsSize, data );
 	    sz = QSize( sz.width(), sz.height()-2 );
 	    break;
 	}
     default:
 	sz = QWindowsStyle::sizeFromContents( contents, widget, contentsSize, data );
 	break;
     }
 
     return sz;
 }
 
 #else
 
 #include <qfontmetrics.h>
 #include <qpalette.h>
 #include <qdrawutil.h>
 #include <qscrollbar.h>
 #include <qbutton.h>
 #include <qframe.h>
 #include <qtabbar.h>
 
 #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()
 {
 }
 
 int QPEStyle::buttonMargin() const
 {
     return 2;
 }
 
 QSize QPEStyle::scrollBarExtent() const
 {
     return QSize(13,13);
 }
 
 void QPEStyle::polish ( QPalette & )
 {
 }
 
 void QPEStyle::polish( QWidget *w )
 {
     if ( w->inherits( "QListBox" ) ||
 	 w->inherits( "QListView" ) ||
 	 w->inherits( "QPopupMenu" ) ||
 	 w->inherits( "QSpinBox" ) ) {
 	QFrame *f = (QFrame *)w;
 	f->setFrameShape( QFrame::StyledPanel );
 	f->setLineWidth( 1 );
     }
 }
 
 void QPEStyle::unPolish( QWidget *w )
 {
     if ( w->inherits( "QListBox" ) ||
 	 w->inherits( "QListView" ) ||
 	 w->inherits( "QPopupMenu" ) ||
 	 w->inherits( "QSpinBox" ) ) {
 	QFrame *f = (QFrame *)w;
 	f->setFrameShape( QFrame::StyledPanel );
 	f->setLineWidth( 2 );
     }
 }
 
 int QPEStyle::defaultFrameWidth() const