Janitor: remove ulong ref

10 files changed, 13 insertions, 11 deletions

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
@@ -1055,13 +1055,13 @@ 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
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
@@ -109,10 +109,9 @@ public:
 
     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
@@ -801,13 +801,13 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
 #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
@@ -830,12 +830,14 @@ QRESULT FreshStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **i
 {
     *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;
 }
 
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
@@ -91,10 +91,9 @@ public:
 
     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
@@ -3,13 +3,13 @@
 #include "liquid.h"
 #include "liquidset.h"
 #include "plugin.h"
 
 
 
-LiquidInterface::LiquidInterface ( ) :  ref ( 0 )
+LiquidInterface::LiquidInterface ( ) 
 {
 	m_widget = 0;
 }
     
 LiquidInterface::~LiquidInterface ( )
 {
@@ -62,12 +62,14 @@ QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface *
 	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;
 }
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
@@ -25,10 +25,9 @@ public:
     
 	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,13 +1,13 @@
 #include <qapplication.h>
 
 #include "metal.h"
 #include "plugin.h"
 
 
-MetalInterface::MetalInterface ( ) :  ref ( 0 )
+MetalInterface::MetalInterface ( ) 
 {
 }
     
 MetalInterface::~MetalInterface ( )
 {
 }
@@ -28,12 +28,14 @@ QRESULT MetalInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **
 	*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;
 }
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
@@ -12,11 +12,9 @@ public:
 	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
@@ -3,13 +3,13 @@
 #include "othemestyle.h"
 #include "themeset.h"
 #include "plugin.h"
 
 
 
-ThemeInterface::ThemeInterface ( ) :  ref ( 0 )
+ThemeInterface::ThemeInterface ( ) 
 {
 	m_widget = 0;
 }
     
 ThemeInterface::~ThemeInterface ( )
 {
@@ -62,12 +62,14 @@ QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **
 	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;
 }
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
@@ -24,10 +24,9 @@ public:
     
 	virtual bool accept ( );            
 	virtual void reject ( );
 	
 private:
 	ThemeSettings *m_widget;
-	ulong ref;
 };
 
 #endif