Janitor: remove ulong ref

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
@@ -187,33 +187,33 @@ static QImage scaleButton( const QImage &img, int height )
     if ( img.height() != height ) {
 	return img.smoothScale( img.width()*height/img.height(), height );
     } else {
 	return img;
     }
 }
 
 static void colorize( QImage &img, const QColor &c, bool rev )
 {
     for ( int i = 0; i < img.numColors(); i++ ) {
 	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()
 {
 }
 
 int FlatDecoration::metric( Metric m, const WindowData *wd ) const
 {
     switch ( m ) {
 	case TopBorder:
 	    return 1;
 	    break;
 	case LeftBorder:
 	case RightBorder:
@@ -334,27 +334,29 @@ QString FlatDecoration::name() const
 {
     return qApp->translate( "Decoration", "Flat" );
 }
 
 QPixmap FlatDecoration::icon() const
 {
     return QPixmap();
 }
 
 QRESULT FlatDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *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;
 }
 
 Q_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( FlatDecoration )
 }
 
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
@@ -29,21 +29,20 @@ class FlatDecoration : public WindowDecorationInterface
 {
 public:
     FlatDecoration();
     virtual ~FlatDecoration();
 
     virtual int metric( Metric m, const WindowData * ) const;
     virtual void drawArea( Area a, QPainter *, const WindowData * ) const;
     virtual void drawButton( Button b, QPainter *, const WindowData *, int x, int y, int w, int h, QWSButton::State ) const;
     virtual QRegion mask( const WindowData * ) const;
     virtual QString name() const;
     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
@@ -1,25 +1,25 @@
 #include "liquid.h"
 
 #include <qapplication.h>
 #include <qpainter.h>
 #include <qpalette.h>
 #include <qdrawutil.h>
 
 
-LiquidDecoInterface::LiquidDecoInterface ( ) :  ref ( 0 )
+LiquidDecoInterface::LiquidDecoInterface ( ) 
 {
 }
     
 LiquidDecoInterface::~LiquidDecoInterface ( )
 {
 }
 
 
 
 QString LiquidDecoInterface::name ( ) const
 {
 	return qApp-> translate ( "Decoration", "Liquid" );
 }
 
 
 QPixmap LiquidDecoInterface::icon ( ) const
@@ -109,28 +109,30 @@ void LiquidDecoInterface::drawArea( Area a, QPainter *p, const WindowData *wd )
 		}
 		default: {
 			WindowDecorationInterface::drawArea ( a, p, wd );
 			break;
 		}
 	}
 }
 
 QRESULT LiquidDecoInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
 	*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;
 }
 
 Q_EXPORT_INTERFACE()
 {
 	Q_CREATE_INSTANCE( LiquidDecoInterface )
 }
 
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
@@ -5,21 +5,19 @@
 
 class LiquidSettings;
 
 class LiquidDecoInterface : public WindowDecorationInterface {
 public:
 	LiquidDecoInterface ( );
 	virtual ~LiquidDecoInterface ( );
 	
 	QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
 	Q_REFCOUNT
 
 	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
@@ -9,33 +9,33 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "polished.h"
 #include <qpainter.h>
 #include <qapplication.h>
 
-PolishedDecoration::PolishedDecoration() : ref(0)
+PolishedDecoration::PolishedDecoration() 
 {
 }
 
 PolishedDecoration::~PolishedDecoration()
 {
 }
 
 int PolishedDecoration::metric( Metric m, const WindowData *wd ) const
 {
     switch ( m ) {
 	case TopBorder:
 	    return 1;
 	    break;
 	case LeftBorder:
 	case RightBorder:
 	    return 2;
@@ -145,27 +145,29 @@ void PolishedDecoration::drawBlend( QPainter *p, const QRect &r, const QColor &c
 
     for ( int j = 0; j < r.height()-split; j++ ) {
 	p->setPen( QColor( h1 + ((h2-h1)*j)/(r.height()-split-1),
 		    s1 + ((s2-s1)*j)/(r.height()-split-1),
 		    v1 + ((v2-v1)*j)/(r.height()-split-1), QColor::Hsv ) );
 	p->drawLine( r.x(), r.bottom()-j, r.right(), r.bottom()-j );
     }
 }
 
 QRESULT PolishedDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *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;
 }
 
 Q_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( PolishedDecoration )
 }
 
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
@@ -29,21 +29,19 @@ public:
     PolishedDecoration();
     virtual ~PolishedDecoration();
 
     virtual int metric( Metric m, const WindowData * ) const;
     virtual void drawArea( Area a, QPainter *, const WindowData * ) const;
     virtual void drawButton( Button b, QPainter *, const WindowData *, int x, int y, int w, int h, QWSButton::State ) const;
     virtual QRegion mask( const WindowData * ) const;
     virtual QString name() const;
     virtual QPixmap icon() const;
 
     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
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
@@ -1045,33 +1045,33 @@ void FlatStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
 			       FALSE,
 			       x+w - motifArrowHMargin - motifItemFrame - dim,  y+h/2-dim/2,
 			       dim, dim, g, mi->isEnabled() );
 	}
     }
 #endif
 }
 
 void FlatStyle::getButtonShift( int &x, int &y )
 {
     x = 0; y = 0;
 }
 
 //===========================================================================
 
 FlatStyleImpl::FlatStyleImpl()
