17 files changed, 37 insertions, 3 deletions

diff --git a/core/applets/batteryapplet/batteryappletimpl.cpp b/core/applets/batteryapplet/batteryappletimpl.cpp
index 3f3079a..9ad0382 100644
--- a/core/applets/batteryapplet/batteryappletimpl.cpp
+++ b/core/applets/batteryapplet/batteryappletimpl.cpp
@@ -41,23 +41,25 @@ QWidget *BatteryAppletImpl::applet( QWidget *parent )
 int BatteryAppletImpl::position() const
 {
     return 8;
 }
 
 QRESULT BatteryAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *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_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( BatteryAppletImpl )
 }
 
diff --git a/core/applets/cardmon/cardmonimpl.cpp b/core/applets/cardmon/cardmonimpl.cpp
index 0aa55de..265214e 100644
--- a/core/applets/cardmon/cardmonimpl.cpp
+++ b/core/applets/cardmon/cardmonimpl.cpp
@@ -18,23 +18,25 @@ QWidget *CardMonitorImpl::applet( QWidget *parent ) {
 }
 
 int CardMonitorImpl::position() const {
     return 7;
 }
 
 QRESULT CardMonitorImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
     *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_EXPORT_INTERFACE() {
     Q_CREATE_INSTANCE( CardMonitorImpl )
 }
diff --git a/core/applets/clipboardapplet/clipboardappletimpl.cpp b/core/applets/clipboardapplet/clipboardappletimpl.cpp
index 8080690..8fcf117 100644
--- a/core/applets/clipboardapplet/clipboardappletimpl.cpp
+++ b/core/applets/clipboardapplet/clipboardappletimpl.cpp
@@ -41,24 +41,26 @@ QWidget *ClipboardAppletImpl::applet( QWidget *parent )
 int ClipboardAppletImpl::position() const
 {
     return 6;
 }
 
 QRESULT ClipboardAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *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_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( ClipboardAppletImpl )
 }
 
 
diff --git a/core/applets/clockapplet/clockappletimpl.cpp b/core/applets/clockapplet/clockappletimpl.cpp
index 8bf1baf..2b9cc05 100644
--- a/core/applets/clockapplet/clockappletimpl.cpp
+++ b/core/applets/clockapplet/clockappletimpl.cpp
@@ -42,24 +42,26 @@ int ClockAppletImpl::position() const
 {
     return 10;
 }
 
 #ifndef QT_NO_COMPONENT
 QRESULT ClockAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *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_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( ClockAppletImpl )
 }
 #endif
 
diff --git a/core/applets/homeapplet/home.cpp b/core/applets/homeapplet/home.cpp
index 017de27..36307ab 100644
--- a/core/applets/homeapplet/home.cpp
+++ b/core/applets/homeapplet/home.cpp
@@ -62,24 +62,26 @@ void HomeApplet::activated ( )
         // to desktop (home)
         QCopEnvelope ( "QPE/Application/qpe", "raise()" );
 }
 
 
 QRESULT HomeApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
         *iface = 0;
         if ( uuid == IID_QUnknown )
                 *iface = this;
         else if ( uuid == IID_MenuApplet )
                 *iface = this;
+        else
+            return QS_FALSE;
 
         if ( *iface )
                 (*iface)-> addRef ( );
         return QS_OK;
 }
 
 Q_EXPORT_INTERFACE( )
 {
         Q_CREATE_INSTANCE( HomeApplet )
 }
 
 
diff --git a/core/applets/irdaapplet/irdaappletimpl.cpp b/core/applets/irdaapplet/irdaappletimpl.cpp
index 02443db..3617698 100644
--- a/core/applets/irdaapplet/irdaappletimpl.cpp
+++ b/core/applets/irdaapplet/irdaappletimpl.cpp
@@ -41,24 +41,26 @@ QWidget *IrdaAppletImpl::applet( QWidget *parent )
 int IrdaAppletImpl::position() const
 {
     return 6;
 }
 
 QRESULT IrdaAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *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_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( IrdaAppletImpl )
 }
 
 
