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
@@ -155,97 +155,97 @@ static const char * maximize_xpm[] = {
 "          ++++++++++++          ",
 "        +++++      +++++        ",
 "       +++            +++       ",
 "      +++              +++      ",
 "     +++                +++     ",
 "    +++  ++++++++++++++  +++    ",
 "    ++   ++++++++++++++   ++    ",
 "   ++    ++++++++++++++    ++   ",
 "   ++    +++        +++    ++   ",
 "  +++    +++        +++    +++  ",
 "  ++     +++        +++     ++  ",
 "  ++     +++        +++     ++  ",
 "  ++     +++        +++     ++  ",
 "  ++     +++        +++     ++  ",
 "  ++     +++        +++     ++  ",
 "  ++     +++        +++     ++  ",
 "  +++    +++        +++    +++  ",
 "   ++    +++        +++    ++   ",
 "   ++    ++++++++++++++    ++   ",
 "    ++   ++++++++++++++   ++    ",
 "    +++  ++++++++++++++  +++    ",
 "     +++                +++     ",
 "      +++              +++      ",
 "       +++            +++       ",
 "        +++++      +++++        ",
 "          ++++++++++++          ",
 "            ++++++++            ",
 "                                ",
 "                                "};
 
 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:
 	    return 2;
 	case BottomBorder:
 	    return 4;
 	case TitleHeight:
 	    if ( QApplication::desktop()->height() > 320 )
 		return 20;
 	    else
 		return 18;
 	case OKWidth:
 	case CloseWidth:
 	case HelpWidth:
 	case MaximizeWidth:
 	    return metric(TitleHeight,wd);
 	    break;
 	default:
 	    return WindowDecorationInterface::metric( m, wd );
 	    break;
     }
 
     return 0;
 }
 
 void FlatDecoration::drawArea( Area a, QPainter *p, const WindowData *wd ) const
 {
     int th = metric( TitleHeight, wd );
     QRect r = wd->rect;
 
     switch ( a ) {
 	case Border:
 	    {
 		const QColorGroup &cg = wd->palette.active();
 		if ( wd->flags & WindowData::Active ) {
@@ -302,59 +302,61 @@ void FlatDecoration::drawButton( Button b, QPainter *p, const WindowData *wd, in
     QImage *img = buttonCache.find( key );
     if ( !img ) {
 	QImage tmp;
 	switch ( b ) {
 	    case OK:
 		tmp = QImage( ok_xpm );
 		break;
 	    case Close:
 		tmp = QImage( close_xpm );
 		break;
 	    case Help:
 		tmp = QImage( help_xpm );
 		break;
 	    case Maximize:
 		tmp = QImage( maximize_xpm );
 		break;
 	}
 	colorize( tmp, c, r );
 	img = new QImage( scaleButton(tmp,th) );
 	FlatDecoration *that = (FlatDecoration *)this;
 	that->buttonCache.insert( key, img, 1 );
     }
     
     p->drawImage( x, y, *img );
 }
 
 QRegion FlatDecoration::mask( const WindowData *wd ) const
 {
     return WindowDecorationInterface::mask( wd );
 }
 
 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
@@ -1,49 +1,48 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** 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.
 **
 **********************************************************************/
 
 #ifndef FLAT_H
 #define FLAT_H
 
 #include <qtopia/windowdecorationinterface.h>
 #include <qcache.h>
 #include <qimage.h>
 
 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,57 +1,57 @@
 #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
 {
 	return QPixmap ( );
 }            
         
 void LiquidDecoInterface::drawArea( Area a, QPainter *p, const WindowData *wd ) const
 {
 	QRect r = wd-> rect;
 	int th = metric ( TitleHeight, wd );
 
 	switch ( a ) {
 		case WindowDecorationInterface::Border: {
 			const QColorGroup &cg = wd-> palette. active ( );
 			qDrawWinPanel ( p, r. x ( ) - metric ( LeftBorder, wd ),
 				r. y ( ) - th - metric ( TopBorder, wd ),
 				r. width ( ) + metric ( LeftBorder, wd ) + metric ( RightBorder, wd ),
 				r. height ( ) + th + metric ( TopBorder,wd) + metric ( BottomBorder, wd ),
 				cg, false, &cg. brush ( QColorGroup::Background ));
 			break;
 		}
 		case WindowDecorationInterface::Title: {
 			const QColorGroup &cg = wd-> palette. active ( );
 			
 			QBrush titleBrush;
 			QPen   titleLines1, titleLines2;
 
 			titleBrush = cg. brush (( wd-> flags & WindowData::Active ) ? QColorGroup::Highlight : QColorGroup::Background );
 			titleLines1 = titleBrush. color ( ). dark ( 105 );
 			titleLines2 = titleBrush. color ( ). dark ( 103 );
 			
 			p-> fillRect ( r. x ( ), r. y ( ) - th, r. width ( ), th, titleBrush );
 			for ( int i = r.y()-th; i < r.y(); i += 4 ) {
 				p-> setPen ( titleLines1 );
@@ -77,60 +77,62 @@ void LiquidDecoInterface::drawArea( Area a, QPainter *p, const WindowData *wd )
 			QRect tr ( r.x ( ) + 3 + metric ( HelpWidth, wd ), r. top ( ) - th,
 				r. width ( ) - metric ( OKWidth, wd ) - metric ( CloseWidth, wd ), th );
 
 			QFont f = p-> font ( );
 			f. setWeight ( QFont::Bold );
 			p-> setFont ( f );                        
 						
 			QRect br = p-> boundingRect ( tr, QPainter::AlignCenter, wd-> caption );
 			int trh2 = tr. height ( ) / 2;
 			
 			int align = QPainter::AlignCenter;
 
 			if ( br. width ( ) + 2 * trh2 > tr. width ( ) ) {
 				br. setLeft ( tr. left ( ) + trh2 );
 				br. setWidth ( tr. width ( ) - 2 * trh2 );
 			
 				align = QPainter::AlignLeft | QPainter::AlignVCenter;
 			}
 			
 			p-> setBrush ( fillcol );
 			p-> setPen ( bordercol /*Qt::NoPen*/ );
 			p->	drawChord ( br. left ( ) - trh2, tr. top ( ), 2 * trh2, tr. height ( ), 90*16, 180*16 );
 			p->	drawChord ( br. right ( ) + 1 - trh2, tr. top ( ), 2 * trh2, tr. height ( ), 90*16, -180*16 );
 
 			p-> fillRect ( br.left() - 1, tr. top ( ), br. width ( ) + 2, tr. height ( ), fillcol);
 				
 			p-> setPen ( shadecol );
 			p-> drawText ( br, align, wd-> caption );
 			p-> setPen ( textcol );
 			br. moveBy ( -1, -1 );
 			p-> drawText ( br, align, wd-> caption );
 			break;
 		}
 		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
@@ -1,25 +1,23 @@
 #ifndef __OPIE_LIQUIDDECO_PLUGIN_H__
 #define __OPIE_LIQUIDDECO_PLUGIN_H__
 
 #include <qpe/windowdecorationinterface.h>
 
 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
@@ -1,73 +1,73 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** 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;
 	case BottomBorder:
 	    return 6;
 	case TitleHeight:
 	    if ( QApplication::desktop()->height() > 320 )
 		return 20;
 	    else
 		return 18;
 	default:
 	    return WindowDecorationInterface::metric( m, wd );
 	    break;
     }
 
     return 0;
 }
 
 void PolishedDecoration::drawArea( Area a, QPainter *p, const WindowData *wd ) const
 {
     int th = metric( TitleHeight, wd );
     QRect r = wd->rect;
 
     switch ( a ) {
 	case Border:
 	    {
 		const QColorGroup &cg = wd->palette.active();
 		QColor c;
 		if ( wd->flags & WindowData::Active ) {
 		    c = cg.color(QColorGroup::Highlight);
 		} else {
 		    c = cg.color(QColorGroup::Background);
 		}
 		drawBlend( p, QRect(r.x(),r.bottom()+1,r.width(),metric(BottomBorder,wd)), c.dark(180), c.light() );
 		int lb = metric(LeftBorder,wd);
@@ -113,59 +113,61 @@ void PolishedDecoration::drawButton( Button b, QPainter *p, const WindowData *wd
     WindowDecorationInterface::drawButton( b, p, wd, x, y, w, h, state );
 }
 
 QRegion PolishedDecoration::mask( const WindowData *wd ) const
 {
     return WindowDecorationInterface::mask( wd );
 }
 
 QString PolishedDecoration::name() const
 {
     return qApp->translate( "Decoration", "Polished" );
 }
 
 QPixmap PolishedDecoration::icon() const
 {
     return QPixmap();
 }
 
 void PolishedDecoration::drawBlend( QPainter *p, const QRect &r, const QColor &c1, const QColor &c2 ) const
 {
     int h1, h2, s1, s2, v1, v2;
     c1.hsv( &h1, &s1, &v1 );
     c2.hsv( &h2, &s2, &v2 );
 
     int split = r.height()/3;
 
     for ( int j = 0; j < split; j++ ) {
 	p->setPen( QColor( h1 + ((h2-h1)*(j+split))/(2*split-1),
 		    s1 + ((s2-s1)*(j+split))/(2*split-1),
 		    v1 + ((v2-v1)*(j+split))/(2*split-1), QColor::Hsv ) );
 	p->drawLine( r.x(), r.y()+j, r.right(), r.y()+j );
     }
 
     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
@@ -1,49 +1,47 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** 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.
 **
 **********************************************************************/
 
 #ifndef POLISHED_H
 #define POLISHED_H
 
 #include <qtopia/windowdecorationinterface.h>
 
 class PolishedDecoration : public WindowDecorationInterface
 {
 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
@@ -1013,90 +1013,90 @@ void FlatStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
 		p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame+1,
 			     y+m+1, tab, h-2*m, text_flags, s.mid( t+1 ));
 		p->setPen( discol );
 	    }
 	    p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame,
 			 y+m, tab, h-2*m, text_flags, s.mid( t+1 ) );
 	}
 	if ( dis && !act )
 	    p->setPen( discol );
 	p->drawText( x+xm, y+m, w-xm-tab+1, h-2*m, text_flags, s, t );
     } else if ( mi->pixmap() ) {			// draw pixmap
 	QPixmap *pixmap = mi->pixmap();
 	if ( pixmap->depth() == 1 )
 	    p->setBackgroundMode( OpaqueMode );
 	p->drawPixmap( x+xm, y+motifItemFrame, *pixmap );
 	if ( pixmap->depth() == 1 )
 	    p->setBackgroundMode( TransparentMode );
     }
     if ( mi->popup() ) {			// draw sub menu arrow
 	int dim = (h-2*motifItemFrame) / 2;
 	if ( act ) {
 	    if ( !dis )
 		discol = white;
 	    QColorGroup g2( discol, g.highlight(),
 			    white, white,
 			    dis ? discol : white,
 			    discol, white );
 	    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
 }
 
 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;
 }
 
 QString FlatStyleImpl::name() const
 {
     return qApp->translate("FlatStyle", "Flat", "Name of the style Flat");
 }
 
 QRESULT FlatStyleImpl::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;
 
     (*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( FlatStyleImpl )
 }
 
 #include "flat.moc"
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
@@ -67,52 +67,51 @@ public:
                           const QColorGroup &g, bool horizontal );
     int sliderLength() const;
     void drawSlider( QPainter *p, int x, int y, int w, int h,
 		    const QColorGroup &g, Orientation, bool tickAbove, bool tickBelow );
     void drawSliderMask( QPainter *p, int x, int y, int w, int h,
 		    Orientation, bool tickAbove, bool tickBelow );
     void drawSliderGrooveMask( QPainter *p, int x, int y, int w, int h,
 		    const QColorGroup& , QCOORD c, Orientation orient );
     void drawSliderGroove ( QPainter * p, int x, int y, int w, int h, const QColorGroup & g, QCOORD c, Orientation );
     void drawTab( QPainter *, const QTabBar *, QTab *, bool selected );
     void polishPopupMenu ( QPopupMenu * );
     int extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem*, const QFontMetrics& );
     int popupMenuItemHeight( bool checkable, QMenuItem*, const QFontMetrics& );
     void drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int tab, QMenuItem* mi,
 				       const QPalette& pal,
 				       bool act, bool enabled, int x, int y, int w, int h);
 
     int buttonMargin() const;
     QSize scrollBarExtent() const;
     void getButtonShift( int &x, int &y );
 
 private:
     FlatStylePrivate *d;
     bool revItem;
     bool fillBtnBorder;
     QColor btnBg;
     // Disabled copy constructor and operator=
 #if defined(Q_DISABLE_COPY)
     FlatStyle( const FlatStyle & );
     FlatStyle& operator=( const FlatStyle & );
 #endif
 };
 
 
 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
@@ -759,88 +759,90 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
 	    if ( dis && !act ) {
 		p->setPen( g.light() );
 		p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame+1,
 			     y+m+1, tab, h-2*m, text_flags, s.mid( t+1 ));
 		p->setPen( discol );
 	    }
 	    p->drawText( x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame,
 			 y+m, tab, h-2*m, text_flags, s.mid( t+1 ) );
 	}
 	if ( dis && !act ) {
 	    p->setPen( g.light() );
 	    p->drawText( x+xm+1, y+m+1, w-xm+1, h-2*m, text_flags, s, t );
 	    p->setPen( discol );
 	}
 	p->drawText( x+xm, y+m, w-xm-tab+1, h-2*m, text_flags, s, t );
     } else if ( mi->pixmap() ) {			// draw pixmap
 	QPixmap *pixmap = mi->pixmap();
 	if ( pixmap->depth() == 1 )
 	    p->setBackgroundMode( OpaqueMode );
 	p->drawPixmap( x+xm, y+motifItemFrame, *pixmap );
 	if ( pixmap->depth() == 1 )
 	    p->setBackgroundMode( TransparentMode );
     }
     if ( mi->popup() ) {			// draw sub menu arrow
 	int dim = (h-2*motifItemFrame) / 2;
 	if ( act ) {
 	    if ( !dis )
 		discol = white;
 	    QColorGroup g2( discol, g.highlight(),
 			    white, white,
 			    dis ? discol : white,
 			    discol, white );
 	    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
@@ -49,52 +49,51 @@ public:
     void drawExclusiveIndicator ( QPainter * p, int x, int y, int w, int h,
 		    const QColorGroup & g, bool on, bool down = FALSE, bool enabled = TRUE );
     void drawIndicator ( QPainter * p, int x, int y, int w, int h,
 		    const QColorGroup & g, int state, bool down = FALSE, bool enabled = TRUE );
     void scrollBarMetrics( const QScrollBar*, int&, int&, int&, int&);
     void drawScrollBarControls( QPainter*,  const QScrollBar*, int sliderStart, uint controls, uint activeControl );
     ScrollControl scrollBarPointOver( const QScrollBar* sb, int sliderStart, const QPoint& p );
     void drawRiffles( QPainter* p,  int x, int y, int w, int h,
                           const QColorGroup &g, bool horizontal );
     int sliderLength() const;
     void drawSlider( QPainter *p, int x, int y, int w, int h,
 		    const QColorGroup &g, Orientation, bool tickAbove, bool tickBelow );
     void drawSliderMask( QPainter *p, int x, int y, int w, int h,
 		    Orientation, bool tickAbove, bool tickBelow );
     void drawSliderGrooveMask( QPainter *p, int x, int y, int w, int h,
 		    const QColorGroup& , QCOORD c, Orientation orient );
     void drawTab( QPainter *, const QTabBar *, QTab *, bool selected );
     int extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem*, const QFontMetrics& );
     int popupMenuItemHeight( bool checkable, QMenuItem*, const QFontMetrics& );
     void drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int tab, QMenuItem* mi,
 				       const QPalette& pal,
 				       bool act, bool enabled, int x, int y, int w, int h);
 
     int buttonMargin() const;
     QSize scrollBarExtent() const;
 
 private:	// Disabled copy constructor and operator=
 #if defined(Q_DISABLE_COPY)
     FreshStyle( const FreshStyle & );
     FreshStyle& operator=( const FreshStyle & );
 #endif
 };
 
 
 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,79 +1,81 @@
 #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" );
 }
 
 QString LiquidInterface::description ( ) const
 {
 	return qApp-> translate ( "Styles", "High Performance Liquid style by Mosfet" );
 }
 
 bool LiquidInterface::hasSettings ( ) const
 {
 	return true;
 }
 
 QWidget *LiquidInterface::create ( QWidget *parent, const char *name )
 {
 	m_widget = new LiquidSettings ( parent, name ? name : "LIQUID-SETTINGS" );
 		
 	return m_widget;
 }
 
 bool LiquidInterface::accept ( )
 {
 	if ( !m_widget )
 		return false;
 
 	return m_widget-> writeConfig ( );
 }
 
 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