-    : flat(0), ref(0)
+    : flat(0)
 {
 }
 
 FlatStyleImpl::~FlatStyleImpl()
 {
     // We do not delete the style because Qt does that when a new style
     // is set.
 }
 
 QStyle *FlatStyleImpl::style()
 {
     if ( !flat )
 	flat = new FlatStyle();
     return flat;
 }
 
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
@@ -99,20 +99,19 @@ private:
 
 
 class FlatStyleImpl : public StyleInterface
 {
 public:
     FlatStyleImpl();
     virtual ~FlatStyleImpl();
 
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 
     virtual QStyle *style();
     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
@@ -791,56 +791,58 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
 	    drawArrow( p, RightArrow, FALSE,
 			       x+w - motifArrowHMargin - motifItemFrame - dim,  y+h/2-dim/2,
 			       dim, dim, g2, TRUE );
 	} else {
 	    drawArrow( p, RightArrow,
 			       FALSE,
 			       x+w - motifArrowHMargin - motifItemFrame - dim,  y+h/2-dim/2,
 			       dim, dim, g, mi->isEnabled() );
 	}
     }
 #endif
 }
 
 //===========================================================================
 
 FreshStyleImpl::FreshStyleImpl()
-    : fresh(0), ref(0)
+    : fresh(0)
 {
 }
 
 FreshStyleImpl::~FreshStyleImpl()
 {
     // We do not delete the style because Qt does that when a new style
     // is set.
 }
 
 QStyle *FreshStyleImpl::style()
 {
     if ( !fresh )
 	fresh = new FreshStyle();
     return fresh;
 }
 
 QString FreshStyleImpl::name() const
 {
     return QString("Fresh");
 }
 
 QRESULT FreshStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
 	*iface = this;
     else if ( uuid == IID_Style )
 	*iface = this;
