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
@@ -14,17 +14,17 @@
 ** 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
 
@@ -219,17 +219,17 @@ void QPEStyle::drawControl( ControlElement ce, QPainter *p,
                     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;
@@ -528,18 +528,18 @@ void QPEStyle::drawBevelButton( QPainter *p, int x, int y, int w, int h,
 {
     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*/,
@@ -913,17 +913,17 @@ void QPEStyle::drawTab( QPainter *p, const QTabBar *tb, QTab *t, bool selected )
             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;
@@ -1023,17 +1023,17 @@ int QPEStyle::extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem* mi
     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;
 
@@ -1045,17 +1045,17 @@ int QPEStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFon
     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;