diff --git a/core/applets/logoutapplet/logout.cpp b/core/applets/logoutapplet/logout.cpp
index 1769ae6..8d3cdba 100644
--- a/core/applets/logoutapplet/logout.cpp
+++ b/core/applets/logoutapplet/logout.cpp
@@ -102,23 +102,25 @@ void LogoutApplet::activated ( )
                 qApp-> quit();
         }
 }
 
 
 QRESULT LogoutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
         *iface = 0;
         if ( uuid == IID_QUnknown )
                 *iface = this;
         else if ( uuid == IID_MenuApplet )
                 *iface = this;
+        else
+            return QS_FALSE;
 
         if ( *iface )
                 (*iface)-> addRef ( );
         return QS_OK;
 }
 
 Q_EXPORT_INTERFACE( )
 {
         Q_CREATE_INSTANCE( LogoutApplet )
 }
 
diff --git a/core/applets/multikeyapplet/multikeyappletimpl.cpp b/core/applets/multikeyapplet/multikeyappletimpl.cpp
index 4644556..adf92c4 100644
--- a/core/applets/multikeyapplet/multikeyappletimpl.cpp
+++ b/core/applets/multikeyapplet/multikeyappletimpl.cpp
@@ -35,23 +35,25 @@ int MultikeyAppletImpl::position() const
 {
     return 10;
 }
 
 #ifndef QT_NO_COMPONENT
 QRESULT MultikeyAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *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_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( MultikeyAppletImpl )
 }
 #endif
diff --git a/core/applets/restartapplet/restartappletimpl.cpp b/core/applets/restartapplet/restartappletimpl.cpp
index e675c0b..5b0092d 100644
--- a/core/applets/restartapplet/restartappletimpl.cpp
+++ b/core/applets/restartapplet/restartappletimpl.cpp
@@ -42,24 +42,26 @@ QWidget *RestartAppletImpl::applet( QWidget *parent )
 int RestartAppletImpl::position() const
 {
     return 6;
 }
 
 QRESULT RestartAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *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_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( RestartAppletImpl )
 }
 
 
diff --git a/core/applets/restartapplet2/restart.cpp b/core/applets/restartapplet2/restart.cpp
index caed9e5..576087b 100644
--- a/core/applets/restartapplet2/restart.cpp
+++ b/core/applets/restartapplet2/restart.cpp
@@ -84,24 +84,26 @@ void RestartApplet::activated ( )
 {
     QCopEnvelope e("QPE/System", "restart()");
 }
 
 
 QRESULT RestartApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
   *iface = 0;
   if ( uuid == IID_QUnknown )
     *iface = this;
   else if ( uuid == IID_MenuApplet )
     *iface = this;
+  else
+    return QS_FALSE;
 
   if ( *iface )
     (*iface)-> addRef ( );
   return QS_OK;
 }
 
 Q_EXPORT_INTERFACE( )
 {
   Q_CREATE_INSTANCE( RestartApplet )
 }
 
 
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index 906063e..b676c74 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -233,22 +233,24 @@ void RotateApplet::activated()
 
     m_flipped = !m_flipped;
 }
 
 
 QRESULT RotateApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_MenuApplet )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( RotateApplet )
 }
diff --git a/core/applets/screenshotapplet/screenshotappletimpl.cpp b/core/applets/screenshotapplet/screenshotappletimpl.cpp
index a537162..4a7512e 100644
--- a/core/applets/screenshotapplet/screenshotappletimpl.cpp
+++ b/core/applets/screenshotapplet/screenshotappletimpl.cpp
@@ -41,24 +41,26 @@ QWidget *ScreenshotAppletImpl::applet( QWidget *parent )
 int ScreenshotAppletImpl::position() const
 {
     return 6;
 }
 
 QRESULT ScreenshotAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *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_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( ScreenshotAppletImpl )
 }
 
 
