-rw-r--r-- | noncore/styles/flat/flat.cpp | 2 | ||||
-rw-r--r-- | noncore/styles/flat/flat.h | 1 | ||||
-rw-r--r-- | noncore/styles/fresh/fresh.cpp | 4 | ||||
-rw-r--r-- | noncore/styles/fresh/fresh.h | 1 | ||||
-rw-r--r-- | noncore/styles/liquid/plugin.cpp | 4 | ||||
-rw-r--r-- | noncore/styles/liquid/plugin.h | 1 | ||||
-rw-r--r-- | noncore/styles/metal/plugin.cpp | 4 | ||||
-rw-r--r-- | noncore/styles/metal/plugin.h | 2 | ||||
-rw-r--r-- | noncore/styles/theme/plugin.cpp | 4 | ||||
-rw-r--r-- | noncore/styles/theme/plugin.h | 1 |
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 @@ -1059,5 +1059,5 @@ void FlatStyle::getButtonShift( int &x, int &y ) FlatStyleImpl::FlatStyleImpl() - : flat(0), ref(0) + : flat(0) { } 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 @@ -113,5 +113,4 @@ public: private: FlatStyle *flat; - ulong ref; }; 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 @@ -805,5 +805,5 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int FreshStyleImpl::FreshStyleImpl() - : fresh(0), ref(0) + : fresh(0) { } @@ -834,4 +834,6 @@ QRESULT FreshStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **i else if ( uuid == IID_Style ) *iface = this; + else + return QS_FALSE; if ( *iface ) 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 @@ -95,5 +95,4 @@ public: private: FreshStyle *fresh; - ulong ref; }; 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 @@ -7,5 +7,5 @@ -LiquidInterface::LiquidInterface ( ) : ref ( 0 ) +LiquidInterface::LiquidInterface ( ) { m_widget = 0; @@ -66,4 +66,6 @@ QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface * else if ( uuid == IID_StyleExtended ) *iface = this; + else + return QS_FALSE; if ( *iface ) 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 @@ -29,5 +29,4 @@ public: private: LiquidSettings *m_widget; - ulong ref; }; 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 @@ -5,5 +5,5 @@ -MetalInterface::MetalInterface ( ) : ref ( 0 ) +MetalInterface::MetalInterface ( ) { } @@ -32,4 +32,6 @@ QRESULT MetalInterface::queryInterface ( const QUuid &uuid, QUnknownInterface ** else if ( uuid == IID_Style ) *iface = this; + else + return QS_FALSE; if ( *iface ) 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 @@ -16,6 +16,4 @@ public: virtual QString name ( ) const; -private: - ulong ref; }; 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 @@ -7,5 +7,5 @@ -ThemeInterface::ThemeInterface ( ) : ref ( 0 ) +ThemeInterface::ThemeInterface ( ) { m_widget = 0; @@ -66,4 +66,6 @@ QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface ** else if ( uuid == IID_StyleExtended ) *iface = this; + else + return QS_FALSE; if ( *iface ) 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 @@ -28,5 +28,4 @@ public: private: ThemeSettings *m_widget; - ulong ref; }; |