-rw-r--r-- | noncore/decorations/flat/flat.cpp | 4 | ||||
-rw-r--r-- | noncore/decorations/flat/flat.h | 1 | ||||
-rw-r--r-- | noncore/decorations/liquid/liquid.cpp | 4 | ||||
-rw-r--r-- | noncore/decorations/liquid/liquid.h | 2 | ||||
-rw-r--r-- | noncore/decorations/polished/polished.cpp | 4 | ||||
-rw-r--r-- | noncore/decorations/polished/polished.h | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/noncore/decorations/flat/flat.cpp b/noncore/decorations/flat/flat.cpp index b6a81a3..a2f12be 100644 --- a/noncore/decorations/flat/flat.cpp +++ b/noncore/decorations/flat/flat.cpp | |||
@@ -197,13 +197,13 @@ static void colorize( QImage &img, const QColor &c, bool rev ) | |||
197 | bool sc = (img.color(i) & 0xff000000); | 197 | bool sc = (img.color(i) & 0xff000000); |
198 | if ( rev ) sc = !sc; | 198 | if ( rev ) sc = !sc; |
199 | img.setColor(i, sc ? c.rgb() : 0x00000000 ); | 199 | img.setColor(i, sc ? c.rgb() : 0x00000000 ); |
200 | } | 200 | } |
201 | } | 201 | } |
202 | 202 | ||
203 | FlatDecoration::FlatDecoration() : ref(0), buttonCache(16) | 203 | FlatDecoration::FlatDecoration() : buttonCache(16) |
204 | { | 204 | { |
205 | buttonCache.setAutoDelete(TRUE); | 205 | buttonCache.setAutoDelete(TRUE); |
206 | } | 206 | } |
207 | 207 | ||
208 | FlatDecoration::~FlatDecoration() | 208 | FlatDecoration::~FlatDecoration() |
209 | { | 209 | { |
@@ -344,12 +344,14 @@ QRESULT FlatDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **i | |||
344 | { | 344 | { |
345 | *iface = 0; | 345 | *iface = 0; |
346 | if ( uuid == IID_QUnknown ) | 346 | if ( uuid == IID_QUnknown ) |
347 | *iface = this; | 347 | *iface = this; |
348 | else if ( uuid == IID_WindowDecoration ) | 348 | else if ( uuid == IID_WindowDecoration ) |
349 | *iface = this; | 349 | *iface = this; |
350 | else | ||
351 | return QS_FALSE; | ||
350 | 352 | ||
351 | if ( *iface ) | 353 | if ( *iface ) |
352 | (*iface)->addRef(); | 354 | (*iface)->addRef(); |
353 | return QS_OK; | 355 | return QS_OK; |
354 | } | 356 | } |
355 | 357 | ||
diff --git a/noncore/decorations/flat/flat.h b/noncore/decorations/flat/flat.h index 3d8a18b..96ceb1f 100644 --- a/noncore/decorations/flat/flat.h +++ b/noncore/decorations/flat/flat.h | |||
@@ -39,11 +39,10 @@ public: | |||
39 | virtual QPixmap icon() const; | 39 | virtual QPixmap icon() const; |
40 | 40 | ||
41 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 41 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
42 | Q_REFCOUNT | 42 | Q_REFCOUNT |
43 | 43 | ||
44 | private: | 44 | private: |
45 | ulong ref; | ||
46 | QCache<QImage> buttonCache; | 45 | QCache<QImage> buttonCache; |
47 | }; | 46 | }; |
48 | 47 | ||
49 | #endif | 48 | #endif |
diff --git a/noncore/decorations/liquid/liquid.cpp b/noncore/decorations/liquid/liquid.cpp index 75b1fc9..ef2ac3c 100644 --- a/noncore/decorations/liquid/liquid.cpp +++ b/noncore/decorations/liquid/liquid.cpp | |||
@@ -3,13 +3,13 @@ | |||
3 | #include <qapplication.h> | 3 | #include <qapplication.h> |
4 | #include <qpainter.h> | 4 | #include <qpainter.h> |
5 | #include <qpalette.h> | 5 | #include <qpalette.h> |
6 | #include <qdrawutil.h> | 6 | #include <qdrawutil.h> |
7 | 7 | ||
8 | 8 | ||
9 | LiquidDecoInterface::LiquidDecoInterface ( ) : ref ( 0 ) | 9 | LiquidDecoInterface::LiquidDecoInterface ( ) |
10 | { | 10 | { |
11 | } | 11 | } |
12 | 12 | ||
13 | LiquidDecoInterface::~LiquidDecoInterface ( ) | 13 | LiquidDecoInterface::~LiquidDecoInterface ( ) |
14 | { | 14 | { |
15 | } | 15 | } |
@@ -119,12 +119,14 @@ QRESULT LiquidDecoInterface::queryInterface ( const QUuid &uuid, QUnknownInterfa | |||
119 | *iface = 0; | 119 | *iface = 0; |
120 | 120 | ||
121 | if ( uuid == IID_QUnknown ) | 121 | if ( uuid == IID_QUnknown ) |
122 | *iface = this; | 122 | *iface = this; |
123 | else if ( uuid == IID_WindowDecoration ) | 123 | else if ( uuid == IID_WindowDecoration ) |
124 | *iface = this; | 124 | *iface = this; |
125 | else | ||
126 | return QS_FALSE; | ||
125 | 127 | ||
126 | if ( *iface ) | 128 | if ( *iface ) |
127 | (*iface)-> addRef ( ); | 129 | (*iface)-> addRef ( ); |
128 | 130 | ||
129 | return QS_OK; | 131 | return QS_OK; |
130 | } | 132 | } |
diff --git a/noncore/decorations/liquid/liquid.h b/noncore/decorations/liquid/liquid.h index ec55132..bbe433e 100644 --- a/noncore/decorations/liquid/liquid.h +++ b/noncore/decorations/liquid/liquid.h | |||
@@ -15,11 +15,9 @@ public: | |||
15 | 15 | ||
16 | virtual void drawArea( Area a, QPainter *, const WindowData * ) const; | 16 | virtual void drawArea( Area a, QPainter *, const WindowData * ) const; |
17 | 17 | ||
18 | virtual QString name ( ) const; | 18 | virtual QString name ( ) const; |
19 | virtual QPixmap icon ( ) const; | 19 | virtual QPixmap icon ( ) const; |
20 | 20 | ||
21 | private: | ||
22 | ulong ref; | ||
23 | }; | 21 | }; |
24 | 22 | ||
25 | #endif | 23 | #endif |
diff --git a/noncore/decorations/polished/polished.cpp b/noncore/decorations/polished/polished.cpp index 30f1a84..43179be 100644 --- a/noncore/decorations/polished/polished.cpp +++ b/noncore/decorations/polished/polished.cpp | |||
@@ -19,13 +19,13 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "polished.h" | 21 | #include "polished.h" |
22 | #include <qpainter.h> | 22 | #include <qpainter.h> |
23 | #include <qapplication.h> | 23 | #include <qapplication.h> |
24 | 24 | ||
25 | PolishedDecoration::PolishedDecoration() : ref(0) | 25 | PolishedDecoration::PolishedDecoration() |
26 | { | 26 | { |
27 | } | 27 | } |
28 | 28 | ||
29 | PolishedDecoration::~PolishedDecoration() | 29 | PolishedDecoration::~PolishedDecoration() |
30 | { | 30 | { |
31 | } | 31 | } |
@@ -155,12 +155,14 @@ QRESULT PolishedDecoration::queryInterface( const QUuid &uuid, QUnknownInterface | |||
155 | { | 155 | { |
156 | *iface = 0; | 156 | *iface = 0; |
157 | if ( uuid == IID_QUnknown ) | 157 | if ( uuid == IID_QUnknown ) |
158 | *iface = this; | 158 | *iface = this; |
159 | else if ( uuid == IID_WindowDecoration ) | 159 | else if ( uuid == IID_WindowDecoration ) |
160 | *iface = this; | 160 | *iface = this; |
161 | else | ||
162 | return QS_FALSE; | ||
161 | 163 | ||
162 | if ( *iface ) | 164 | if ( *iface ) |
163 | (*iface)->addRef(); | 165 | (*iface)->addRef(); |
164 | return QS_OK; | 166 | return QS_OK; |
165 | } | 167 | } |
166 | 168 | ||
diff --git a/noncore/decorations/polished/polished.h b/noncore/decorations/polished/polished.h index e5c19c0..d661427 100644 --- a/noncore/decorations/polished/polished.h +++ b/noncore/decorations/polished/polished.h | |||
@@ -39,11 +39,9 @@ public: | |||
39 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 39 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
40 | Q_REFCOUNT | 40 | Q_REFCOUNT |
41 | 41 | ||
42 | protected: | 42 | protected: |
43 | void PolishedDecoration::drawBlend( QPainter *, const QRect &r, const QColor &c1, const QColor&c2 ) const; | 43 | void PolishedDecoration::drawBlend( QPainter *, const QRect &r, const QColor &c1, const QColor&c2 ) const; |
44 | 44 | ||
45 | private: | ||
46 | ulong ref; | ||
47 | }; | 45 | }; |
48 | 46 | ||
49 | #endif | 47 | #endif |