summaryrefslogtreecommitdiff
path: root/noncore
authorzecke <zecke>2004-02-05 17:42:00 (UTC)
committer zecke <zecke>2004-02-05 17:42:00 (UTC)
commitc79bbb6696edf7539ebeda64092f3f91f65ba500 (patch) (side-by-side diff)
treecb05c94b563d42bb27628d398dbb28beebdee46d /noncore
parent4ce8201e80a0b60a8e5d9d875bf00602303d6a0b (diff)
downloadopie-c79bbb6696edf7539ebeda64092f3f91f65ba500.zip
opie-c79bbb6696edf7539ebeda64092f3f91f65ba500.tar.gz
opie-c79bbb6696edf7539ebeda64092f3f91f65ba500.tar.bz2
Janitor: remove ulong ref
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/decorations/flat/flat.cpp4
-rw-r--r--noncore/decorations/flat/flat.h1
-rw-r--r--noncore/decorations/liquid/liquid.cpp4
-rw-r--r--noncore/decorations/liquid/liquid.h2
-rw-r--r--noncore/decorations/polished/polished.cpp4
-rw-r--r--noncore/decorations/polished/polished.h2
-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
-rw-r--r--noncore/todayplugins/fortune/fortunepluginimpl.h1
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h1
-rw-r--r--noncore/todayplugins/weather/weatherpluginimpl.h1
19 files changed, 22 insertions, 22 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
@@ -197,13 +197,13 @@ static void colorize( QImage &img, const QColor &c, bool rev )
bool sc = (img.color(i) & 0xff000000);
if ( rev ) sc = !sc;
img.setColor(i, sc ? c.rgb() : 0x00000000 );
}
}
-FlatDecoration::FlatDecoration() : ref(0), buttonCache(16)
+FlatDecoration::FlatDecoration() : buttonCache(16)
{
buttonCache.setAutoDelete(TRUE);
}
FlatDecoration::~FlatDecoration()
{
@@ -344,12 +344,14 @@ QRESULT FlatDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **i
{
*iface = 0;
if ( uuid == IID_QUnknown )
*iface = this;
else if ( uuid == IID_WindowDecoration )
*iface = this;
+ else
+ return QS_FALSE;
if ( *iface )
(*iface)->addRef();
return QS_OK;
}
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
@@ -39,11 +39,10 @@ public:
virtual QPixmap icon() const;
QRESULT queryInterface( const QUuid&, QUnknownInterface** );
Q_REFCOUNT
private:
- ulong ref;
QCache<QImage> buttonCache;
};
#endif
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
@@ -3,13 +3,13 @@
#include <qapplication.h>
#include <qpainter.h>
#include <qpalette.h>
#include <qdrawutil.h>
-LiquidDecoInterface::LiquidDecoInterface ( ) : ref ( 0 )
+LiquidDecoInterface::LiquidDecoInterface ( )
{
}
LiquidDecoInterface::~LiquidDecoInterface ( )
{
}
@@ -119,12 +119,14 @@ QRESULT LiquidDecoInterface::queryInterface ( const QUuid &uuid, QUnknownInterfa
*iface = 0;
if ( uuid == IID_QUnknown )
*iface = this;
else if ( uuid == IID_WindowDecoration )
*iface = this;
+ else
+ return QS_FALSE;
if ( *iface )
(*iface)-> addRef ( );
return QS_OK;
}
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
@@ -15,11 +15,9 @@ public:
virtual void drawArea( Area a, QPainter *, const WindowData * ) const;
virtual QString name ( ) const;
virtual QPixmap icon ( ) const;
-private:
- ulong ref;
};
#endif
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
@@ -19,13 +19,13 @@
**********************************************************************/
#include "polished.h"
#include <qpainter.h>
#include <qapplication.h>
-PolishedDecoration::PolishedDecoration() : ref(0)
+PolishedDecoration::PolishedDecoration()
{
}
PolishedDecoration::~PolishedDecoration()
{
}
@@ -155,12 +155,14 @@ QRESULT PolishedDecoration::queryInterface( const QUuid &uuid, QUnknownInterface
{
*iface = 0;
if ( uuid == IID_QUnknown )
*iface = this;
else if ( uuid == IID_WindowDecoration )
*iface = this;
+ else
+ return QS_FALSE;
if ( *iface )
(*iface)->addRef();
return QS_OK;
}
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
@@ -39,11 +39,9 @@ public:
QRESULT queryInterface( const QUuid&, QUnknownInterface** );
Q_REFCOUNT
protected:
void PolishedDecoration::drawBlend( QPainter *, const QRect &r, const QColor &c1, const QColor&c2 ) const;
-private:
- ulong ref;
};
#endif
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
diff --git a/noncore/todayplugins/fortune/fortunepluginimpl.h b/noncore/todayplugins/fortune/fortunepluginimpl.h
index 070f03e..8e380f5 100644
--- a/noncore/todayplugins/fortune/fortunepluginimpl.h
+++ b/noncore/todayplugins/fortune/fortunepluginimpl.h
@@ -32,10 +32,9 @@ public:
Q_REFCOUNT
virtual TodayPluginObject *guiPart();
private:
FortunePlugin *fortunePlugin;
- ulong ref;
};
#endif
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h
index 300c545..db5b8f9 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h
@@ -31,10 +31,9 @@ public:
Q_REFCOUNT
virtual TodayPluginObject *guiPart();
private:
StockTickerPlugin *stocktickerPlugin;
- ulong ref;
};
#endif
diff --git a/noncore/todayplugins/weather/weatherpluginimpl.h b/noncore/todayplugins/weather/weatherpluginimpl.h
index aad8958..eaaae1d 100644
--- a/noncore/todayplugins/weather/weatherpluginimpl.h
+++ b/noncore/todayplugins/weather/weatherpluginimpl.h
@@ -43,10 +43,9 @@ class WeatherPluginImpl : public TodayPluginInterface
Q_REFCOUNT
virtual TodayPluginObject *guiPart();
private:
WeatherPlugin *weatherPlugin;
- ulong ref;
};
#endif