author | zecke <zecke> | 2004-02-05 17:42:00 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-05 17:42:00 (UTC) |
commit | c79bbb6696edf7539ebeda64092f3f91f65ba500 (patch) (side-by-side diff) | |
tree | cb05c94b563d42bb27628d398dbb28beebdee46d /noncore/styles | |
parent | 4ce8201e80a0b60a8e5d9d875bf00602303d6a0b (diff) | |
download | opie-c79bbb6696edf7539ebeda64092f3f91f65ba500.zip opie-c79bbb6696edf7539ebeda64092f3f91f65ba500.tar.gz opie-c79bbb6696edf7539ebeda64092f3f91f65ba500.tar.bz2 |
Janitor: remove ulong ref
-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 @@ -1037,49 +1037,49 @@ void FlatStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int 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; 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 @@ -91,28 +91,27 @@ private: 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 @@ -783,64 +783,66 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int 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 @@ -73,28 +73,27 @@ public: 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,33 +1,33 @@ #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 @@ -44,36 +44,38 @@ QWidget *LiquidInterface::create ( QWidget *parent, const char *name ) 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 @@ -7,28 +7,27 @@ 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,33 +1,33 @@ #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 @@ -44,38 +44,40 @@ QWidget *ThemeInterface::create ( QWidget *parent, const char *name ) 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 @@ -6,28 +6,27 @@ 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 |