@@ -1,34 +1,33 @@
 #ifndef __OPIE_LIQUID_PLUGIN_H__
 #define __OPIE_LIQUID_PLUGIN_H__
 
 #include <qpe/styleinterface.h>
 
 class LiquidSettings;
 
 class LiquidInterface : public StyleExtendedInterface {
 public:
 	LiquidInterface ( );
 	virtual ~LiquidInterface ( );
 	
 	QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
 	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:
 	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
@@ -1,22 +1,20 @@
 #ifndef __OPIE_METAL_PLUGIN_H__
 #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,81 +1,83 @@
 #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" );
 }
 
 QString ThemeInterface::description ( ) const
 {
 	return qApp-> translate ( "Styles", "KDE2 theme compatible style engine" );
 }
 
 bool ThemeInterface::hasSettings ( ) const
 {
 	return true;
 }
 
 QWidget *ThemeInterface::create ( QWidget *parent, const char *name )
 {
 	m_widget = new ThemeSettings ( parent, name ? name : "THEME-SETTINGS" );
 		
 	return m_widget;
 }
 
 bool ThemeInterface::accept ( )
 {
 	if ( !m_widget )
 		return false;
 
 	return m_widget-> writeConfig ( );
 }
 
 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
@@ -1,33 +1,32 @@
 #ifndef __OPIE_THEME_PLUGIN_H__
 #define __OPIE_THEME_PLUGIN_H__
 
 #include <qpe/styleinterface.h>
 
 class ThemeSettings;
 
 class ThemeInterface : public StyleExtendedInterface {
 public:
 	ThemeInterface ( );
 	virtual ~ThemeInterface ( );
 	
 	QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
 	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
@@ -1,41 +1,40 @@
 /*
  * todopluginimpl.h
  *
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef FORTUNE_PLUGIN_IMPL_H
 #define FORTUNE_PLUGIN_IMPL_H
 
 #include <opie/todayplugininterface.h>
 
 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
@@ -1,40 +1,39 @@
 /*
  * stocktickerpluginimpl.h
  *
  * copyright   : (c) 2002 by L.J. Potter
  * email       : llornkcor@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef STOCKTICKER_PLUGIN_IMPL_H
 #define STOCKTICKER_PLUGIN_IMPL_H
 
 #include <opie/todayplugininterface.h>
 
 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
@@ -1,52 +1,51 @@
 /*
                              This file is part of the OPIE Project
                =.
              .=l.            Copyright (c)  2002 Dan Williams <williamsdr@acm.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef WEATHER_PLUGIN_IMPL_H
 #define WEATHER_PLUGIN_IMPL_H
 
 #include <opie/todayplugininterface.h>
 
 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