summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (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
@@ -201,5 +201,5 @@ static void colorize( QImage &img, const QColor &c, bool rev )
}
-FlatDecoration::FlatDecoration() : ref(0), buttonCache(16)
+FlatDecoration::FlatDecoration() : buttonCache(16)
{
buttonCache.setAutoDelete(TRUE);
@@ -348,4 +348,6 @@ QRESULT FlatDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **i
else if ( uuid == IID_WindowDecoration )
*iface = this;
+ else
+ return QS_FALSE;
if ( *iface )
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
@@ -43,5 +43,4 @@ public:
private:
- ulong ref;
QCache<QImage> buttonCache;
};
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
@@ -7,5 +7,5 @@
-LiquidDecoInterface::LiquidDecoInterface ( ) : ref ( 0 )
+LiquidDecoInterface::LiquidDecoInterface ( )
{
}
@@ -123,4 +123,6 @@ QRESULT LiquidDecoInterface::queryInterface ( const QUuid &uuid, QUnknownInterfa
else if ( uuid == IID_WindowDecoration )
*iface = this;
+ else
+ return QS_FALSE;
if ( *iface )
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
@@ -19,6 +19,4 @@ public:
virtual QPixmap icon ( ) const;
-private:
- ulong ref;
};
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
@@ -23,5 +23,5 @@
#include <qapplication.h>
-PolishedDecoration::PolishedDecoration() : ref(0)
+PolishedDecoration::PolishedDecoration()
{
}
@@ -159,4 +159,6 @@ QRESULT PolishedDecoration::queryInterface( const QUuid &uuid, QUnknownInterface
else if ( uuid == IID_WindowDecoration )
*iface = this;
+ else
+ return QS_FALSE;
if ( *iface )
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
@@ -43,6 +43,4 @@ protected:
void PolishedDecoration::drawBlend( QPainter *, const QRect &r, const QColor &c1, const QColor&c2 ) const;
-private:
- ulong ref;
};
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;
};
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
@@ -36,5 +36,4 @@ public:
private:
FortunePlugin *fortunePlugin;
- ulong ref;
};
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
@@ -35,5 +35,4 @@ public:
private:
StockTickerPlugin *stocktickerPlugin;
- ulong ref;
};
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
@@ -47,5 +47,4 @@ class WeatherPluginImpl : public TodayPluginInterface
private:
WeatherPlugin *weatherPlugin;
- ulong ref;
};