author | zecke <zecke> | 2004-02-05 17:42:00 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-05 17:42:00 (UTC) |
commit | c79bbb6696edf7539ebeda64092f3f91f65ba500 (patch) (side-by-side diff) | |
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 @@ -197,13 +197,13 @@ static void colorize( QImage &img, const QColor &c, bool rev ) bool sc = (img.color(i) & 0xff000000); if ( rev ) sc = !sc; img.setColor(i, sc ? c.rgb() : 0x00000000 ); } } -FlatDecoration::FlatDecoration() : ref(0), buttonCache(16) +FlatDecoration::FlatDecoration() : buttonCache(16) { buttonCache.setAutoDelete(TRUE); } FlatDecoration::~FlatDecoration() { @@ -344,12 +344,14 @@ QRESULT FlatDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **i { *iface = 0; if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_WindowDecoration ) *iface = this; + else + return QS_FALSE; if ( *iface ) (*iface)->addRef(); return QS_OK; } 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: virtual QPixmap icon() const; QRESULT queryInterface( const QUuid&, QUnknownInterface** ); Q_REFCOUNT private: - ulong ref; QCache<QImage> buttonCache; }; #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 @@ #include <qapplication.h> #include <qpainter.h> #include <qpalette.h> #include <qdrawutil.h> -LiquidDecoInterface::LiquidDecoInterface ( ) : ref ( 0 ) +LiquidDecoInterface::LiquidDecoInterface ( ) { } LiquidDecoInterface::~LiquidDecoInterface ( ) { } @@ -119,12 +119,14 @@ QRESULT LiquidDecoInterface::queryInterface ( const QUuid &uuid, QUnknownInterfa *iface = 0; if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_WindowDecoration ) *iface = this; + else + return QS_FALSE; if ( *iface ) (*iface)-> addRef ( ); return QS_OK; } 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: virtual void drawArea( Area a, QPainter *, const WindowData * ) const; virtual QString name ( ) const; virtual QPixmap icon ( ) const; -private: - ulong ref; }; #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 @@ **********************************************************************/ #include "polished.h" #include <qpainter.h> #include <qapplication.h> -PolishedDecoration::PolishedDecoration() : ref(0) +PolishedDecoration::PolishedDecoration() { } PolishedDecoration::~PolishedDecoration() { } @@ -155,12 +155,14 @@ QRESULT PolishedDecoration::queryInterface( const QUuid &uuid, QUnknownInterface { *iface = 0; if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_WindowDecoration ) *iface = this; + else + return QS_FALSE; if ( *iface ) (*iface)->addRef(); return QS_OK; } 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: QRESULT queryInterface( const QUuid&, QUnknownInterface** ); Q_REFCOUNT protected: void PolishedDecoration::drawBlend( QPainter *, const QRect &r, const QColor &c1, const QColor&c2 ) const; -private: - ulong ref; }; #endif |