6 files changed, 9 insertions, 8 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
@@ -202,3 +202,3 @@ static void colorize( QImage &img, const QColor &c, bool rev )
 
-FlatDecoration::FlatDecoration() : ref(0), buttonCache(16)
+FlatDecoration::FlatDecoration() : buttonCache(16)
 {
@@ -349,2 +349,4 @@ QRESULT FlatDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **i
         *iface = this;
+    else
+        return QS_FALSE;
 
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
@@ -44,3 +44,2 @@ public:
 private:
-    ulong ref;
     QCache<QImage> 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
@@ -8,3 +8,3 @@
 
-LiquidDecoInterface::LiquidDecoInterface ( ) :  ref ( 0 )
+LiquidDecoInterface::LiquidDecoInterface ( ) 
 {
@@ -124,2 +124,4 @@ QRESULT LiquidDecoInterface::queryInterface ( const QUuid &uuid, QUnknownInterfa
                 *iface = this;
+        else
+            return QS_FALSE;
         
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
@@ -20,4 +20,2 @@ public:
         
-private:
-        ulong ref;
 };
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
@@ -24,3 +24,3 @@
 
-PolishedDecoration::PolishedDecoration() : ref(0)
+PolishedDecoration::PolishedDecoration() 
 {
@@ -160,2 +160,4 @@ QRESULT PolishedDecoration::queryInterface( const QUuid &uuid, QUnknownInterface
         *iface = this;
+    else
+        return QS_FALSE;
 
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
@@ -44,4 +44,2 @@ protected:
 
-private:
-    ulong ref;
 };