Funny what my SDK all triggers

Ok the reason to use a bool as return type is that you can
say that something worked or not worked.
So if we don't implement the given interface don't lie!!

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
@@ -5,59 +5,61 @@
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** 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 "battery.h"
 #include "batteryappletimpl.h"
 
 
 BatteryAppletImpl::BatteryAppletImpl()
     : battery(0), ref(0)
 {
 }
 
 BatteryAppletImpl::~BatteryAppletImpl()
 {
     delete battery;
 }
 
 QWidget *BatteryAppletImpl::applet( QWidget *parent )
 {
     if ( !battery )
 	battery = new BatteryMeter( parent );
     return battery;
 }
 
 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
@@ -1,40 +1,42 @@
 #include "cardmon.h"
 #include "cardmonimpl.h"
 
 
 CardMonitorImpl::CardMonitorImpl()
     : cardMonitor(0), ref(0) {
 }
 
 CardMonitorImpl::~CardMonitorImpl() {
     delete cardMonitor;
 }
 
 QWidget *CardMonitorImpl::applet( QWidget *parent ) {
     if ( !cardMonitor ) {
 	cardMonitor = new CardMonitor( parent );
     }
     return cardMonitor;
 }
 
 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
@@ -5,60 +5,62 @@
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** 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 "clipboard.h"
 #include "clipboardappletimpl.h"
 
 
 ClipboardAppletImpl::ClipboardAppletImpl()
     : clipboard(0), ref(0)
 {
 }
 
 ClipboardAppletImpl::~ClipboardAppletImpl()
 {
     delete clipboard;
 }
 
 QWidget *ClipboardAppletImpl::applet( QWidget *parent )
 {
     if ( !clipboard )
 	clipboard = new ClipboardApplet( parent );
     return clipboard;
 }
 
 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
@@ -6,60 +6,62 @@
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** 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 "clock.h"
 #include "clockappletimpl.h"
 
 
 ClockAppletImpl::ClockAppletImpl()
     : clock(0), ref(0)
 {
 }
 
 ClockAppletImpl::~ClockAppletImpl()
 {
     delete clock;
 }
 
 QWidget *ClockAppletImpl::applet( QWidget *parent )
 {
     if ( !clock )
 	clock = new LauncherClock( parent );
     return clock;
 }
 
 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
@@ -26,60 +26,62 @@ QString HomeApplet::name ( ) const
 {
 	return tr( "Home shortcut" );
 }
 
 QString HomeApplet::text ( ) const
 {
 	return tr( "Desktop" );
 }
 
 QString HomeApplet::tr( const char* s ) const
 {
     return qApp->translate( "HomeApplet", s, 0 );
 }
 
 QString HomeApplet::tr( const char* s, const char* p ) const
 {
     return qApp->translate( "HomeApplet", s, p );
 }
 
 QIconSet HomeApplet::icon ( ) const
 {
 	QPixmap pix;
 	QImage img = Resource::loadImage ( "home" );
 	
 	if ( !img. isNull ( ))
 		pix. convertFromImage ( img. smoothScale ( 14, 14 ));
 	return pix;
 }
 
 QPopupMenu *HomeApplet::popup ( QWidget * ) const
 {
 	return 0;
 }
 
 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
@@ -5,60 +5,62 @@
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** 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 "irda.h"
 #include "irdaappletimpl.h"
 
 
 IrdaAppletImpl::IrdaAppletImpl()
     : irda(0), ref(0)
 {
 }
 
 IrdaAppletImpl::~IrdaAppletImpl()
 {
     delete irda;
 }
 
 QWidget *IrdaAppletImpl::applet( QWidget *parent )
 {
     if ( !irda )
   irda = new IrdaApplet( parent );
     return irda;
 }
 
 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
