author | zecke <zecke> | 2004-02-05 17:42:00 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-05 17:42:00 (UTC) |
commit | c79bbb6696edf7539ebeda64092f3f91f65ba500 (patch) (unidiff) | |
tree | cb05c94b563d42bb27628d398dbb28beebdee46d /noncore/styles | |
parent | 4ce8201e80a0b60a8e5d9d875bf00602303d6a0b (diff) | |
download | opie-c79bbb6696edf7539ebeda64092f3f91f65ba500.zip opie-c79bbb6696edf7539ebeda64092f3f91f65ba500.tar.gz opie-c79bbb6696edf7539ebeda64092f3f91f65ba500.tar.bz2 |
Janitor: remove ulong ref
-rw-r--r-- | noncore/styles/flat/flat.cpp | 2 | ||||
-rw-r--r-- | noncore/styles/flat/flat.h | 1 | ||||
-rw-r--r-- | noncore/styles/fresh/fresh.cpp | 4 | ||||
-rw-r--r-- | noncore/styles/fresh/fresh.h | 1 | ||||
-rw-r--r-- | noncore/styles/liquid/plugin.cpp | 4 | ||||
-rw-r--r-- | noncore/styles/liquid/plugin.h | 1 | ||||
-rw-r--r-- | noncore/styles/metal/plugin.cpp | 4 | ||||
-rw-r--r-- | noncore/styles/metal/plugin.h | 2 | ||||
-rw-r--r-- | noncore/styles/theme/plugin.cpp | 4 | ||||
-rw-r--r-- | noncore/styles/theme/plugin.h | 1 |
10 files changed, 13 insertions, 11 deletions
diff --git a/noncore/styles/flat/flat.cpp b/noncore/styles/flat/flat.cpp index 24366f6..f3bacf9 100644 --- a/noncore/styles/flat/flat.cpp +++ b/noncore/styles/flat/flat.cpp | |||
@@ -1013,90 +1013,90 @@ void FlatStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int | |||
1013 | p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame+1, | 1013 | p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame+1, |
1014 | y+m+1, tab, h-2*m, text_flags, s.mid( t+1 )); | 1014 | y+m+1, tab, h-2*m, text_flags, s.mid( t+1 )); |
1015 | p->setPen( discol ); | 1015 | p->setPen( discol ); |
1016 | } | 1016 | } |
1017 | p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame, | 1017 | p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame, |
1018 | y+m, tab, h-2*m, text_flags, s.mid( t+1 ) ); | 1018 | y+m, tab, h-2*m, text_flags, s.mid( t+1 ) ); |
1019 | } | 1019 | } |
1020 | if ( dis && !act ) | 1020 | if ( dis && !act ) |
1021 | p->setPen( discol ); | 1021 | p->setPen( discol ); |
1022 | p->drawText( x+xm, y+m, w-xm-tab+1, h-2*m, text_flags, s, t ); | 1022 | p->drawText( x+xm, y+m, w-xm-tab+1, h-2*m, text_flags, s, t ); |
1023 | } else if ( mi->pixmap() ) { // draw pixmap | 1023 | } else if ( mi->pixmap() ) { // draw pixmap |
1024 | QPixmap *pixmap = mi->pixmap(); | 1024 | QPixmap *pixmap = mi->pixmap(); |
1025 | if ( pixmap->depth() == 1 ) | 1025 | if ( pixmap->depth() == 1 ) |
1026 | p->setBackgroundMode( OpaqueMode ); | 1026 | p->setBackgroundMode( OpaqueMode ); |
1027 | p->drawPixmap( x+xm, y+motifItemFrame, *pixmap ); | 1027 | p->drawPixmap( x+xm, y+motifItemFrame, *pixmap ); |
1028 | if ( pixmap->depth() == 1 ) | 1028 | if ( pixmap->depth() == 1 ) |
1029 | p->setBackgroundMode( TransparentMode ); | 1029 | p->setBackgroundMode( TransparentMode ); |
1030 | } | 1030 | } |
1031 | if ( mi->popup() ) { // draw sub menu arrow | 1031 | if ( mi->popup() ) { // draw sub menu arrow |
1032 | int dim = (h-2*motifItemFrame) / 2; | 1032 | int dim = (h-2*motifItemFrame) / 2; |
1033 | if ( act ) { | 1033 | if ( act ) { |
1034 | if ( !dis ) | 1034 | if ( !dis ) |
1035 | discol = white; | 1035 | discol = white; |
1036 | QColorGroup g2( discol, g.highlight(), | 1036 | QColorGroup g2( discol, g.highlight(), |
1037 | white, white, | 1037 | white, white, |
1038 | dis ? discol : white, | 1038 | dis ? discol : white, |
1039 | discol, white ); | 1039 | discol, white ); |
1040 | drawArrow( p, RightArrow, FALSE, | 1040 | drawArrow( p, RightArrow, FALSE, |
1041 | x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2, | 1041 | x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2, |
1042 | dim, dim, g2, TRUE ); | 1042 | dim, dim, g2, TRUE ); |
1043 | } else { | 1043 | } else { |
1044 | drawArrow( p, RightArrow, | 1044 | drawArrow( p, RightArrow, |
1045 | FALSE, | 1045 | FALSE, |
1046 | x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2, | 1046 | x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2, |
1047 | dim, dim, g, mi->isEnabled() ); | 1047 | dim, dim, g, mi->isEnabled() ); |
1048 | } | 1048 | } |
1049 | } | 1049 | } |
1050 | #endif | 1050 | #endif |
1051 | } | 1051 | } |
1052 | 1052 | ||
1053 | void FlatStyle::getButtonShift( int &x, int &y ) | 1053 | void FlatStyle::getButtonShift( int &x, int &y ) |
1054 | { | 1054 | { |
1055 | x = 0; y = 0; | 1055 | x = 0; y = 0; |
1056 | } | 1056 | } |
1057 | 1057 | ||
1058 | //=========================================================================== | 1058 | //=========================================================================== |
1059 | 1059 | ||
1060 | FlatStyleImpl::FlatStyleImpl() | 1060 | FlatStyleImpl::FlatStyleImpl() |
1061 | : flat(0), ref(0) | 1061 | : flat(0) |
1062 | { | 1062 | { |
1063 | } | 1063 | } |
1064 | 1064 | ||
1065 | FlatStyleImpl::~FlatStyleImpl() | 1065 | FlatStyleImpl::~FlatStyleImpl() |
1066 | { | 1066 | { |
1067 | // We do not delete the style because Qt does that when a new style | 1067 | // We do not delete the style because Qt does that when a new style |
1068 | // is set. | 1068 | // is set. |
1069 | } | 1069 | } |
1070 | 1070 | ||
1071 | QStyle *FlatStyleImpl::style() | 1071 | QStyle *FlatStyleImpl::style() |
1072 | { | 1072 | { |
1073 | if ( !flat ) | 1073 | if ( !flat ) |
1074 | flat = new FlatStyle(); | 1074 | flat = new FlatStyle(); |
1075 | return flat; | 1075 | return flat; |
1076 | } | 1076 | } |
1077 | 1077 | ||
1078 | QString FlatStyleImpl::name() const | 1078 | QString FlatStyleImpl::name() const |
1079 | { | 1079 | { |
1080 | return qApp->translate("FlatStyle", "Flat", "Name of the style Flat"); | 1080 | return qApp->translate("FlatStyle", "Flat", "Name of the style Flat"); |
1081 | } | 1081 | } |
1082 | 1082 | ||
1083 | QRESULT FlatStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 1083 | QRESULT FlatStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
1084 | { | 1084 | { |
1085 | *iface = 0; | 1085 | *iface = 0; |
1086 | if ( uuid == IID_QUnknown ) | 1086 | if ( uuid == IID_QUnknown ) |
1087 | *iface = this; | 1087 | *iface = this; |
1088 | else if ( uuid == IID_Style ) | 1088 | else if ( uuid == IID_Style ) |
1089 | *iface = this; | 1089 | *iface = this; |
1090 | else | 1090 | else |
1091 | return QS_FALSE; | 1091 | return QS_FALSE; |
1092 | 1092 | ||
1093 | (*iface)->addRef(); | 1093 | (*iface)->addRef(); |
1094 | return QS_OK; | 1094 | return QS_OK; |
1095 | } | 1095 | } |
1096 | 1096 | ||
1097 | Q_EXPORT_INTERFACE() | 1097 | Q_EXPORT_INTERFACE() |
1098 | { | 1098 | { |
1099 | Q_CREATE_INSTANCE( FlatStyleImpl ) | 1099 | Q_CREATE_INSTANCE( FlatStyleImpl ) |
1100 | } | 1100 | } |
1101 | 1101 | ||
1102 | #include "flat.moc" | 1102 | #include "flat.moc" |
diff --git a/noncore/styles/flat/flat.h b/noncore/styles/flat/flat.h index ebea95b..4591852 100644 --- a/noncore/styles/flat/flat.h +++ b/noncore/styles/flat/flat.h | |||
@@ -67,52 +67,51 @@ public: | |||
67 | const QColorGroup &g, bool horizontal ); | 67 | const QColorGroup &g, bool horizontal ); |
68 | int sliderLength() const; | 68 | int sliderLength() const; |
69 | void drawSlider( QPainter *p, int x, int y, int w, int h, | 69 | void drawSlider( QPainter *p, int x, int y, int w, int h, |
70 | const QColorGroup &g, Orientation, bool tickAbove, bool tickBelow ); | 70 | const QColorGroup &g, Orientation, bool tickAbove, bool tickBelow ); |
71 | void drawSliderMask( QPainter *p, int x, int y, int w, int h, | 71 | void drawSliderMask( QPainter *p, int x, int y, int w, int h, |
72 | Orientation, bool tickAbove, bool tickBelow ); | 72 | Orientation, bool tickAbove, bool tickBelow ); |
73 | void drawSliderGrooveMask( QPainter *p, int x, int y, int w, int h, | 73 | void drawSliderGrooveMask( QPainter *p, int x, int y, int w, int h, |
74 | const QColorGroup& , QCOORD c, Orientation orient ); | 74 | const QColorGroup& , QCOORD c, Orientation orient ); |
75 | void drawSliderGroove ( QPainter * p, int x, int y, int w, int h, const QColorGroup & g, QCOORD c, Orientation ); | 75 | void drawSliderGroove ( QPainter * p, int x, int y, int w, int h, const QColorGroup & g, QCOORD c, Orientation ); |
76 | void drawTab( QPainter *, const QTabBar *, QTab *, bool selected ); | 76 | void drawTab( QPainter *, const QTabBar *, QTab *, bool selected ); |
77 | void polishPopupMenu ( QPopupMenu * ); | 77 | void polishPopupMenu ( QPopupMenu * ); |
78 | int extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem*, const QFontMetrics& ); | 78 | int extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem*, const QFontMetrics& ); |
79 | int popupMenuItemHeight( bool checkable, QMenuItem*, const QFontMetrics& ); | 79 | int popupMenuItemHeight( bool checkable, QMenuItem*, const QFontMetrics& ); |
80 | void drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int tab, QMenuItem* mi, | 80 | void drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int tab, QMenuItem* mi, |
81 | const QPalette& pal, | 81 | const QPalette& pal, |
82 | bool act, bool enabled, int x, int y, int w, int h); | 82 | bool act, bool enabled, int x, int y, int w, int h); |
83 | 83 | ||
84 | int buttonMargin() const; | 84 | int buttonMargin() const; |
85 | QSize scrollBarExtent() const; | 85 | QSize scrollBarExtent() const; |
86 | void getButtonShift( int &x, int &y ); | 86 | void getButtonShift( int &x, int &y ); |
87 | 87 | ||
88 | private: | 88 | private: |
89 | FlatStylePrivate *d; | 89 | FlatStylePrivate *d; |
90 | bool revItem; | 90 | bool revItem; |
91 | bool fillBtnBorder; | 91 | bool fillBtnBorder; |
92 | QColor btnBg; | 92 | QColor btnBg; |
93 | // Disabled copy constructor and operator= | 93 | // Disabled copy constructor and operator= |
94 | #if defined(Q_DISABLE_COPY) | 94 | #if defined(Q_DISABLE_COPY) |
95 | FlatStyle( const FlatStyle & ); | 95 | FlatStyle( const FlatStyle & ); |
96 | FlatStyle& operator=( const FlatStyle & ); | 96 | FlatStyle& operator=( const FlatStyle & ); |
97 | #endif | 97 | #endif |
98 | }; | 98 | }; |
99 | 99 | ||
100 | 100 | ||
101 | class FlatStyleImpl : public StyleInterface | 101 | class FlatStyleImpl : public StyleInterface |
102 | { | 102 | { |
103 | public: | 103 | public: |
104 | FlatStyleImpl(); | 104 | FlatStyleImpl(); |
105 | virtual ~FlatStyleImpl(); | 105 | virtual ~FlatStyleImpl(); |
106 | 106 | ||
107 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 107 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
108 | Q_REFCOUNT | 108 | Q_REFCOUNT |
109 | 109 | ||
110 | virtual QStyle *style(); | 110 | virtual QStyle *style(); |
111 | virtual QString name() const; | 111 | virtual QString name() const; |
112 | 112 | ||
113 | private: | 113 | private: |
114 | FlatStyle *flat; | 114 | FlatStyle *flat; |
115 | ulong ref; | ||
116 | }; | 115 | }; |
117 | 116 | ||
118 | #endif // FLATSTYLE_H | 117 | #endif // FLATSTYLE_H |
diff --git a/noncore/styles/fresh/fresh.cpp b/noncore/styles/fresh/fresh.cpp index 0730329..831b620 100644 --- a/noncore/styles/fresh/fresh.cpp +++ b/noncore/styles/fresh/fresh.cpp | |||
@@ -759,88 +759,90 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int | |||
759 | if ( dis && !act ) { | 759 | if ( dis && !act ) { |
760 | p->setPen( g.light() ); | 760 | p->setPen( g.light() ); |
761 | p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame+1, | 761 | p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame+1, |
762 | y+m+1, tab, h-2*m, text_flags, s.mid( t+1 )); | 762 | y+m+1, tab, h-2*m, text_flags, s.mid( t+1 )); |
763 | p->setPen( discol ); | 763 | p->setPen( discol ); |
764 | } | 764 | } |
765 | p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame, | 765 | p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame, |
766 | y+m, tab, h-2*m, text_flags, s.mid( t+1 ) ); | 766 | y+m, tab, h-2*m, text_flags, s.mid( t+1 ) ); |
767 | } | 767 | } |
768 | if ( dis && !act ) { | 768 | if ( dis && !act ) { |
769 | p->setPen( g.light() ); | 769 | p->setPen( g.light() ); |
770 | p->drawText( x+xm+1, y+m+1, w-xm+1, h-2*m, text_flags, s, t ); | 770 | p->drawText( x+xm+1, y+m+1, w-xm+1, h-2*m, text_flags, s, t ); |
771 | p->setPen( discol ); | 771 | p->setPen( discol ); |
772 | } | 772 | } |
773 | p->drawText( x+xm, y+m, w-xm-tab+1, h-2*m, text_flags, s, t ); | 773 | p->drawText( x+xm, y+m, w-xm-tab+1, h-2*m, text_flags, s, t ); |
774 | } else if ( mi->pixmap() ) { // draw pixmap | 774 | } else if ( mi->pixmap() ) { // draw pixmap |
775 | QPixmap *pixmap = mi->pixmap(); | 775 | QPixmap *pixmap = mi->pixmap(); |
776 | if ( pixmap->depth() == 1 ) | 776 | if ( pixmap->depth() == 1 ) |
777 | p->setBackgroundMode( OpaqueMode ); | 777 | p->setBackgroundMode( OpaqueMode ); |
778 | p->drawPixmap( x+xm, y+motifItemFrame, *pixmap ); | 778 | p->drawPixmap( x+xm, y+motifItemFrame, *pixmap ); |
779 | if ( pixmap->depth() == 1 ) | 779 | if ( pixmap->depth() == 1 ) |
780 | p->setBackgroundMode( TransparentMode ); | 780 | p->setBackgroundMode( TransparentMode ); |
781 | } | 781 | } |
782 | if ( mi->popup() ) { // draw sub menu arrow | 782 | if ( mi->popup() ) { // draw sub menu arrow |
783 | int dim = (h-2*motifItemFrame) / 2; | 783 | int dim = (h-2*motifItemFrame) / 2; |
784 | if ( act ) { | 784 | if ( act ) { |
785 | if ( !dis ) | 785 | if ( !dis ) |
786 | discol = white; | 786 | discol = white; |
787 | QColorGroup g2( discol, g.highlight(), | 787 | QColorGroup g2( discol, g.highlight(), |
788 | white, white, | 788 | white, white, |
789 | dis ? discol : white, | 789 | dis ? discol : white, |
790 | discol, white ); | 790 | discol, white ); |
791 | drawArrow( p, RightArrow, FALSE, | 791 | drawArrow( p, RightArrow, FALSE, |
792 | x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2, | 792 | x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2, |
793 | dim, dim, g2, TRUE ); | 793 | dim, dim, g2, TRUE ); |
794 | } else { | 794 | } else { |
795 | drawArrow( p, RightArrow, | 795 | drawArrow( p, RightArrow, |
796 | FALSE, | 796 | FALSE, |
797 | x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2, | 797 | x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2, |
798 | dim, dim, g, mi->isEnabled() ); | 798 | dim, dim, g, mi->isEnabled() ); |
799 | } | 799 | } |
800 | } | 800 | } |
801 | #endif | 801 | #endif |
802 | } | 802 | } |
803 | 803 | ||
804 | //=========================================================================== | 804 | //=========================================================================== |
805 | 805 | ||
806 | FreshStyleImpl::FreshStyleImpl() | 806 | FreshStyleImpl::FreshStyleImpl() |
807 | : fresh(0), ref(0) | 807 | : fresh(0) |
808 | { | 808 | { |
809 | } | 809 | } |
810 | 810 | ||
811 | FreshStyleImpl::~FreshStyleImpl() | 811 | FreshStyleImpl::~FreshStyleImpl() |
812 | { | 812 | { |
813 | // We do not delete the style because Qt does that when a new style | 813 | // We do not delete the style because Qt does that when a new style |
814 | // is set. | 814 | // is set. |
815 | } | 815 | } |
816 | 816 | ||
817 | QStyle *FreshStyleImpl::style() | 817 | QStyle *FreshStyleImpl::style() |
818 | { | 818 | { |
819 | if ( !fresh ) | 819 | if ( !fresh ) |
820 | fresh = new FreshStyle(); | 820 | fresh = new FreshStyle(); |
821 | return fresh; | 821 | return fresh; |
822 | } | 822 | } |
823 | 823 | ||
824 | QString FreshStyleImpl::name() const | 824 | QString FreshStyleImpl::name() const |
825 | { | 825 | { |
826 | return QString("Fresh"); | 826 | return QString("Fresh"); |
827 | } | 827 | } |
828 | 828 | ||
829 | QRESULT FreshStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 829 | QRESULT FreshStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
830 | { | 830 | { |
831 | *iface = 0; | 831 | *iface = 0; |
832 | if ( uuid == IID_QUnknown ) | 832 | if ( uuid == IID_QUnknown ) |
833 | *iface = this; | 833 | *iface = this; |
834 | else if ( uuid == IID_Style ) | 834 | else if ( uuid == IID_Style ) |
835 | *iface = this; | 835 | *iface = this; |
836 | else | ||
837 | return QS_FALSE; | ||
836 | 838 | ||
837 | if ( *iface ) | 839 | if ( *iface ) |
838 | (*iface)->addRef(); | 840 | (*iface)->addRef(); |
839 | return QS_OK; | 841 | return QS_OK; |
840 | } | 842 | } |
841 | 843 | ||
842 | Q_EXPORT_INTERFACE() | 844 | Q_EXPORT_INTERFACE() |
843 | { | 845 | { |
844 | Q_CREATE_INSTANCE( FreshStyleImpl ) | 846 | Q_CREATE_INSTANCE( FreshStyleImpl ) |
845 | } | 847 | } |
846 | 848 | ||
diff --git a/noncore/styles/fresh/fresh.h b/noncore/styles/fresh/fresh.h index b4be7f3..a72a83f 100644 --- a/noncore/styles/fresh/fresh.h +++ b/noncore/styles/fresh/fresh.h | |||
@@ -49,52 +49,51 @@ public: | |||
49 | void drawExclusiveIndicator ( QPainter * p, int x, int y, int w, int h, | 49 | void drawExclusiveIndicator ( QPainter * p, int x, int y, int w, int h, |
50 | const QColorGroup & g, bool on, bool down = FALSE, bool enabled = TRUE ); | 50 | const QColorGroup & g, bool on, bool down = FALSE, bool enabled = TRUE ); |
51 | void drawIndicator ( QPainter * p, int x, int y, int w, int h, | 51 | void drawIndicator ( QPainter * p, int x, int y, int w, int h, |
52 | const QColorGroup & g, int state, bool down = FALSE, bool enabled = TRUE ); | 52 | const QColorGroup & g, int state, bool down = FALSE, bool enabled = TRUE ); |
53 | void scrollBarMetrics( const QScrollBar*, int&, int&, int&, int&); | 53 | void scrollBarMetrics( const QScrollBar*, int&, int&, int&, int&); |
54 | void drawScrollBarControls( QPainter*, const QScrollBar*, int sliderStart, uint controls, uint activeControl ); | 54 | void drawScrollBarControls( QPainter*, const QScrollBar*, int sliderStart, uint controls, uint activeControl ); |
55 | ScrollControl scrollBarPointOver( const QScrollBar* sb, int sliderStart, const QPoint& p ); | 55 | ScrollControl scrollBarPointOver( const QScrollBar* sb, int sliderStart, const QPoint& p ); |
56 | void drawRiffles( QPainter* p, int x, int y, int w, int h, | 56 | void drawRiffles( QPainter* p, int x, int y, int w, int h, |
57 | const QColorGroup &g, bool horizontal ); | 57 | const QColorGroup &g, bool horizontal ); |
58 | int sliderLength() const; | 58 | int sliderLength() const; |
59 | void drawSlider( QPainter *p, int x, int y, int w, int h, | 59 | void drawSlider( QPainter *p, int x, int y, int w, int h, |
60 | const QColorGroup &g, Orientation, bool tickAbove, bool tickBelow ); | 60 | const QColorGroup &g, Orientation, bool tickAbove, bool tickBelow ); |
61 | void drawSliderMask( QPainter *p, int x, int y, int w, int h, | 61 | void drawSliderMask( QPainter *p, int x, int y, int w, int h, |
62 | Orientation, bool tickAbove, bool tickBelow ); | 62 | Orientation, bool tickAbove, bool tickBelow ); |
63 | void drawSliderGrooveMask( QPainter *p, int x, int y, int w, int h, | 63 | void drawSliderGrooveMask( QPainter *p, int x, int y, int w, int h, |
64 | const QColorGroup& , QCOORD c, Orientation orient ); | 64 | const QColorGroup& , QCOORD c, Orientation orient ); |
65 | void drawTab( QPainter *, const QTabBar *, QTab *, bool selected ); | 65 | void drawTab( QPainter *, const QTabBar *, QTab *, bool selected ); |
66 | int extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem*, const QFontMetrics& ); | 66 | int extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem*, const QFontMetrics& ); |
67 | int popupMenuItemHeight( bool checkable, QMenuItem*, const QFontMetrics& ); | 67 | int popupMenuItemHeight( bool checkable, QMenuItem*, const QFontMetrics& ); |
68 | void drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int tab, QMenuItem* mi, | 68 | void drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int tab, QMenuItem* mi, |
69 | const QPalette& pal, | 69 | const QPalette& pal, |
70 | bool act, bool enabled, int x, int y, int w, int h); | 70 | bool act, bool enabled, int x, int y, int w, int h); |
71 | 71 | ||
72 | int buttonMargin() const; | 72 | int buttonMargin() const; |
73 | QSize scrollBarExtent() const; | 73 | QSize scrollBarExtent() const; |
74 | 74 | ||
75 | private:// Disabled copy constructor and operator= | 75 | private:// Disabled copy constructor and operator= |
76 | #if defined(Q_DISABLE_COPY) | 76 | #if defined(Q_DISABLE_COPY) |
77 | FreshStyle( const FreshStyle & ); | 77 | FreshStyle( const FreshStyle & ); |
78 | FreshStyle& operator=( const FreshStyle & ); | 78 | FreshStyle& operator=( const FreshStyle & ); |
79 | #endif | 79 | #endif |
80 | }; | 80 | }; |
81 | 81 | ||
82 | 82 | ||
83 | class FreshStyleImpl : public StyleInterface | 83 | class FreshStyleImpl : public StyleInterface |
84 | { | 84 | { |
85 | public: | 85 | public: |
86 | FreshStyleImpl(); | 86 | FreshStyleImpl(); |
87 | virtual ~FreshStyleImpl(); | 87 | virtual ~FreshStyleImpl(); |
88 | 88 | ||
89 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 89 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
90 | Q_REFCOUNT | 90 | Q_REFCOUNT |
91 | 91 | ||
92 | virtual QStyle *style(); | 92 | virtual QStyle *style(); |
93 | virtual QString name() const; | 93 | virtual QString name() const; |
94 | 94 | ||
95 | private: | 95 | private: |
96 | FreshStyle *fresh; | 96 | FreshStyle *fresh; |
97 | ulong ref; | ||
98 | }; | 97 | }; |
99 | 98 | ||
100 | #endif // FRESHSTYLE_H | 99 | #endif // FRESHSTYLE_H |
diff --git a/noncore/styles/liquid/plugin.cpp b/noncore/styles/liquid/plugin.cpp index 6813fc5..fb322a9 100644 --- a/noncore/styles/liquid/plugin.cpp +++ b/noncore/styles/liquid/plugin.cpp | |||
@@ -1,79 +1,81 @@ | |||
1 | #include <qapplication.h> | 1 | #include <qapplication.h> |
2 | 2 | ||
3 | #include "liquid.h" | 3 | #include "liquid.h" |
4 | #include "liquidset.h" | 4 | #include "liquidset.h" |
5 | #include "plugin.h" | 5 | #include "plugin.h" |
6 | 6 | ||
7 | 7 | ||
8 | 8 | ||
9 | LiquidInterface::LiquidInterface ( ) : ref ( 0 ) | 9 | LiquidInterface::LiquidInterface ( ) |
10 | { | 10 | { |
11 | m_widget = 0; | 11 | m_widget = 0; |
12 | } | 12 | } |
13 | 13 | ||
14 | LiquidInterface::~LiquidInterface ( ) | 14 | LiquidInterface::~LiquidInterface ( ) |
15 | { | 15 | { |
16 | } | 16 | } |
17 | 17 | ||
18 | QStyle *LiquidInterface::style ( ) | 18 | QStyle *LiquidInterface::style ( ) |
19 | { | 19 | { |
20 | return new LiquidStyle ( ); | 20 | return new LiquidStyle ( ); |
21 | } | 21 | } |
22 | 22 | ||
23 | QString LiquidInterface::name ( ) const | 23 | QString LiquidInterface::name ( ) const |
24 | { | 24 | { |
25 | return qApp-> translate ( "Styles", "Liquid" ); | 25 | return qApp-> translate ( "Styles", "Liquid" ); |
26 | } | 26 | } |
27 | 27 | ||
28 | QString LiquidInterface::description ( ) const | 28 | QString LiquidInterface::description ( ) const |
29 | { | 29 | { |
30 | return qApp-> translate ( "Styles", "High Performance Liquid style by Mosfet" ); | 30 | return qApp-> translate ( "Styles", "High Performance Liquid style by Mosfet" ); |
31 | } | 31 | } |
32 | 32 | ||
33 | bool LiquidInterface::hasSettings ( ) const | 33 | bool LiquidInterface::hasSettings ( ) const |
34 | { | 34 | { |
35 | return true; | 35 | return true; |
36 | } | 36 | } |
37 | 37 | ||
38 | QWidget *LiquidInterface::create ( QWidget *parent, const char *name ) | 38 | QWidget *LiquidInterface::create ( QWidget *parent, const char *name ) |
39 | { | 39 | { |
40 | m_widget = new LiquidSettings ( parent, name ? name : "LIQUID-SETTINGS" ); | 40 | m_widget = new LiquidSettings ( parent, name ? name : "LIQUID-SETTINGS" ); |
41 | 41 | ||
42 | return m_widget; | 42 | return m_widget; |
43 | } | 43 | } |
44 | 44 | ||
45 | bool LiquidInterface::accept ( ) | 45 | bool LiquidInterface::accept ( ) |
46 | { | 46 | { |
47 | if ( !m_widget ) | 47 | if ( !m_widget ) |
48 | return false; | 48 | return false; |
49 | 49 | ||
50 | return m_widget-> writeConfig ( ); | 50 | return m_widget-> writeConfig ( ); |
51 | } | 51 | } |
52 | 52 | ||
53 | void LiquidInterface::reject ( ) | 53 | void LiquidInterface::reject ( ) |
54 | { | 54 | { |
55 | } | 55 | } |
56 | 56 | ||
57 | 57 | ||
58 | QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | 58 | QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) |
59 | { | 59 | { |
60 | *iface = 0; | 60 | *iface = 0; |
61 | 61 | ||
62 | if ( uuid == IID_QUnknown ) | 62 | if ( uuid == IID_QUnknown ) |
63 | *iface = this; | 63 | *iface = this; |
64 | else if ( uuid == IID_Style ) | 64 | else if ( uuid == IID_Style ) |
65 | *iface = this; | 65 | *iface = this; |
66 | else if ( uuid == IID_StyleExtended ) | 66 | else if ( uuid == IID_StyleExtended ) |
67 | *iface = this; | 67 | *iface = this; |
68 | else | ||
69 | return QS_FALSE; | ||
68 | 70 | ||
69 | if ( *iface ) | 71 | if ( *iface ) |
70 | (*iface)-> addRef ( ); | 72 | (*iface)-> addRef ( ); |
71 | 73 | ||
72 | return QS_OK; | 74 | return QS_OK; |
73 | } | 75 | } |
74 | 76 | ||
75 | Q_EXPORT_INTERFACE() | 77 | Q_EXPORT_INTERFACE() |
76 | { | 78 | { |
77 | Q_CREATE_INSTANCE( LiquidInterface ) | 79 | Q_CREATE_INSTANCE( LiquidInterface ) |
78 | } | 80 | } |
79 | 81 | ||
diff --git a/noncore/styles/liquid/plugin.h b/noncore/styles/liquid/plugin.h index 6a9b7ac..9188a09 100644 --- a/noncore/styles/liquid/plugin.h +++ b/noncore/styles/liquid/plugin.h | |||
@@ -1,34 +1,33 @@ | |||
1 | #ifndef __OPIE_LIQUID_PLUGIN_H__ | 1 | #ifndef __OPIE_LIQUID_PLUGIN_H__ |
2 | #define __OPIE_LIQUID_PLUGIN_H__ | 2 | #define __OPIE_LIQUID_PLUGIN_H__ |
3 | 3 | ||
4 | #include <qpe/styleinterface.h> | 4 | #include <qpe/styleinterface.h> |
5 | 5 | ||
6 | class LiquidSettings; | 6 | class LiquidSettings; |
7 | 7 | ||
8 | class LiquidInterface : public StyleExtendedInterface { | 8 | class LiquidInterface : public StyleExtendedInterface { |
9 | public: | 9 | public: |
10 | LiquidInterface ( ); | 10 | LiquidInterface ( ); |
11 | virtual ~LiquidInterface ( ); | 11 | virtual ~LiquidInterface ( ); |
12 | 12 | ||
13 | QRESULT queryInterface ( const QUuid &, QUnknownInterface ** ); | 13 | QRESULT queryInterface ( const QUuid &, QUnknownInterface ** ); |
14 | Q_REFCOUNT | 14 | Q_REFCOUNT |
15 | 15 | ||
16 | virtual QStyle *style ( ); | 16 | virtual QStyle *style ( ); |
17 | 17 | ||
18 | virtual QString name ( ) const; | 18 | virtual QString name ( ) const; |
19 | 19 | ||
20 | virtual QString description ( ) const; | 20 | virtual QString description ( ) const; |
21 | 21 | ||
22 | virtual bool hasSettings ( ) const; | 22 | virtual bool hasSettings ( ) const; |
23 | 23 | ||
24 | virtual QWidget *create ( QWidget *parent, const char *name = 0 ); | 24 | virtual QWidget *create ( QWidget *parent, const char *name = 0 ); |
25 | 25 | ||
26 | virtual bool accept ( ); | 26 | virtual bool accept ( ); |
27 | virtual void reject ( ); | 27 | virtual void reject ( ); |
28 | 28 | ||
29 | private: | 29 | private: |
30 | LiquidSettings *m_widget; | 30 | LiquidSettings *m_widget; |
31 | ulong ref; | ||
32 | }; | 31 | }; |
33 | 32 | ||
34 | #endif | 33 | #endif |
diff --git a/noncore/styles/metal/plugin.cpp b/noncore/styles/metal/plugin.cpp index 4c9f64d..2f0f530 100644 --- a/noncore/styles/metal/plugin.cpp +++ b/noncore/styles/metal/plugin.cpp | |||
@@ -1,45 +1,47 @@ | |||
1 | #include <qapplication.h> | 1 | #include <qapplication.h> |
2 | 2 | ||
3 | #include "metal.h" | 3 | #include "metal.h" |
4 | #include "plugin.h" | 4 | #include "plugin.h" |
5 | 5 | ||
6 | 6 | ||
7 | MetalInterface::MetalInterface ( ) : ref ( 0 ) | 7 | MetalInterface::MetalInterface ( ) |
8 | { | 8 | { |
9 | } | 9 | } |
10 | 10 | ||
11 | MetalInterface::~MetalInterface ( ) | 11 | MetalInterface::~MetalInterface ( ) |
12 | { | 12 | { |
13 | } | 13 | } |
14 | 14 | ||
15 | QStyle *MetalInterface::style ( ) | 15 | QStyle *MetalInterface::style ( ) |
16 | { | 16 | { |
17 | return new MetalStyle ( ); | 17 | return new MetalStyle ( ); |
18 | } | 18 | } |
19 | 19 | ||
20 | QString MetalInterface::name ( ) const | 20 | QString MetalInterface::name ( ) const |
21 | { | 21 | { |
22 | return qApp-> translate ( "Styles", "Metal" ); | 22 | return qApp-> translate ( "Styles", "Metal" ); |
23 | } | 23 | } |
24 | 24 | ||
25 | 25 | ||
26 | QRESULT MetalInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | 26 | QRESULT MetalInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) |
27 | { | 27 | { |
28 | *iface = 0; | 28 | *iface = 0; |
29 | 29 | ||
30 | if ( uuid == IID_QUnknown ) | 30 | if ( uuid == IID_QUnknown ) |
31 | *iface = this; | 31 | *iface = this; |
32 | else if ( uuid == IID_Style ) | 32 | else if ( uuid == IID_Style ) |
33 | *iface = this; | 33 | *iface = this; |
34 | else | ||
35 | return QS_FALSE; | ||
34 | 36 | ||
35 | if ( *iface ) | 37 | if ( *iface ) |
36 | (*iface)-> addRef ( ); | 38 | (*iface)-> addRef ( ); |
37 | 39 | ||
38 | return QS_OK; | 40 | return QS_OK; |
39 | } | 41 | } |
40 | 42 | ||
41 | Q_EXPORT_INTERFACE() | 43 | Q_EXPORT_INTERFACE() |
42 | { | 44 | { |
43 | Q_CREATE_INSTANCE( MetalInterface ) | 45 | Q_CREATE_INSTANCE( MetalInterface ) |
44 | } | 46 | } |
45 | 47 | ||
diff --git a/noncore/styles/metal/plugin.h b/noncore/styles/metal/plugin.h index 545aea9..7a38d62 100644 --- a/noncore/styles/metal/plugin.h +++ b/noncore/styles/metal/plugin.h | |||
@@ -1,22 +1,20 @@ | |||
1 | #ifndef __OPIE_METAL_PLUGIN_H__ | 1 | #ifndef __OPIE_METAL_PLUGIN_H__ |
2 | #define __OPIE_METAL_PLUGIN_H__ | 2 | #define __OPIE_METAL_PLUGIN_H__ |
3 | 3 | ||
4 | #include <qpe/styleinterface.h> | 4 | #include <qpe/styleinterface.h> |
5 | 5 | ||
6 | 6 | ||
7 | class MetalInterface : public StyleInterface { | 7 | class MetalInterface : public StyleInterface { |
8 | public: | 8 | public: |
9 | MetalInterface ( ); | 9 | MetalInterface ( ); |
10 | virtual ~MetalInterface ( ); | 10 | virtual ~MetalInterface ( ); |
11 | 11 | ||
12 | QRESULT queryInterface ( const QUuid &, QUnknownInterface ** ); | 12 | QRESULT queryInterface ( const QUuid &, QUnknownInterface ** ); |
13 | Q_REFCOUNT | 13 | Q_REFCOUNT |
14 | 14 | ||
15 | virtual QStyle *style ( ); | 15 | virtual QStyle *style ( ); |
16 | virtual QString name ( ) const; | 16 | virtual QString name ( ) const; |
17 | 17 | ||
18 | private: | ||
19 | ulong ref; | ||
20 | }; | 18 | }; |
21 | 19 | ||
22 | #endif | 20 | #endif |
diff --git a/noncore/styles/theme/plugin.cpp b/noncore/styles/theme/plugin.cpp index 2560720..dca8685 100644 --- a/noncore/styles/theme/plugin.cpp +++ b/noncore/styles/theme/plugin.cpp | |||
@@ -1,81 +1,83 @@ | |||
1 | #include <qapplication.h> | 1 | #include <qapplication.h> |
2 | 2 | ||
3 | #include "othemestyle.h" | 3 | #include "othemestyle.h" |
4 | #include "themeset.h" | 4 | #include "themeset.h" |
5 | #include "plugin.h" | 5 | #include "plugin.h" |
6 | 6 | ||
7 | 7 | ||
8 | 8 | ||
9 | ThemeInterface::ThemeInterface ( ) : ref ( 0 ) | 9 | ThemeInterface::ThemeInterface ( ) |
10 | { | 10 | { |
11 | m_widget = 0; | 11 | m_widget = 0; |
12 | } | 12 | } |
13 | 13 | ||
14 | ThemeInterface::~ThemeInterface ( ) | 14 | ThemeInterface::~ThemeInterface ( ) |
15 | { | 15 | { |
16 | } | 16 | } |
17 | 17 | ||
18 | QStyle *ThemeInterface::style ( ) | 18 | QStyle *ThemeInterface::style ( ) |
19 | { | 19 | { |
20 | return new OThemeStyle ( "" ); | 20 | return new OThemeStyle ( "" ); |
21 | } | 21 | } |
22 | 22 | ||
23 | QString ThemeInterface::name ( ) const | 23 | QString ThemeInterface::name ( ) const |
24 | { | 24 | { |
25 | return qApp-> translate ( "Styles", "Themed style" ); | 25 | return qApp-> translate ( "Styles", "Themed style" ); |
26 | } | 26 | } |
27 | 27 | ||
28 | QString ThemeInterface::description ( ) const | 28 | QString ThemeInterface::description ( ) const |
29 | { | 29 | { |
30 | return qApp-> translate ( "Styles", "KDE2 theme compatible style engine" ); | 30 | return qApp-> translate ( "Styles", "KDE2 theme compatible style engine" ); |
31 | } | 31 | } |
32 | 32 | ||
33 | bool ThemeInterface::hasSettings ( ) const | 33 | bool ThemeInterface::hasSettings ( ) const |
34 | { | 34 | { |
35 | return true; | 35 | return true; |
36 | } | 36 | } |
37 | 37 | ||
38 | QWidget *ThemeInterface::create ( QWidget *parent, const char *name ) | 38 | QWidget *ThemeInterface::create ( QWidget *parent, const char *name ) |
39 | { | 39 | { |
40 | m_widget = new ThemeSettings ( parent, name ? name : "THEME-SETTINGS" ); | 40 | m_widget = new ThemeSettings ( parent, name ? name : "THEME-SETTINGS" ); |
41 | 41 | ||
42 | return m_widget; | 42 | return m_widget; |
43 | } | 43 | } |
44 | 44 | ||
45 | bool ThemeInterface::accept ( ) | 45 | bool ThemeInterface::accept ( ) |
46 | { | 46 | { |
47 | if ( !m_widget ) | 47 | if ( !m_widget ) |
48 | return false; | 48 | return false; |
49 | 49 | ||
50 | return m_widget-> writeConfig ( ); | 50 | return m_widget-> writeConfig ( ); |
51 | } | 51 | } |
52 | 52 | ||
53 | void ThemeInterface::reject ( ) | 53 | void ThemeInterface::reject ( ) |
54 | { | 54 | { |
55 | } | 55 | } |
56 | 56 | ||
57 | 57 | ||
58 | QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | 58 | QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) |
59 | { | 59 | { |
60 | *iface = 0; | 60 | *iface = 0; |
61 | 61 | ||
62 | if ( uuid == IID_QUnknown ) | 62 | if ( uuid == IID_QUnknown ) |
63 | *iface = this; | 63 | *iface = this; |
64 | else if ( uuid == IID_Style ) | 64 | else if ( uuid == IID_Style ) |
65 | *iface = this; | 65 | *iface = this; |
66 | else if ( uuid == IID_StyleExtended ) | 66 | else if ( uuid == IID_StyleExtended ) |
67 | *iface = this; | 67 | *iface = this; |
68 | else | ||
69 | return QS_FALSE; | ||
68 | 70 | ||
69 | if ( *iface ) | 71 | if ( *iface ) |
70 | (*iface)-> addRef ( ); | 72 | (*iface)-> addRef ( ); |
71 | 73 | ||
72 | return QS_OK; | 74 | return QS_OK; |
73 | } | 75 | } |
74 | 76 | ||
75 | Q_EXPORT_INTERFACE() | 77 | Q_EXPORT_INTERFACE() |
76 | { | 78 | { |
77 | Q_CREATE_INSTANCE( ThemeInterface ) | 79 | Q_CREATE_INSTANCE( ThemeInterface ) |
78 | } | 80 | } |
79 | 81 | ||
80 | 82 | ||
81 | 83 | ||
diff --git a/noncore/styles/theme/plugin.h b/noncore/styles/theme/plugin.h index 60cae97..c67f1e4 100644 --- a/noncore/styles/theme/plugin.h +++ b/noncore/styles/theme/plugin.h | |||
@@ -1,33 +1,32 @@ | |||
1 | #ifndef __OPIE_THEME_PLUGIN_H__ | 1 | #ifndef __OPIE_THEME_PLUGIN_H__ |
2 | #define __OPIE_THEME_PLUGIN_H__ | 2 | #define __OPIE_THEME_PLUGIN_H__ |
3 | 3 | ||
4 | #include <qpe/styleinterface.h> | 4 | #include <qpe/styleinterface.h> |
5 | 5 | ||
6 | class ThemeSettings; | 6 | class ThemeSettings; |
7 | 7 | ||
8 | class ThemeInterface : public StyleExtendedInterface { | 8 | class ThemeInterface : public StyleExtendedInterface { |
9 | public: | 9 | public: |
10 | ThemeInterface ( ); | 10 | ThemeInterface ( ); |
11 | virtual ~ThemeInterface ( ); | 11 | virtual ~ThemeInterface ( ); |
12 | 12 | ||
13 | QRESULT queryInterface ( const QUuid &, QUnknownInterface ** ); | 13 | QRESULT queryInterface ( const QUuid &, QUnknownInterface ** ); |
14 | Q_REFCOUNT | 14 | Q_REFCOUNT |
15 | 15 | ||
16 | virtual QStyle *style ( ); | 16 | virtual QStyle *style ( ); |
17 | virtual QString name ( ) const; | 17 | virtual QString name ( ) const; |
18 | 18 | ||
19 | virtual QString description ( ) const; | 19 | virtual QString description ( ) const; |
20 | 20 | ||
21 | virtual bool hasSettings ( ) const; | 21 | virtual bool hasSettings ( ) const; |
22 | 22 | ||
23 | virtual QWidget *create ( QWidget *parent, const char *name = 0 ); | 23 | virtual QWidget *create ( QWidget *parent, const char *name = 0 ); |
24 | 24 | ||
25 | virtual bool accept ( ); | 25 | virtual bool accept ( ); |
26 | virtual void reject ( ); | 26 | virtual void reject ( ); |
27 | 27 | ||
28 | private: | 28 | private: |
29 | ThemeSettings *m_widget; | 29 | ThemeSettings *m_widget; |
30 | ulong ref; | ||
31 | }; | 30 | }; |
32 | 31 | ||
33 | #endif | 32 | #endif |