-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 | |||
@@ -1058,7 +1058,7 @@ void FlatStyle::getButtonShift( int &x, int &y ) | |||
1058 | //=========================================================================== | 1058 | //=========================================================================== |
1059 | 1059 | ||
1060 | FlatStyleImpl::FlatStyleImpl() | 1060 | FlatStyleImpl::FlatStyleImpl() |
1061 | : flat(0), ref(0) | 1061 | : flat(0) |
1062 | { | 1062 | { |
1063 | } | 1063 | } |
1064 | 1064 | ||
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 | |||
@@ -112,7 +112,6 @@ public: | |||
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 | |||
@@ -804,7 +804,7 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int | |||
804 | //=========================================================================== | 804 | //=========================================================================== |
805 | 805 | ||
806 | FreshStyleImpl::FreshStyleImpl() | 806 | FreshStyleImpl::FreshStyleImpl() |
807 | : fresh(0), ref(0) | 807 | : fresh(0) |
808 | { | 808 | { |
809 | } | 809 | } |
810 | 810 | ||
@@ -833,6 +833,8 @@ QRESULT FreshStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **i | |||
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(); |
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 | |||
@@ -94,7 +94,6 @@ public: | |||
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 | |||
@@ -6,7 +6,7 @@ | |||
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 | } |
@@ -65,6 +65,8 @@ QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface * | |||
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 ( ); |
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 | |||
@@ -28,7 +28,6 @@ public: | |||
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 | |||
@@ -4,7 +4,7 @@ | |||
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 | ||
@@ -31,6 +31,8 @@ QRESULT MetalInterface::queryInterface ( const QUuid &uuid, QUnknownInterface ** | |||
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 ( ); |
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 | |||
@@ -15,8 +15,6 @@ public: | |||
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 | |||
@@ -6,7 +6,7 @@ | |||
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 | } |
@@ -65,6 +65,8 @@ QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface ** | |||
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 ( ); |
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 | |||
@@ -27,7 +27,6 @@ public: | |||
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 |