@@ -66,59 +66,61 @@ QPopupMenu *LogoutApplet::popup ( QWidget * ) const
 
 class HackApplication : public QApplication {
 public:
 	HackApplication ( ) : QApplication ( dummy, 0 )
 	{
 	}
 
 	void emit_about_to_quit ( )
 	{
 		emit aboutToQuit ( );
 	}
 
 	int dummy;
 };
 
 
 void LogoutApplet::activated ( )
 {
 	QMessageBox mb ( tr( "Logout" ),
 	                 tr( "Do you really want to\nend this session ?" ),
 	                 QMessageBox::NoIcon,
 	                 QMessageBox::Yes | QMessageBox::Default,
 	                 QMessageBox::No | QMessageBox::Escape,
 	                 QMessageBox::NoButton );
 
 	mb. setButtonText ( QMessageBox::Yes, "Yes" );
 	mb. setButtonText ( QMessageBox::No, "No" );
 	mb. setIconPixmap ( icon ( ). pixmap ( ));
 
 	if ( mb. exec ( ) == QMessageBox::Yes ) {
 		{ QCopEnvelope envelope( "QPE/System", "forceQuit()" ); }
 
 		qApp-> processEvents ( ); // ensure the message goes out.
 		sleep ( 1 );  // You have 1 second to comply.
 
 		((HackApplication *) qApp )-> emit_about_to_quit ( );
 		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
@@ -1,57 +1,59 @@
 /**********************************************************************
 ** Copyright (C) 2004 Anton Kachalov mouse@altlinux.ru
 **  All rights reserved.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 #include "multikey.h"
 #include "multikeyappletimpl.h"
 
 MultikeyAppletImpl::MultikeyAppletImpl()
     : kbd(0), ref(0)
 {
 }
 
 MultikeyAppletImpl::~MultikeyAppletImpl()
 {
     delete kbd;
 }
 
 QWidget *MultikeyAppletImpl::applet( QWidget *parent )
 {
     if ( !kbd )
 	kbd = new Multikey(parent);
     return kbd;
 }
 
 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
@@ -6,60 +6,62 @@
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** 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 "restart.h"
 #include "restartappletimpl.h"
 
 
 RestartAppletImpl::RestartAppletImpl()
     : restart(0), ref(0)
 {
 }
 
 RestartAppletImpl::~RestartAppletImpl()
 {
     delete restart;
 }
 
 QWidget *RestartAppletImpl::applet( QWidget *parent )
 {
     qDebug("restart applet");
     if ( !restart )
         restart = new RestartApplet( parent );
     return restart;
 }
 
 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
@@ -48,60 +48,62 @@ RestartApplet::RestartApplet ( )
 
 RestartApplet::~RestartApplet ( )
 {
 }
 
 int RestartApplet::position ( ) const
 {
     return 4;
 }
 
 QString RestartApplet::name ( ) const
 {
   return tr( "Restart" );
 }
 
 QString RestartApplet::text ( ) const
 {
   return tr( "Restart Opie" );
 }
 
 QIconSet RestartApplet::icon ( ) const
 {
   QPixmap pix;
   QImage img =  ( const char** ) restart_xpm ;//Resource::loadImage ( "Run" );
   
   if ( !img. isNull ( ))
     pix. convertFromImage ( img. smoothScale ( 14, 14 ));
   return pix;
 }
 
 QPopupMenu *RestartApplet::popup ( QWidget * ) const
 {
   return 0;
 }
 
 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
@@ -197,58 +197,60 @@ void RotateApplet::activated()
     if (rotDirection == -1)
     {
         rot = ODevice::inst()->direction();
     }
     else
     {
         rot = (ODirection) rotDirection;
     }
 
     // hide inputs methods before rotation
     QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" );
 
     if ( m_flipped )
     {
         // if flipped, flip back to the original state,
         // regardless of rotation direction
         newRotation = defaultRotation;
     }
     else
     {
         if ( rot == CCW )
         {
             newRotation = ( defaultRotation + 90 ) % 360;
         }
         else if ( rot == CW )
         {
             newRotation = ( defaultRotation + 270 ) % 360;
         }
         else if ( rot == Flip )
         {
             newRotation = ( defaultRotation + 180 ) % 360;
         }
     }
 
     QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" );
     env << newRotation;
 
     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
@@ -5,60 +5,62 @@
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** 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 "screenshot.h"
 #include "screenshotappletimpl.h"
 
 
 ScreenshotAppletImpl::ScreenshotAppletImpl()
     : screenshot(0), ref(0)
 {
 }
 
 ScreenshotAppletImpl::~ScreenshotAppletImpl()
 {
     delete screenshot;
 }
 
 QWidget *ScreenshotAppletImpl::applet( QWidget *parent )
 {
     if ( !screenshot )
   screenshot = new ScreenshotApplet( parent );
     return screenshot;
 }
 
 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
@@ -26,60 +26,62 @@ QString SuspendApplet::name ( ) const
 {
 	return tr( "Suspend shortcut" );
 }
 
 QString SuspendApplet::text ( ) const
 {
 	return tr( "Suspend" );
 }
 
 QString SuspendApplet::tr( const char* s ) const
 {
     return qApp->translate( "SuspendApplet", s, 0 );
 }
 
 QString SuspendApplet::tr( const char* s, const char* p ) const
 {
     return qApp->translate( "SuspendApplet", s, p );
 }
 
 QIconSet SuspendApplet::icon ( ) const
 {
 	QPixmap pix;
 	QImage img = Resource::loadImage ( "suspend" );
 	
 	if ( !img. isNull ( ))
 		pix. convertFromImage ( img. smoothScale ( 14, 14 ));
 	return pix;
 }
 
 QPopupMenu *SuspendApplet::popup ( QWidget * ) const
 {
 	return 0;
 }
 
 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
@@ -2,58 +2,60 @@
  **
  ** This file may be distributed and/or modified under the terms of the
  ** GNU General Public License version 2 as published by the Free Software
  ** Foundation and appearing in the file LICENSE.GPL included in the
  ** packaging of this file.
  **
  ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
  ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  **
  *********************************************************************************************/
 
 /*
  * $Id$
  */
 
 #include "vmemo.h"
 #include "vmemoimpl.h"
 
 
 VMemoAppletImpl::VMemoAppletImpl()
         : vmemo(0), ref(0)
 {
 }
 
 VMemoAppletImpl::~VMemoAppletImpl()
 {
     delete vmemo;
 }
 
 QWidget *VMemoAppletImpl::applet( QWidget *parent )
 {
     if ( !vmemo )
         vmemo = new VMemo( parent );
     return vmemo;
 }
 
 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
@@ -6,60 +6,62 @@
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** 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 "volume.h"
 #include "volumeappletimpl.h"
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 
 VolumeAppletImpl::VolumeAppletImpl()
     : volume(0), ref(0)
 {
 }
 
 VolumeAppletImpl::~VolumeAppletImpl()
 {
 	delete volume;
 }
 
 QWidget *VolumeAppletImpl::applet( QWidget *parent )
 {
 	if ( !volume )
 		volume = new VolumeApplet( parent );
 	return volume;
 }
 
 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
@@ -103,60 +103,62 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const
 void VTApplet::changeVT( int index )
 {
     //qDebug( "VTApplet::changeVT( %d )", index-500 );
 
     int fd = ::open("/dev/tty0", O_RDWR);
     if ( fd == -1 ) return;
     ioctl( fd, VT_ACTIVATE, index-500 );
 }
 
 
 void VTApplet::updateMenu()
 {
     //qDebug( "VTApplet::updateMenu()" );
 
     int fd = ::open( "/dev/console", O_RDONLY );
     if ( fd == -1 ) return;
 
     for ( int i = 1; i < 10; ++i )
     {
         int result = ioctl( fd, VT_DISALLOCATE, i );
 
         /*
         if ( result == -1 )
             qDebug( "VT %d disallocated == free", i );
         else
             qDebug( "VT %d _not_ disallocated == busy", i );
         */
 
         submenu->setItemEnabled( 500+i, result == -1 );
     }
 
     ::close( fd );
 }
 
 
 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
@@ -1,30 +1,32 @@
 #include "obexhandler.h"
 #include "obeximpl.h"
 
 using namespace OpieObex;
 
 /* TRANSLATOR OpieObex::ObexImpl */
 
 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 )
 }