+    else
+	return QS_FALSE;
 
     if ( *iface )
 	(*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( FreshStyleImpl )
 }
 
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
@@ -81,20 +81,19 @@ private:	// Disabled copy constructor and operator=
 
 
 class FreshStyleImpl : public StyleInterface
 {
 public:
     FreshStyleImpl();
     virtual ~FreshStyleImpl();
 
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 
     virtual QStyle *style();
     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
@@ -1,25 +1,25 @@
 #include <qapplication.h>
 
 #include "liquid.h"
 #include "liquidset.h"
 #include "plugin.h"
 
 
 
-LiquidInterface::LiquidInterface ( ) :  ref ( 0 )
+LiquidInterface::LiquidInterface ( ) 
 {
 	m_widget = 0;
 }
     
 LiquidInterface::~LiquidInterface ( )
 {
 }
         
 QStyle *LiquidInterface::style ( )
 {
 	return new LiquidStyle ( );
 }
 
 QString LiquidInterface::name ( ) const
 {
 	return qApp-> translate ( "Styles", "Liquid" );
@@ -52,28 +52,30 @@ bool LiquidInterface::accept ( )
 
 void LiquidInterface::reject ( )
 {
 }
 
 
 QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
 	*iface = 0;
 	
 	if ( uuid == IID_QUnknown )
 		*iface = this;
 	else if ( uuid == IID_Style )
 		*iface = this;
 	else if ( uuid == IID_StyleExtended ) 
 		*iface = this;
+	else
+	    return QS_FALSE;
 	
 	if ( *iface )
 		(*iface)-> addRef ( );
 		
 	return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
 	Q_CREATE_INSTANCE( LiquidInterface )
 }
 
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
@@ -15,20 +15,19 @@ public:
         	
 	virtual QStyle *style ( );
 	
 	virtual QString name ( ) const;
 
 	virtual QString description ( ) const;
 
 	virtual bool hasSettings ( ) const;
 
 	virtual QWidget *create ( QWidget *parent, const char *name = 0 );
     
 	virtual bool accept ( );            
 	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
@@ -1,45 +1,47 @@
 #include <qapplication.h>
 
 #include "metal.h"
 #include "plugin.h"
 
 
-MetalInterface::MetalInterface ( ) :  ref ( 0 )
+MetalInterface::MetalInterface ( ) 
 {
 }
     
 MetalInterface::~MetalInterface ( )
 {
 }
         
 QStyle *MetalInterface::style ( )
 {
 	return new MetalStyle ( );
 }
 
 QString MetalInterface::name ( ) const
 {
 	return qApp-> translate ( "Styles", "Metal" );
 }
 
 
 QRESULT MetalInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
 	*iface = 0;
 	
 	if ( uuid == IID_QUnknown )
 		*iface = this;
 	else if ( uuid == IID_Style )
 		*iface = this;
+	else
+	    return QS_FALSE;
 	
 	if ( *iface )
 		(*iface)-> addRef ( );
 		
 	return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
 	Q_CREATE_INSTANCE( MetalInterface )
 }
 
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
@@ -2,21 +2,19 @@
 #define __OPIE_METAL_PLUGIN_H__
 
 #include <qpe/styleinterface.h>
 
 
 class MetalInterface : public StyleInterface {
 public:
 	MetalInterface ( );
 	virtual ~MetalInterface ( );
 	
 	QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
 	Q_REFCOUNT
         	
 	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
@@ -1,25 +1,25 @@
 #include <qapplication.h>
 
 #include "othemestyle.h"
 #include "themeset.h"
 #include "plugin.h"
 
 
 
-ThemeInterface::ThemeInterface ( ) :  ref ( 0 )
+ThemeInterface::ThemeInterface ( ) 
 {
 	m_widget = 0;
 }
     
 ThemeInterface::~ThemeInterface ( )
 {
 }
         
 QStyle *ThemeInterface::style ( )
 {
 	return new OThemeStyle ( "" );
 }
 
 QString ThemeInterface::name ( ) const
 {
 	return qApp-> translate ( "Styles", "Themed style" );
@@ -52,30 +52,32 @@ bool ThemeInterface::accept ( )
 
 void ThemeInterface::reject ( )
 {
 }
 
 
 QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
 	*iface = 0;
 	
 	if ( uuid == IID_QUnknown )
 		*iface = this;
 	else if ( uuid == IID_Style )
 		*iface = this;
 	else if ( uuid == IID_StyleExtended )
 		*iface = this;
+	else
+	    return QS_FALSE;
 	
 	if ( *iface )
 		(*iface)-> addRef ( );
 		
 	return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
 	Q_CREATE_INSTANCE( ThemeInterface )
 }
 
 
 
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
@@ -14,20 +14,19 @@ public:
 	Q_REFCOUNT
         	
 	virtual QStyle *style ( );
 	virtual QString name ( ) const;
 	
 	virtual QString description ( ) const;
 	
 	virtual bool hasSettings ( ) const;
 	
 	virtual QWidget *create ( QWidget *parent, const char *name = 0 );
     
 	virtual bool accept ( );            
 	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
@@ -22,20 +22,19 @@
 class FortunePlugin;
 
 class FortunePluginImpl : public TodayPluginInterface
 {
 
 public:
 	FortunePluginImpl();
 	virtual ~FortunePluginImpl();
 
 	QRESULT queryInterface( const QUuid &,  QUnknownInterface** );
 	Q_REFCOUNT
 
 	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
@@ -21,20 +21,19 @@
 
 class StockTickerPlugin;
 
 class StockTickerPluginImpl : public TodayPluginInterface{
 
 public:
     StockTickerPluginImpl();
     virtual ~StockTickerPluginImpl();
 
     QRESULT queryInterface( const QUuid &,  QUnknownInterface** );
     Q_REFCOUNT
 
     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
@@ -33,20 +33,19 @@
 
 class WeatherPlugin;
 
 class WeatherPluginImpl : public TodayPluginInterface
 {
 	public:
 		WeatherPluginImpl();
 		virtual ~WeatherPluginImpl();
 
 		QRESULT queryInterface( const QUuid &,  QUnknownInterface ** );
 		Q_REFCOUNT
 
 		virtual TodayPluginObject *guiPart();
 
 	private:
 		WeatherPlugin *weatherPlugin;
-		ulong ref;
 };
 
 #endif