diff --git a/core/applets/suspendapplet/suspend.cpp b/core/applets/suspendapplet/suspend.cpp
index 4bdc8fb..63f16b8 100644
--- a/core/applets/suspendapplet/suspend.cpp
+++ b/core/applets/suspendapplet/suspend.cpp
@@ -62,24 +62,26 @@ void SuspendApplet::activated ( )
         // suspend
         QCopEnvelope ( "QPE/System", "suspend()" );
 }
 
 
 QRESULT SuspendApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
         *iface = 0;
         if ( uuid == IID_QUnknown )
                 *iface = this;
         else if ( uuid == IID_MenuApplet )
                 *iface = this;
+        else
+            return QS_FALSE;
 
         if ( *iface )
                 (*iface)-> addRef ( );
         return QS_OK;
 }
 
 Q_EXPORT_INTERFACE( )
 {
         Q_CREATE_INSTANCE( SuspendApplet )
 }
 
 
diff --git a/core/applets/vmemo/vmemoimpl.cpp b/core/applets/vmemo/vmemoimpl.cpp
index ef4a3a6..71d47e5 100644
--- a/core/applets/vmemo/vmemoimpl.cpp
+++ b/core/applets/vmemo/vmemoimpl.cpp
@@ -38,22 +38,24 @@ QWidget *VMemoAppletImpl::applet( QWidget *parent )
 int VMemoAppletImpl::position() const
 {
     return 6;
 }
 
 QRESULT VMemoAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *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_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( VMemoAppletImpl )
         }
diff --git a/core/applets/volumeapplet/volumeappletimpl.cpp b/core/applets/volumeapplet/volumeappletimpl.cpp
index 47506cc..80b3e74 100644
--- a/core/applets/volumeapplet/volumeappletimpl.cpp
+++ b/core/applets/volumeapplet/volumeappletimpl.cpp
@@ -42,24 +42,26 @@ QWidget *VolumeAppletImpl::applet( QWidget *parent )
 int VolumeAppletImpl::position() const
 {
         return 6;
 }
 
 QRESULT VolumeAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
         *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_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( VolumeAppletImpl )
 }
 
 
diff --git a/core/applets/vtapplet/vt.cpp b/core/applets/vtapplet/vt.cpp
index 4cc2d60..cdd3c97 100644
--- a/core/applets/vtapplet/vt.cpp
+++ b/core/applets/vtapplet/vt.cpp
@@ -139,24 +139,26 @@ void VTApplet::activated()
 {
     qDebug( "VTApplet::activated()" );
 }
 
 
 QRESULT VTApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
         *iface = 0;
         if ( uuid == IID_QUnknown )
                 *iface = this;
         else if ( uuid == IID_MenuApplet )
                 *iface = this;
+        else
+            return QS_FALSE;
 
         if ( *iface )
                 (*iface)-> addRef ( );
         return QS_OK;
 }
 
 Q_EXPORT_INTERFACE( )
 {
         Q_CREATE_INSTANCE( VTApplet )
 }
 
 
diff --git a/core/obex/obeximpl.cpp b/core/obex/obeximpl.cpp
index 5bfc779..5b53644 100644
--- a/core/obex/obeximpl.cpp
+++ b/core/obex/obeximpl.cpp
@@ -8,23 +8,25 @@ using namespace OpieObex;
 ObexImpl::ObexImpl() {
     m_handler = new ObexHandler;
 }
 ObexImpl::~ObexImpl() {
     delete m_handler;
 }
 QRESULT ObexImpl::queryInterface( const QUuid& uuid, QUnknownInterface **iface ) {
     *iface = 0;
     if ( uuid == IID_QUnknown ) {
         *iface = this;
     }else if ( uuid == IID_ObexInterface )
         *iface = this;
+    else
+        return QS_FALSE;
 
     if (*iface)
         (*iface)->addRef();
 
     return QS_OK;
 }
 
 
 Q_EXPORT_INTERFACE() {
     Q_CREATE_INSTANCE( ObexImpl )
 }