summaryrefslogtreecommitdiff
path: root/noncore/styles
Side-by-side diff
Diffstat (limited to 'noncore/styles') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/flat/flat.cpp2
-rw-r--r--noncore/styles/flat/flat.h1
-rw-r--r--noncore/styles/fresh/fresh.cpp4
-rw-r--r--noncore/styles/fresh/fresh.h1
-rw-r--r--noncore/styles/liquid/plugin.cpp4
-rw-r--r--noncore/styles/liquid/plugin.h1
-rw-r--r--noncore/styles/metal/plugin.cpp4
-rw-r--r--noncore/styles/metal/plugin.h2
-rw-r--r--noncore/styles/theme/plugin.cpp4
-rw-r--r--noncore/styles/theme/plugin.h1
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
@@ -1057,9 +1057,9 @@ void FlatStyle::getButtonShift( int &x, int &y )
//===========================================================================
FlatStyleImpl::FlatStyleImpl()
- : flat(0), ref(0)
+ : flat(0)
{
}
FlatStyleImpl::~FlatStyleImpl()
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
@@ -111,8 +111,7 @@ public:
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
@@ -803,9 +803,9 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
//===========================================================================
FreshStyleImpl::FreshStyleImpl()
- : fresh(0), ref(0)
+ : fresh(0)
{
}
FreshStyleImpl::~FreshStyleImpl()
@@ -832,8 +832,10 @@ QRESULT FreshStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **i
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
@@ -93,8 +93,7 @@ public:
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
@@ -5,9 +5,9 @@
#include "plugin.h"
-LiquidInterface::LiquidInterface ( ) : ref ( 0 )
+LiquidInterface::LiquidInterface ( )
{
m_widget = 0;
}
@@ -64,8 +64,10 @@ QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface *
else if ( uuid == IID_Style )
*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
@@ -27,8 +27,7 @@ public:
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
@@ -3,9 +3,9 @@
#include "metal.h"
#include "plugin.h"
-MetalInterface::MetalInterface ( ) : ref ( 0 )
+MetalInterface::MetalInterface ( )
{
}
MetalInterface::~MetalInterface ( )
@@ -30,8 +30,10 @@ QRESULT MetalInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **
if ( uuid == IID_QUnknown )
*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
@@ -14,9 +14,7 @@ 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
@@ -5,9 +5,9 @@
#include "plugin.h"
-ThemeInterface::ThemeInterface ( ) : ref ( 0 )
+ThemeInterface::ThemeInterface ( )
{
m_widget = 0;
}
@@ -64,8 +64,10 @@ QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **
else if ( uuid == IID_Style )
*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
@@ -26,8 +26,7 @@ public:
virtual void reject ( );
private:
ThemeSettings *m_widget;
- ulong ref;
};
#endif