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/decorations | |
parent | 4ce8201e80a0b60a8e5d9d875bf00602303d6a0b (diff) | |
download | opie-c79bbb6696edf7539ebeda64092f3f91f65ba500.zip opie-c79bbb6696edf7539ebeda64092f3f91f65ba500.tar.gz opie-c79bbb6696edf7539ebeda64092f3f91f65ba500.tar.bz2 |
Janitor: remove ulong ref
-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 | |||
@@ -200,7 +200,7 @@ static void colorize( QImage &img, const QColor &c, bool rev ) | |||
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 | } |
@@ -347,6 +347,8 @@ QRESULT FlatDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **i | |||
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(); |
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 | |||
@@ -42,7 +42,6 @@ public: | |||
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 | ||
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 | |||
@@ -6,7 +6,7 @@ | |||
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 | ||
@@ -122,6 +122,8 @@ QRESULT LiquidDecoInterface::queryInterface ( const QUuid &uuid, QUnknownInterfa | |||
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 ( ); |
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 | |||
@@ -18,8 +18,6 @@ public: | |||
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 | |||
@@ -22,7 +22,7 @@ | |||
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 | ||
@@ -158,6 +158,8 @@ QRESULT PolishedDecoration::queryInterface( const QUuid &uuid, QUnknownInterface | |||
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(); |
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 | |||
@@ -42,8 +42,6 @@ public: | |||
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 |