Actually most of them are -+ cause I opened them in xemacs..

The main goal is to
replace some header names to let them be overwritten by external once
so "qpeapplication.h" is now <qpe/qpeapplication.h>
I'll check if it's building on non Qt2/X11 systems...

1 files changed, 1 insertions, 1 deletions

diff --git a/library/qpestyle.cpp b/library/qpestyle.cpp
index dfd300f..665910c 100644
--- a/library/qpestyle.cpp
+++ b/library/qpestyle.cpp
@@ -1,214 +1,214 @@
 /**********************************************************************
 ** 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"
-#include "qpeapplication.h"
+#include <qpe/qpeapplication.h>
 #include <qpushbutton.h>
 
 #include <qpainter.h>
 
 #define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2)
 
 #if QT_VERSION >= 300
 
 #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
 		p->setPen( cg.dark() );
 	    p->drawLine( x2, r.y()+1, x2, y2-1 );
 	    p->drawLine( r.x()+1, y2, x2-1, y2 );
 	    p->setPen( oldPen );
 	    break;
 	}
     case PE_FocusRect:
 	break;
     case PE_Indicator:
 	{
 	    QColorGroup mycg( cg );
 	    QBrush fill;
 	    if ( flags & Style_Down )
 		fill = cg.brush( QColorGroup::Button );
 	    else
 		fill = cg.brush( (flags&Style_Enabled) ? QColorGroup::Base : QColorGroup::Background );
 	    mycg.setBrush( QColorGroup::Button, fill );
 	    if ( flags&Style_Enabled )
 		flags |= Style_Sunken;
 	    drawPrimitive( PE_ButtonBevel, p, r, mycg, flags );
 	    if ( flags & Style_On ) {
 		QPointArray a( 7*2 );
 		int i, xx, yy;
 		xx = r.x()+3;
 		yy = r.y()+5;
 		for ( i=0; i<3; i++ ) {
 		    a.setPoint( 2*i,   xx, yy );
 		    a.setPoint( 2*i+1, xx, yy+2 );
 		    xx++; yy++;
 		}
 		yy -= 2;
 		for ( i=3; i<7; i++ ) {
 		    a.setPoint( 2*i,   xx, yy );
 		    a.setPoint( 2*i+1, xx, yy+2 );
 		    xx++; yy--;
 		}
 		if ( flags & Style_NoChange ) {
 		    p->setPen( mycg.dark() );
 		} else {
 		    p->setPen( mycg.text() );
 		}
 		p->drawLineSegments( a );
 	    }
 	    break;
 	}
     case PE_ExclusiveIndicator:
 	{
 	    static const QCOORD pts1[] = {              // dark lines
 		1,9, 1,8, 0,7, 0,4, 1,3, 1,2, 2,1, 3,1, 4,0, 7,0, 8,1, 9,1 };
 	    static const QCOORD pts4[] = {              // white lines
 		2,10, 3,10, 4,11, 7,11, 8,10, 9,10, 10,9, 10,8, 11,7,
 		11,4, 10,3, 10,2 };
 	    static const QCOORD pts5[] = {              // inner fill
 		4,2, 7,2, 9,4, 9,7, 7,9, 4,9, 2,7, 2,4 };
 
 	    int x, y, w, h;
 	    r.rect( &x, &y, &w, &h );
 	    p->eraseRect( x, y, w, h );
 	    QPointArray a( QCOORDARRLEN(pts1), pts1 );
 	    a.translate( x, y );
 	    p->setPen( cg.dark() );
 	    p->drawPolyline( a );
 	    a.setPoints( QCOORDARRLEN(pts4), pts4 );
 	    a.translate( x, y );
 	    p->setPen( cg.light() );
 	    p->drawPolyline( a );
 	    a.setPoints( QCOORDARRLEN(pts5), pts5 );
 	    a.translate( x, y );
 	    QColor fillColor = ( flags&Style_Down || !(flags&Style_Enabled) ) ? cg.button() : cg.base();
 	    p->setPen( fillColor );
 	    p->setBrush( fillColor  ) ;
 	    p->drawPolygon( a );
 	    if ( flags&Style_On ) {
 		p->setPen( NoPen );
 		p->setBrush( cg.text() );
 		p->drawRect( x+5, y+4, 2, 4 );
 		p->drawRect( x+4, y+5, 4, 2 );
 	    }
 	    break;
 	}
     default:
 	QWindowsStyle::drawPrimitive( pe, p, r, cg, flags, data );
 	break;
     }
 }
 
 void QPEStyle::drawControl( ControlElement ce, QPainter *p,
 			    const QWidget *widget, const QRect &r,
 			    const QColorGroup &cg, SFlags how, const QStyleOption &data) const
 {
     switch ( ce ) {
     case CE_PushButton:
 	{
 	    const QPushButton *btn = (QPushButton*)widget;
 	    SFlags flags;
 	    flags = Style_Default;
 	    if ( btn->isDown() )
 		flags |= Style_Down;
 	    if ( btn->isOn() )
 		flags |= Style_On;
 	    if ( btn->isEnabled() )
 		flags |= Style_Enabled;
 	    if ( btn->isDefault() )
 		flags |= Style_Default;
 	    if (! btn->isFlat() && !(flags & Style_Down))
 		flags |= Style_Raised;
 	    p->setPen( cg.foreground() );
 	    p->setBrush( QBrush(cg.button(), NoBrush) );
 	    QColorGroup mycg( cg );
 	    if ( flags & Style_On ) {
 		QBrush fill = QBrush( cg.mid(), Dense4Pattern );
 		mycg.setBrush( QColorGroup::Button, fill );
 	    }
 	    drawPrimitive( PE_ButtonBevel, p, r, mycg, flags, data );
 	    break;
 	}
     case CE_TabBarTab:
 	{
 	    if ( !widget || !widget->parentWidget() )
 		break;
 
 	    const QTabBar *tb = (const QTabBar *) widget;
 	    bool selected = how & Style_Selected;
 
 	    QRect r2(r);
 	    if ( tb->shape()  == QTabBar::RoundedAbove ) {
 		p->setPen( cg.light() );
 		p->drawLine( r2.left(), r2.bottom(), r2.right(), r2.bottom() );
 		if ( r2.left() == 0 )
 		    p->drawPoint( tb->rect().bottomLeft() );
 		else {
 		    p->setPen( cg.light() );
 		    p->drawLine( r2.left(), r2.bottom(), r2.right(), r2.bottom() );
 		}
 
 		if ( selected ) {
 		    p->setPen( cg.background() );