summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/otaskbarapplet.h2
-rw-r--r--noncore/todayplugins/fortune/fortunepluginimpl.cpp4
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp4
-rw-r--r--noncore/todayplugins/weather/weatherpluginimpl.cpp3
4 files changed, 10 insertions, 3 deletions
diff --git a/libopie2/opieui/otaskbarapplet.h b/libopie2/opieui/otaskbarapplet.h
index 686b91a..773aba4 100644
--- a/libopie2/opieui/otaskbarapplet.h
+++ b/libopie2/opieui/otaskbarapplet.h
@@ -37,48 +37,50 @@
/*======================================================================================
* OTaskbarAppletWrapper
*======================================================================================*/
template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
{
public:
OTaskbarAppletWrapper():_applet( 0 ), ref( 0 )
{
}
virtual ~OTaskbarAppletWrapper()
{
delete _applet;
}
QRESULT queryInterface( const QUuid& uuid, QUnknownInterface** iface )
{
qDebug( "OTaskbarAppletWrapper::queryInterface()" );
*iface = 0;
if ( uuid == IID_QUnknown )
*iface = this;
else if ( uuid == IID_TaskbarApplet )
*iface = this;
+ else
+ return QS_FALSE;
if ( *iface ) (*iface)->addRef();
return QS_OK;
}
Q_REFCOUNT
virtual T* applet( QWidget* parent )
{
if ( !_applet ) _applet = new T( parent );
return _applet;
}
virtual int position() const
{
return T::position();
}
private:
T* _applet;
ulong ref;
};
#include <qframe.h>
diff --git a/noncore/todayplugins/fortune/fortunepluginimpl.cpp b/noncore/todayplugins/fortune/fortunepluginimpl.cpp
index 466e322..090aaa7 100644
--- a/noncore/todayplugins/fortune/fortunepluginimpl.cpp
+++ b/noncore/todayplugins/fortune/fortunepluginimpl.cpp
@@ -17,33 +17,35 @@
#include "fortuneplugin.h"
#include "fortunepluginimpl.h"
FortunePluginImpl::FortunePluginImpl()
{
fortunePlugin = new FortunePlugin();
}
FortunePluginImpl::~FortunePluginImpl()
{
delete fortunePlugin;
}
TodayPluginObject* FortunePluginImpl::guiPart()
{
return fortunePlugin;
}
QRESULT FortunePluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface )
{
*iface = 0;
if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) {
*iface = this, (*iface)->addRef();
- }
+ }else
+ return QS_FALSE;
+
return QS_OK;
}
Q_EXPORT_INTERFACE()
{
Q_CREATE_INSTANCE( FortunePluginImpl );
}
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp
index c17781b..ec3e34d 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp
@@ -15,32 +15,34 @@
***************************************************************************/
#include "stocktickerplugin.h"
#include "stocktickerpluginimpl.h"
StockTickerPluginImpl::StockTickerPluginImpl() {
stocktickerPlugin = new StockTickerPlugin();
}
StockTickerPluginImpl::~StockTickerPluginImpl() {
delete stocktickerPlugin;
}
TodayPluginObject* StockTickerPluginImpl::guiPart() {
return stocktickerPlugin;
}
QRESULT StockTickerPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) {
*iface = 0;
if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) {
*iface = this, (*iface)->addRef();
- }
+ }else
+ return QS_FALSE;
+
return QS_OK;
}
Q_EXPORT_INTERFACE() {
Q_CREATE_INSTANCE( StockTickerPluginImpl );
}
diff --git a/noncore/todayplugins/weather/weatherpluginimpl.cpp b/noncore/todayplugins/weather/weatherpluginimpl.cpp
index 1a7c27b..fd32a44 100644
--- a/noncore/todayplugins/weather/weatherpluginimpl.cpp
+++ b/noncore/todayplugins/weather/weatherpluginimpl.cpp
@@ -30,33 +30,34 @@
#include "weatherpluginimpl.h"
WeatherPluginImpl::WeatherPluginImpl()
{
weatherPlugin = new WeatherPlugin();
}
WeatherPluginImpl::~WeatherPluginImpl()
{
delete weatherPlugin;
}
TodayPluginObject* WeatherPluginImpl::guiPart()
{
return weatherPlugin;
}
QRESULT WeatherPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
{
*iface = 0;
if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) )
{
*iface = this, (*iface)->addRef();
- }
+ }else
+ return QS_FALSE;
return QS_OK;
}
Q_EXPORT_INTERFACE()
{
Q_CREATE_INSTANCE( WeatherPluginImpl );
}