From c79bbb6696edf7539ebeda64092f3f91f65ba500 Mon Sep 17 00:00:00 2001 From: zecke Date: Thu, 05 Feb 2004 17:42:00 +0000 Subject: Janitor: remove ulong ref --- (limited to 'noncore') 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 ) } } -FlatDecoration::FlatDecoration() : ref(0), buttonCache(16) +FlatDecoration::FlatDecoration() : buttonCache(16) { buttonCache.setAutoDelete(TRUE); } @@ -347,6 +347,8 @@ QRESULT FlatDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **i *iface = this; else if ( uuid == IID_WindowDecoration ) *iface = this; + else + return QS_FALSE; if ( *iface ) (*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: Q_REFCOUNT private: - ulong ref; QCache buttonCache; }; 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 @@ #include -LiquidDecoInterface::LiquidDecoInterface ( ) : ref ( 0 ) +LiquidDecoInterface::LiquidDecoInterface ( ) { } @@ -122,6 +122,8 @@ QRESULT LiquidDecoInterface::queryInterface ( const QUuid &uuid, QUnknownInterfa *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 @@ -18,8 +18,6 @@ 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 @@ -22,7 +22,7 @@ #include #include -PolishedDecoration::PolishedDecoration() : ref(0) +PolishedDecoration::PolishedDecoration() { } @@ -158,6 +158,8 @@ QRESULT PolishedDecoration::queryInterface( const QUuid &uuid, QUnknownInterface *iface = this; else if ( uuid == IID_WindowDecoration ) *iface = this; + else + return QS_FALSE; if ( *iface ) (*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: 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 @@ -1058,7 +1058,7 @@ void FlatStyle::getButtonShift( int &x, int &y ) //=========================================================================== FlatStyleImpl::FlatStyleImpl() - : flat(0), ref(0) + : flat(0) { } 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: 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 @@ -804,7 +804,7 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int //=========================================================================== FreshStyleImpl::FreshStyleImpl() - : fresh(0), ref(0) + : fresh(0) { } @@ -833,6 +833,8 @@ QRESULT FreshStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **i *iface = this; else if ( uuid == IID_Style ) *iface = this; + else + return QS_FALSE; if ( *iface ) (*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: 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 @@ -6,7 +6,7 @@ -LiquidInterface::LiquidInterface ( ) : ref ( 0 ) +LiquidInterface::LiquidInterface ( ) { m_widget = 0; } @@ -65,6 +65,8 @@ QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface * *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 @@ -28,7 +28,6 @@ public: 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 @@ -4,7 +4,7 @@ #include "plugin.h" -MetalInterface::MetalInterface ( ) : ref ( 0 ) +MetalInterface::MetalInterface ( ) { } @@ -31,6 +31,8 @@ QRESULT MetalInterface::queryInterface ( const QUuid &uuid, QUnknownInterface ** *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 @@ -15,8 +15,6 @@ 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 @@ -6,7 +6,7 @@ -ThemeInterface::ThemeInterface ( ) : ref ( 0 ) +ThemeInterface::ThemeInterface ( ) { m_widget = 0; } @@ -65,6 +65,8 @@ QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface ** *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 @@ -27,7 +27,6 @@ public: 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 @@ -35,7 +35,6 @@ public: 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 @@ -34,7 +34,6 @@ public: 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 @@ -46,7 +46,6 @@ class WeatherPluginImpl : public TodayPluginInterface private: WeatherPlugin *weatherPlugin; - ulong ref; }; #endif -- cgit v0.9.0.2