1 files changed, 7 insertions, 7 deletions

diff --git a/library/qpestyle.cpp b/library/qpestyle.cpp
index dfd300f..665910c 100644
--- a/library/qpestyle.cpp
+++ b/library/qpestyle.cpp
@@ -1,54 +1,54 @@
 /**********************************************************************
 ** 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 );
@@ -195,65 +195,65 @@ void QPEStyle::drawControl( ControlElement ce, QPainter *p,
         {
             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() );
                     p->drawLine( r2.left()+2, r2.top()+1, r2.right()-2, r2.top()+1 );
                     p->fillRect( QRect( r2.left()+1, r2.top()+2, r2.width()-2, r2.height()-2),
                             cg.brush( QColorGroup::Background ));
                 } else {
                     r2.setRect( r2.left() + 2, r2.top() + 2,
                             r2.width() - 4, r2.height() - 2 );
                     p->setPen( cg.button() );
                     p->drawLine( r2.left()+2, r2.top()+1, r2.right()-2, r2.top()+1 );
                     p->fillRect( QRect( r2.left()+1, r2.top()+2, r2.width()-2, r2.height()-3),
                             cg.brush( QColorGroup::Button ));
 
                     //do shading; will not work for pixmap brushes
-                    QColor bg = cg.button(); 
+                    QColor bg = cg.button();
                             //    int h,s,v;
                             //    bg.hsv( &h, &s, &v );
                     int n = r2.height()/2;
                     int dark = 100;
                     for ( int i = 1; i < n; i++ ) {
                         dark = (dark * (100+(i*15)/n) )/100;
                         p->setPen( bg.dark( dark ) );
                         int y = r2.bottom()-n+i;
                         int x1 = r2.left()+1;
                         int x2 = r2.right()-1;
                         p->drawLine( x1, y, x2, y );
                     }
                 }
 
                 p->setPen( cg.light() );
                 p->drawLine( r2.left(), r2.bottom()-1, r2.left(), r2.top() + 2 );
                 p->drawPoint( r2.left()+1, r2.top() + 1 );
                 p->drawLine( r2.left()+2, r2.top(),
                         r2.right() - 2, r2.top() );
 
                 p->setPen( cg.dark() );
                 p->drawPoint( r2.right() - 1, r2.top() + 1 );
                 p->drawLine( r2.right(), r2.top() + 2, r2.right(), r2.bottom() - 1);
             } else if ( tb->shape() == QTabBar::RoundedBelow ) {
                 if ( selected ) {
                     p->setPen( cg.background() );
                     p->drawLine( r2.left()+2, r2.bottom()-1, r2.right()-2, r2.bottom()-1 );
                     p->fillRect( QRect( r2.left()+1, r2.top(), r2.width()-2, r2.height()-2),
                             tb->palette().normal().brush( QColorGroup::Background ));
                 } else {
                     p->setPen( cg.dark() );
                     p->drawLine( r2.left(), r2.top(),
@@ -504,66 +504,66 @@ void QPEStyle::drawButton( QPainter *p, int x, int y, int w, int h,
     int y2 = y+h-1;
 
     p->drawLine( x, y, x, y2 );
     p->drawLine( x, y, x2, y );
 
     if ( sunken )
         p->setPen( g.light() );
     else
         p->setPen( g.dark() );
 
     p->drawLine( x2, y, x2, y2 );
     p->drawLine( x, y2, x2, y2 );
     p->setPen( oldPen );
 
     p->fillRect( x+1, y+1, w-2, h-2, fill?(*fill):g.brush(QColorGroup::Button) );
 }
 
 void QPEStyle::drawButtonMask ( QPainter * p, int x, int y, int w, int h )
 {
     p->fillRect( x, y, w, h, color1 );
 }
 
 void QPEStyle::drawBevelButton( QPainter *p, int x, int y, int w, int h,
                                 const QColorGroup &g, bool sunken, const QBrush* fill )
 {
     drawButton( p, x, y, w, h, g, sunken, fill );
 }
 
 QRect QPEStyle::comboButtonRect( int x, int y, int w, int h)
 {
     return QRect(x+1, y+1, w-2-14, h-2);
 }
-      
-       
+
+
 QRect QPEStyle::comboButtonFocusRect( int x, int y, int w, int h)
 {
     return QRect(x+2, y+2, w-4-14, h-4);
 }
 
 void QPEStyle::drawComboButton( QPainter *p, int x, int y, int w, int h,
                                      const QColorGroup &g, bool sunken,
                                      bool /*editable*/,
                                      bool enabled,
                                      const QBrush *fill )
 {
     drawBevelButton( p, x, y, w, h, g, FALSE, fill );
     drawBevelButton( p, x+w-14, y, 14, h, g, sunken, fill );
     drawArrow( p, QStyle::DownArrow, sunken,
                x+w-14+ 2, y+ 2, 14- 4, h- 4, g, enabled,
                &g.brush( QColorGroup::Button ) );
 
 }
 
 
 void QPEStyle::drawExclusiveIndicator ( QPainter * p, int x, int y, int w,
         int h, const QColorGroup & g, bool on, bool down, bool enabled )
 {
     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 };
 
     p->eraseRect( x, y, w, h );
