summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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
@@ -191,25 +191,25 @@ static QImage scaleButton( const QImage &img, int height )
}
}
static void colorize( QImage &img, const QColor &c, bool rev )
{
for ( int i = 0; i < img.numColors(); i++ ) {
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()
{
}
int FlatDecoration::metric( Metric m, const WindowData *wd ) const
{
switch ( m ) {
case TopBorder:
@@ -338,23 +338,25 @@ QString FlatDecoration::name() const
QPixmap FlatDecoration::icon() const
{
return QPixmap();
}
QRESULT FlatDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
{
*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;
}
Q_EXPORT_INTERFACE()
{
Q_CREATE_INSTANCE( FlatDecoration )
}
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
@@ -33,17 +33,16 @@ public:
virtual int metric( Metric m, const WindowData * ) const;
virtual void drawArea( Area a, QPainter *, const WindowData * ) const;
virtual void drawButton( Button b, QPainter *, const WindowData *, int x, int y, int w, int h, QWSButton::State ) const;
virtual QRegion mask( const WindowData * ) const;
virtual QString name() const;
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
@@ -1,21 +1,21 @@
#include "liquid.h"
#include <qapplication.h>
#include <qpainter.h>
#include <qpalette.h>
#include <qdrawutil.h>
-LiquidDecoInterface::LiquidDecoInterface ( ) : ref ( 0 )
+LiquidDecoInterface::LiquidDecoInterface ( )
{
}
LiquidDecoInterface::~LiquidDecoInterface ( )
{
}
QString LiquidDecoInterface::name ( ) const
{
return qApp-> translate ( "Decoration", "Liquid" );
@@ -113,24 +113,26 @@ void LiquidDecoInterface::drawArea( Area a, QPainter *p, const WindowData *wd )
}
}
}
QRESULT LiquidDecoInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
{
*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;
}
Q_EXPORT_INTERFACE()
{
Q_CREATE_INSTANCE( LiquidDecoInterface )
}
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
@@ -9,17 +9,15 @@ class LiquidDecoInterface : public WindowDecorationInterface {
public:
LiquidDecoInterface ( );
virtual ~LiquidDecoInterface ( );
QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
Q_REFCOUNT
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
@@ -13,25 +13,25 @@
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#include "polished.h"
#include <qpainter.h>
#include <qapplication.h>
-PolishedDecoration::PolishedDecoration() : ref(0)
+PolishedDecoration::PolishedDecoration()
{
}
PolishedDecoration::~PolishedDecoration()
{
}
int PolishedDecoration::metric( Metric m, const WindowData *wd ) const
{
switch ( m ) {
case TopBorder:
return 1;
@@ -149,23 +149,25 @@ void PolishedDecoration::drawBlend( QPainter *p, const QRect &r, const QColor &c
v1 + ((v2-v1)*j)/(r.height()-split-1), QColor::Hsv ) );
p->drawLine( r.x(), r.bottom()-j, r.right(), r.bottom()-j );
}
}
QRESULT PolishedDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
{
*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;
}
Q_EXPORT_INTERFACE()
{
Q_CREATE_INSTANCE( PolishedDecoration )
}
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
@@ -33,17 +33,15 @@ public:
virtual void drawArea( Area a, QPainter *, const WindowData * ) const;
virtual void drawButton( Button b, QPainter *, const WindowData *, int x, int y, int w, int h, QWSButton::State ) const;
virtual QRegion mask( const WindowData * ) const;
virtual QString name() const;
virtual QPixmap icon() const;
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
@@ -1049,25 +1049,25 @@ void FlatStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
}
#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 )
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
@@ -103,16 +103,15 @@ 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
@@ -795,25 +795,25 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
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 )
@@ -824,23 +824,25 @@ QStyle *FreshStyleImpl::style()
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
@@ -85,16 +85,15 @@ 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,21 +1,21 @@
#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 ( );
}
@@ -56,24 +56,26 @@ 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
@@ -19,16 +19,15 @@ public:
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,19 +1,19 @@
#include <qapplication.h>
#include "metal.h"
#include "plugin.h"
-MetalInterface::MetalInterface ( ) : ref ( 0 )
+MetalInterface::MetalInterface ( )
{
}
MetalInterface::~MetalInterface ( )
{
}
QStyle *MetalInterface::style ( )
{
return new MetalStyle ( );
}
@@ -22,24 +22,26 @@ 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
@@ -6,17 +6,15 @@
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,21 +1,21 @@
#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 ( "" );
}
@@ -56,24 +56,26 @@ 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
@@ -18,16 +18,15 @@ public:
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
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
@@ -26,16 +26,15 @@ class FortunePluginImpl : public TodayPluginInterface
public:
FortunePluginImpl();
virtual ~FortunePluginImpl();
QRESULT queryInterface( const QUuid &, QUnknownInterface** );
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
@@ -25,16 +25,15 @@ class StockTickerPluginImpl : public TodayPluginInterface{
public:
StockTickerPluginImpl();
virtual ~StockTickerPluginImpl();
QRESULT queryInterface( const QUuid &, QUnknownInterface** );
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
@@ -37,16 +37,15 @@ class WeatherPluginImpl : public TodayPluginInterface
{
public:
WeatherPluginImpl();
virtual ~WeatherPluginImpl();
QRESULT queryInterface( const QUuid &, QUnknownInterface ** );
Q_REFCOUNT
virtual TodayPluginObject *guiPart();
private:
WeatherPlugin *weatherPlugin;
- ulong ref;
};
#endif