-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 | ||||
-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 | ||||
-rw-r--r-- | noncore/todayplugins/fortune/fortunepluginimpl.h | 1 | ||||
-rw-r--r-- | noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h | 1 | ||||
-rw-r--r-- | noncore/todayplugins/weather/weatherpluginimpl.h | 1 |
19 files changed, 22 insertions, 22 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 @@ -199,9 +199,9 @@ static void colorize( QImage &img, const QColor &c, bool rev ) img.setColor(i, sc ? c.rgb() : 0x00000000 ); } } -FlatDecoration::FlatDecoration() : ref(0), buttonCache(16) +FlatDecoration::FlatDecoration() : buttonCache(16) { buttonCache.setAutoDelete(TRUE); } @@ -346,8 +346,10 @@ QRESULT FlatDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **i 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 @@ -41,9 +41,8 @@ public: 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 @@ -5,9 +5,9 @@ #include <qpalette.h> #include <qdrawutil.h> -LiquidDecoInterface::LiquidDecoInterface ( ) : ref ( 0 ) +LiquidDecoInterface::LiquidDecoInterface ( ) { } LiquidDecoInterface::~LiquidDecoInterface ( ) @@ -121,8 +121,10 @@ QRESULT LiquidDecoInterface::queryInterface ( const QUuid &uuid, QUnknownInterfa if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_WindowDecoration ) *iface = this; + else + return QS_FALSE; if ( *iface ) (*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 @@ -17,9 +17,7 @@ public: 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 @@ -21,9 +21,9 @@ #include "polished.h" #include <qpainter.h> #include <qapplication.h> -PolishedDecoration::PolishedDecoration() : ref(0) +PolishedDecoration::PolishedDecoration() { } PolishedDecoration::~PolishedDecoration() @@ -157,8 +157,10 @@ QRESULT PolishedDecoration::queryInterface( const QUuid &uuid, QUnknownInterface 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 @@ -41,9 +41,7 @@ public: protected: void PolishedDecoration::drawBlend( QPainter *, const QRect &r, const QColor &c1, const QColor&c2 ) const; -private: - ulong ref; }; #endif 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 @@ -1057,9 +1057,9 @@ void FlatStyle::getButtonShift( int &x, int &y ) //=========================================================================== FlatStyleImpl::FlatStyleImpl() - : flat(0), ref(0) + : flat(0) { } FlatStyleImpl::~FlatStyleImpl() 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 @@ -111,8 +111,7 @@ public: virtual QString name() const; private: FlatStyle *flat; - ulong ref; }; #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 @@ -803,9 +803,9 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int //=========================================================================== FreshStyleImpl::FreshStyleImpl() - : fresh(0), ref(0) + : fresh(0) { } FreshStyleImpl::~FreshStyleImpl() @@ -832,8 +832,10 @@ QRESULT FreshStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **i if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_Style ) *iface = this; + else + return QS_FALSE; if ( *iface ) (*iface)->addRef(); return QS_OK; 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 @@ -93,8 +93,7 @@ public: virtual QString name() const; private: FreshStyle *fresh; - ulong ref; }; #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 @@ -5,9 +5,9 @@ #include "plugin.h" -LiquidInterface::LiquidInterface ( ) : ref ( 0 ) +LiquidInterface::LiquidInterface ( ) { m_widget = 0; } @@ -64,8 +64,10 @@ QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface * else if ( uuid == IID_Style ) *iface = this; else if ( uuid == IID_StyleExtended ) *iface = this; + else + return QS_FALSE; if ( *iface ) (*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 @@ -27,8 +27,7 @@ public: virtual void reject ( ); private: LiquidSettings *m_widget; - ulong ref; }; #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 @@ -3,9 +3,9 @@ #include "metal.h" #include "plugin.h" -MetalInterface::MetalInterface ( ) : ref ( 0 ) +MetalInterface::MetalInterface ( ) { } MetalInterface::~MetalInterface ( ) @@ -30,8 +30,10 @@ QRESULT MetalInterface::queryInterface ( const QUuid &uuid, QUnknownInterface ** if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_Style ) *iface = this; + else + return QS_FALSE; if ( *iface ) (*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 @@ -14,9 +14,7 @@ public: virtual QStyle *style ( ); virtual QString name ( ) const; -private: - ulong ref; }; #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 @@ -5,9 +5,9 @@ #include "plugin.h" -ThemeInterface::ThemeInterface ( ) : ref ( 0 ) +ThemeInterface::ThemeInterface ( ) { m_widget = 0; } @@ -64,8 +64,10 @@ QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface ** else if ( uuid == IID_Style ) *iface = this; else if ( uuid == IID_StyleExtended ) *iface = this; + else + return QS_FALSE; if ( *iface ) (*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 @@ -26,8 +26,7 @@ public: virtual void reject ( ); private: ThemeSettings *m_widget; - ulong ref; }; #endif diff --git a/noncore/todayplugins/fortune/fortunepluginimpl.h b/noncore/todayplugins/fortune/fortunepluginimpl.h index 070f03e..8e380f5 100644 --- a/noncore/todayplugins/fortune/fortunepluginimpl.h +++ b/noncore/todayplugins/fortune/fortunepluginimpl.h @@ -34,8 +34,7 @@ public: virtual TodayPluginObject *guiPart(); private: FortunePlugin *fortunePlugin; - ulong ref; }; #endif diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h index 300c545..db5b8f9 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h @@ -33,8 +33,7 @@ public: virtual TodayPluginObject *guiPart(); private: StockTickerPlugin *stocktickerPlugin; - ulong ref; }; #endif diff --git a/noncore/todayplugins/weather/weatherpluginimpl.h b/noncore/todayplugins/weather/weatherpluginimpl.h index aad8958..eaaae1d 100644 --- a/noncore/todayplugins/weather/weatherpluginimpl.h +++ b/noncore/todayplugins/weather/weatherpluginimpl.h @@ -45,8 +45,7 @@ class WeatherPluginImpl : public TodayPluginInterface virtual TodayPluginObject *guiPart(); private: WeatherPlugin *weatherPlugin; - ulong ref; }; #endif |