author | zecke <zecke> | 2002-10-15 21:42:20 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-15 21:42:20 (UTC) |
commit | 676be5604cbdb3213c00775e0ff66f4e766f8dcb (patch) (unidiff) | |
tree | 63c29adab530a60371f78880ff75e2689398e239 /library/qpestyle.cpp | |
parent | b774e015816e51ac65e5d1c685306f8404a3a19e (diff) | |
download | opie-676be5604cbdb3213c00775e0ff66f4e766f8dcb.zip opie-676be5604cbdb3213c00775e0ff66f4e766f8dcb.tar.gz opie-676be5604cbdb3213c00775e0ff66f4e766f8dcb.tar.bz2 |
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...
-rw-r--r-- | library/qpestyle.cpp | 14 |
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 | |||
@@ -20,5 +20,5 @@ | |||
20 | 20 | ||
21 | #include "qpestyle.h" | 21 | #include "qpestyle.h" |
22 | #include "qpeapplication.h" | 22 | #include <qpe/qpeapplication.h> |
23 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
24 | 24 | ||
@@ -225,5 +225,5 @@ void QPEStyle::drawControl( ControlElement ce, QPainter *p, | |||
225 | 225 | ||
226 | //do shading; will not work for pixmap brushes | 226 | //do shading; will not work for pixmap brushes |
227 | QColor bg = cg.button(); | 227 | QColor bg = cg.button(); |
228 | // int h,s,v; | 228 | // int h,s,v; |
229 | // bg.hsv( &h, &s, &v ); | 229 | // bg.hsv( &h, &s, &v ); |
@@ -534,6 +534,6 @@ QRect QPEStyle::comboButtonRect( int x, int y, int w, int h) | |||
534 | return QRect(x+1, y+1, w-2-14, h-2); | 534 | return QRect(x+1, y+1, w-2-14, h-2); |
535 | } | 535 | } |
536 | 536 | ||
537 | 537 | ||
538 | QRect QPEStyle::comboButtonFocusRect( int x, int y, int w, int h) | 538 | QRect QPEStyle::comboButtonFocusRect( int x, int y, int w, int h) |
539 | { | 539 | { |
@@ -919,5 +919,5 @@ void QPEStyle::drawTab( QPainter *p, const QTabBar *tb, QTab *t, bool selected ) | |||
919 | 919 | ||
920 | //do shading; will not work for pixmap brushes | 920 | //do shading; will not work for pixmap brushes |
921 | QColor bg = tb->colorGroup().button(); | 921 | QColor bg = tb->colorGroup().button(); |
922 | // int h,s,v; | 922 | // int h,s,v; |
923 | // bg.hsv( &h, &s, &v ); | 923 | // bg.hsv( &h, &s, &v ); |
@@ -1029,5 +1029,5 @@ int QPEStyle::extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem* mi | |||
1029 | int QPEStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFontMetrics& fm ) | 1029 | int QPEStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFontMetrics& fm ) |
1030 | { | 1030 | { |
1031 | #ifndef QT_NO_MENUDATA | 1031 | #ifndef QT_NO_MENUDATA |
1032 | int h = 0; | 1032 | int h = 0; |
1033 | if ( mi->isSeparator() ) // separator height | 1033 | if ( mi->isSeparator() ) // separator height |
@@ -1051,5 +1051,5 @@ void QPEStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int t | |||
1051 | bool act, bool enabled, int x, int y, int w, int h) | 1051 | bool act, bool enabled, int x, int y, int w, int h) |
1052 | { | 1052 | { |
1053 | #ifndef QT_NO_MENUDATA | 1053 | #ifndef QT_NO_MENUDATA |
1054 | const QColorGroup & g = pal.active(); | 1054 | const QColorGroup & g = pal.active(); |
1055 | bool dis = !enabled; | 1055 | bool dis = !enabled; |