@@ -889,65 +889,65 @@ void QPEStyle::drawSliderGrooveMask( QPainter *p,
         p->fillRect( x, y + c - 2,  w, 4, color1 );
     else
         p->fillRect( x + c - 2, y, 4, h, color1 );
 }
 
 void QPEStyle::drawTab( QPainter *p, const QTabBar *tb, QTab *t, bool selected )
 {
     QRect r( t->rect() );
     if ( tb->shape()  == QTabBar::RoundedAbove ) {
         p->setPen( tb->colorGroup().light() );
         p->drawLine( r.left(), r.bottom(), r.right(), r.bottom() );
         if ( r.left() == 0 )
             p->drawPoint( tb->rect().bottomLeft() );
         else {
             p->setPen( tb->colorGroup().light() );
             p->drawLine( r.left(), r.bottom(), r.right(), r.bottom() );
         }
 
         if ( selected ) {
             p->setPen( tb->colorGroup().background() );
             p->drawLine( r.left()+2, r.top()+1, r.right()-2, r.top()+1 );
             p->fillRect( QRect( r.left()+1, r.top()+2, r.width()-2, r.height()-2),
                          tb->colorGroup().brush( QColorGroup::Background ));
         } else {
             r.setRect( r.left() + 2, r.top() + 2,
                        r.width() - 4, r.height() - 2 );
             p->setPen( tb->colorGroup().button() );
             p->drawLine( r.left()+2, r.top()+1, r.right()-2, r.top()+1 );
             p->fillRect( QRect( r.left()+1, r.top()+2, r.width()-2, r.height()-3),
                          tb->colorGroup().brush( QColorGroup::Button ));
 
             //do shading; will not work for pixmap brushes
-            QColor bg = tb->colorGroup().button(); 
+            QColor bg = tb->colorGroup().button();
                     //    int h,s,v;
                     //    bg.hsv( &h, &s, &v );
             int n = r.height()/2;
             int dark = 100;
             for ( int i = 1; i < n; i++ ) {
                 dark = (dark * (100+(i*15)/n) )/100;
                 p->setPen( bg.dark( dark ) );
                 int y = r.bottom()-n+i;
                 int x1 = r.left()+1;
                 int x2 = r.right()-1;
                 p->drawLine( x1, y, x2, y );
             }
         }
 
         p->setPen( tb->colorGroup().light() );
         p->drawLine( r.left(), r.bottom()-1, r.left(), r.top() + 2 );
         p->drawPoint( r.left()+1, r.top() + 1 );
         p->drawLine( r.left()+2, r.top(),
                      r.right() - 2, r.top() );
 
         p->setPen( tb->colorGroup().dark() );
         p->drawPoint( r.right() - 1, r.top() + 1 );
         p->drawLine( r.right(), r.top() + 2, r.right(), r.bottom() - 1);
     } else if ( tb->shape() == QTabBar::RoundedBelow ) {
         if ( selected ) {
             p->setPen( tb->colorGroup().background() );
             p->drawLine( r.left()+2, r.bottom()-1, r.right()-2, r.bottom()-1 );
             p->fillRect( QRect( r.left()+1, r.top(), r.width()-2, r.height()-2),
                          tb->palette().normal().brush( QColorGroup::Background ));
         } else {
             p->setPen( tb->colorGroup().dark() );
             p->drawLine( r.left(), r.top(),
@@ -999,87 +999,87 @@ int QPEStyle::extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem* mi
     if ( mi->isSeparator() )
         return 10; // arbitrary
     else if ( mi->pixmap() )
                 w += mi->pixmap()->width();// pixmap only
 
     if ( !mi->text().isNull() ) {
                 if ( mi->text().find('\t') >= 0 )// string contains tab
             w += motifTabSpacing;
     }
 
     if ( maxpmw ) { // we have iconsets
         w += maxpmw;
         w += 6; // add a little extra border around the iconset
     }
 
     if ( checkable && maxpmw < windowsCheckMarkWidth ) {
         w += windowsCheckMarkWidth - maxpmw; // space for the checkmarks
     }
 
     if ( maxpmw > 0 || checkable ) // we have a check-column ( iconsets or checkmarks)
         w += motifCheckMarkHMargin; // add space to separate the columns
 
     w += windowsRightBorder; // windows has a strange wide border on the right side
 
     return w;
 #endif
 }
 
 /*! \reimp
 */
 int QPEStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFontMetrics& fm )
 {
-#ifndef QT_NO_MENUDATA    
+#ifndef QT_NO_MENUDATA
     int h = 0;
             if ( mi->isSeparator() )            // separator height
         h = motifSepHeight;
             else if ( mi->pixmap() )    // pixmap height
         h = mi->pixmap()->height() + 2*motifItemFrame;
             else                                // text height
         h = fm.height() + 2*motifItemVMargin + 2*motifItemFrame - 1;
 
     if ( !mi->isSeparator() && mi->iconSet() != 0 ) {
         h = QMAX( h, mi->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height() + 2*motifItemFrame );
     }
     if ( mi->custom() )
         h = QMAX( h, mi->custom()->sizeHint().height() + 2*motifItemVMargin + 2*motifItemFrame ) - 1;
     return h;
 #endif
 }
 
 void QPEStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int tab, QMenuItem* mi,
                                        const QPalette& pal,
                                        bool act, bool enabled, int x, int y, int w, int h)
 {
-#ifndef QT_NO_MENUDATA    
+#ifndef QT_NO_MENUDATA
     const QColorGroup & g = pal.active();
             bool dis  = !enabled;
     QColorGroup itemg = dis ? pal.disabled() : pal.active();
 
     if ( checkable )
         maxpmw = QMAX( maxpmw, 8 ); // space for the checkmarks
 
             int checkcol  =     maxpmw;
 
             if ( mi && mi->isSeparator() ) {            // draw separator
         p->setPen( g.dark() );
         p->drawLine( x, y, x+w, y );
         p->setPen( g.light() );
         p->drawLine( x, y+1, x+w, y+1 );
         return;
     }
 
     QBrush fill = act? g.brush( QColorGroup::Highlight ) :
                             g.brush( QColorGroup::Button );
     p->fillRect( x, y, w, h, fill);
 
     if ( !mi )
         return;
 
     if ( mi->isChecked() ) {
         if ( act && !dis ) {
             qDrawShadePanel( p, x, y, checkcol, h,
                              g, TRUE, 1, &g.brush( QColorGroup::Button ) );
         } else {
             qDrawShadePanel( p, x, y, checkcol, h,
                              g, TRUE, 1, &g.brush( QColorGroup::Midlight ) );
         }