-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 | |||
@@ -1049,25 +1049,25 @@ void FlatStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int | |||
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 ) |
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 | |||
@@ -103,16 +103,15 @@ class FlatStyleImpl : public StyleInterface | |||
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 | |||
@@ -795,25 +795,25 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int | |||
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 ) |
@@ -824,23 +824,25 @@ QStyle *FreshStyleImpl::style() | |||
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 | |||
@@ -85,16 +85,15 @@ class FreshStyleImpl : public StyleInterface | |||
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,21 +1,21 @@ | |||
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 | } |
@@ -56,24 +56,26 @@ void LiquidInterface::reject ( ) | |||
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 | |||
@@ -19,16 +19,15 @@ public: | |||
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,19 +1,19 @@ | |||
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 | ||
@@ -22,24 +22,26 @@ QString MetalInterface::name ( ) const | |||
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 | |||
@@ -6,17 +6,15 @@ | |||
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,21 +1,21 @@ | |||
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 | } |
@@ -56,24 +56,26 @@ void ThemeInterface::reject ( ) | |||
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 | ||
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 | |||
@@ -18,16 +18,15 @@ public: | |||
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 |