31 files changed, 107 insertions, 688 deletions

diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp
index bb0db9b..34d151e 100644
--- a/core/applets/clipboardapplet/clipboard.cpp
+++ b/core/applets/clipboardapplet/clipboard.cpp
@@ -1,86 +1,92 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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 <opie2/otaskbarapplet.h>
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 
 #include <qpainter.h>
 #include <qpopupmenu.h>
 #include <qwindowsystem_qws.h>
 #include <qapplication.h>
 #include <qclipboard.h>
 #include <qtimer.h>
 
 //===========================================================================
 
 
 ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name )
 {
         setFixedWidth ( AppLnk::smallIconSize()  );
         setFixedHeight ( AppLnk::smallIconSize()  );
 
         QImage img = Resource::loadImage( "paste");
         img = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
 
         m_clipboardPixmap.convertFromImage( img );
 
         m_timer = new QTimer ( this );
 
         connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( )));
         connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( newData ( )));
         connect ( qApp, SIGNAL( aboutToQuit ( )), this, SLOT( shutdown ( )));
 
         m_menu = 0;
         m_dirty = true;
         m_lasttext = QString::null;
 
         m_timer-> start ( 0, true );
 }
 
 ClipboardApplet::~ClipboardApplet ( )
 {
 }
 
+int ClipboardApplet::position()
+{
+    return 6;
+}
+
 void ClipboardApplet::shutdown ( )
 {
         // the timer has to be stopped, or Qt/E will hang on quit()
         // see launcher/desktop.cpp
 
         m_timer-> stop ( );
 }
 
 void ClipboardApplet::mousePressEvent ( QMouseEvent *)
 {
         if ( m_dirty ) {
                 delete m_menu;
 
                 m_menu = new QPopupMenu ( this );
                 m_menu-> setCheckable ( true );
 
                 if ( m_history. count ( )) {
                         for ( unsigned int i = 0; i < m_history. count ( ); i++ ) {
                                 QString str = m_history [i];
 
                                 if ( str. length ( ) > 20 )
                                         str = str. left ( 20 ) + "...";
 
                                 m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i );
@@ -155,24 +161,29 @@ void ClipboardApplet::newData ( )
 
         if ( excllock )
                 return;
         else
                 excllock = true;
 
         m_timer-> stop ( );
 
         QCString type = "plain";
         QString txt = QApplication::clipboard ( )-> text ( type );
 
         if ( !txt. isEmpty ( ) && !m_history. contains ( txt )) {
                 m_history. append ( txt );
 
                 if ( m_history. count ( ) > 5 )
                         m_history. remove ( m_history. begin ( ));
 
                 m_dirty = true;
         }
 
         m_timer-> start ( 1500, true );
 
         excllock = false;
 }
+
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ClipboardApplet> );
+}
diff --git a/core/applets/clipboardapplet/clipboard.h b/core/applets/clipboardapplet/clipboard.h
index ec87d39..bbda0ff 100644
--- a/core/applets/clipboardapplet/clipboard.h
+++ b/core/applets/clipboardapplet/clipboard.h
@@ -11,47 +11,48 @@
 ** 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.
 **
 **********************************************************************/
 #ifndef __CLIPBOARD_APPLET_H__
 #define __CLIPBOARD_APPLET_H__
 
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qstringlist.h>
 
 class QTimer;
 
 class ClipboardApplet : public QWidget
 {
     Q_OBJECT
 public:
     ClipboardApplet ( QWidget *parent = 0, const char *name=0 );
     ~ClipboardApplet ( );
+    static int position();
 
 protected:
     void mousePressEvent ( QMouseEvent *);
     void paintEvent ( QPaintEvent* );
 
 private slots:
     void action ( int );
         void newData ( );
         void shutdown ( );
 
 private:
     QPopupMenu * m_menu;
     QStringList  m_history;
     bool         m_dirty;
     QString      m_lasttext;
     QTimer *     m_timer;
     
     QPixmap      m_clipboardPixmap;
 };
 
 
 #endif // __CLIPBOARD_APPLET_H__
 
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro
index f6842a2..74cf48c 100644
--- a/core/applets/clipboardapplet/clipboardapplet.pro
+++ b/core/applets/clipboardapplet/clipboardapplet.pro
@@ -1,13 +1,13 @@
         TEMPLATE= lib
         CONFIG  += qt plugin warn_on release
-        HEADERS=   clipboard.h clipboardappletimpl.h
-        SOURCES=   clipboard.cpp clipboardappletimpl.cpp
+        HEADERS         =   clipboard.h
+        SOURCES         =   clipboard.cpp
         TARGET  = clipboardapplet
         DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/clipboardapplet/clipboardappletimpl.cpp b/core/applets/clipboardapplet/clipboardappletimpl.cpp
deleted file mode 100644
index f454529..0000000
--- a/core/applets/clipboardapplet/clipboardappletimpl.cpp
+++ b/dev/null
@@ -1,66 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** 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)
-{
-}
-
-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/clipboardapplet/clipboardappletimpl.h b/core/applets/clipboardapplet/clipboardappletimpl.h
deleted file mode 100644
index 497360c..0000000
--- a/core/applets/clipboardapplet/clipboardappletimpl.h
+++ b/dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** 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.
-**
-**********************************************************************/
-#ifndef CLIPBOARDAPPLETIMPL_H
-#define CLIPBOARDAPPLETIMPL_H
-
-#include <qpe/taskbarappletinterface.h>
-
-class ClipboardApplet;
-
-class ClipboardAppletImpl : public TaskbarAppletInterface
-{
-public:
-    ClipboardAppletImpl();
-    virtual ~ClipboardAppletImpl();
-
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-
-private:
-    ClipboardApplet *clipboard;
-};
-
-#endif
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp
index aadd9b6..9fead03 100644
--- a/core/applets/clockapplet/clock.cpp
+++ b/core/applets/clockapplet/clock.cpp
@@ -1,64 +1,70 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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 <opie2/otaskbarapplet.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 
 LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent )
 {
     // If you want a sunken border around the clock do this:
     // setFrameStyle( QFrame::Panel | QFrame::Sunken );
     //setFont( QFont( "Helvetica", , QFont::Normal ) );
     connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime( ) ) );
     connect( qApp, SIGNAL( clockChanged( bool ) ),
        this, SLOT( slotClockChanged( bool ) ) );
     readConfig();
     timerId = 0;
     timerEvent( 0 );
     show();
 }
 
+int LauncherClock::position()
+{
+    return 10;
+}
+
 void LauncherClock::readConfig() {
     Config config( "qpe" );
     config.setGroup( "Time" );
     ampmFormat = config.readBoolEntry( "AMPM", TRUE );
     config.setGroup( "Date" );
     format = config.readNumEntry("ClockApplet",0);
 }
 
 void LauncherClock::mouseReleaseEvent( QMouseEvent * )
 {
         QCString setTimeApp;
         setTimeApp="systemtime";
         QCopEnvelope e("QPE/Application/"+setTimeApp, "raise()");
 }
 
 
 void LauncherClock::timerEvent( QTimerEvent *e )
 {
     if ( !e || e->timerId() == timerId ) {
   killTimer( timerId );
   changeTime();
   QTime t = QTime::currentTime();
   int ms = (60 - t.second())*1000 - t.msec();
   timerId = startTimer( ms );
@@ -86,24 +92,30 @@ void LauncherClock::changeTime( void )
        (tm.hour() >= 12) ? "PM" : "AM" );
     } else
   s.sprintf( "%2d:%02d", tm.hour(), tm.minute() );
 
     if (format==1) {
   QDate dm = QDate::currentDate();
   QString d;
   d.sprintf("%d/%d ", dm.day(), dm.month());
   setText( d+s );
     } else if (format==2) {
   QDate dm = QDate::currentDate();
   QString d;
   d.sprintf("%d/%d ", dm.month(), dm.day());
   setText( d+s );
     } else {
   setText( s );
     }
 }
 
 void LauncherClock::slotClockChanged( bool pm )
 {
     readConfig();
     updateTime();
 }
+
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<LauncherClock> );
+}
+
diff --git a/core/applets/clockapplet/clock.h b/core/applets/clockapplet/clock.h
index caa0c5f..996fb56 100644
--- a/core/applets/clockapplet/clock.h
+++ b/core/applets/clockapplet/clock.h
@@ -8,41 +8,42 @@
 ** 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.
 **
 **********************************************************************/
 #ifndef __LAUNCHER_CLOCK_H__
 #define __LAUNCHER_CLOCK_H__
 
 
 #include <qlabel.h>
 #include <qdatetime.h>
 
 class LauncherClock : public QLabel
 {
     Q_OBJECT
 public:
     LauncherClock( QWidget *parent );
+    static int position();
 
 protected slots:
     void updateTime( void );
     void slotClockChanged( bool pm );
 
 protected:
     void mouseReleaseEvent( QMouseEvent * );
     void timerEvent( QTimerEvent * );
     void changeTime( void );
     void readConfig();
     bool ampmFormat;
     int timerId;
     int format;
 };
 
 
 #endif // __LAUNCHER_CLOCK_H__
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index 057e332..8ce3f6f 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -1,13 +1,13 @@
         TEMPLATE= lib
         CONFIG  += qt plugin warn_on release
-        HEADERS=   clock.h clockappletimpl.h
-        SOURCES=   clock.cpp clockappletimpl.cpp
+        HEADERS         = clock.h
+        SOURCES         = clock.cpp
         TARGET  = clockapplet
         DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/clockapplet/clockappletimpl.cpp b/core/applets/clockapplet/clockappletimpl.cpp
deleted file mode 100644
index 7481f19..0000000
--- a/core/applets/clockapplet/clockappletimpl.cpp
+++ b/dev/null
@@ -1,67 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** 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)
-{
-}
-
-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/clockapplet/clockappletimpl.h b/core/applets/clockapplet/clockappletimpl.h
deleted file mode 100644
index 1f9c8f0..0000000
--- a/core/applets/clockapplet/clockappletimpl.h
+++ b/dev/null
@@ -1,45 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** 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.
-**
-**********************************************************************/
-#ifndef CLOCKAPPLETIMPL_H
-#define CLOCKAPPLETIMPL_H
-
-#include <qpe/taskbarappletinterface.h>
-
-class LauncherClock;
-
-class ClockAppletImpl : public TaskbarAppletInterface
-{
-public:
-    ClockAppletImpl();
-    virtual ~ClockAppletImpl();
-
-#ifndef QT_NO_COMPONENT
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-#endif
-
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-
-private:
-    LauncherClock *clock;
-};
-
-#endif
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index a47f33d..afc0592 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -1,86 +1,94 @@
 /**********************************************************************
 ** Copyright (C) 2002 David Woodhouse <dwmw2@infradead.org>
 **                    Max Reiss <harlekin@handhelds.org> [trivial stuff]
 **                    Robert Griebl <sandman@handhelds.org>
 **                    Holger Freyther <zecke@handhelds.org> QCOP Interface
 **
 ** 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 "irda.h"
 
+/* OPIE */
+#include <opie2/otaskbarapplet.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
+/* QT */
 #include <qpainter.h>
 #include <qfile.h>
 #include <qtimer.h>
 #include <qtextstream.h>
 
+/* STD */
 #include <unistd.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
-#include "irda.h"
-
 //===========================================================================
 
 IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
                 : QWidget ( parent, name )
 {
         setFixedHeight ( 18 );
         setFixedWidth ( 14 );
 
         m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP );
 
         m_irdaOnPixmap          = Resource::loadPixmap( "irdaapplet/irdaon" );
         m_irdaOffPixmap         = Resource::loadPixmap( "irdaapplet/irdaoff" );
         m_irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" );
         m_receiveActivePixmap   = Resource::loadPixmap( "irdaapplet/receive" );
 
         m_irda_active = false;
         m_irda_discovery_active = false;
         m_receive_active = false;
         m_receive_state_changed = false;
         m_popup = 0;
                 m_wasOn = false;
                 m_wasDiscover = false;
 
         QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this );
         connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
                 this, SLOT(slotMessage(const QCString&, const QByteArray& ) ) );
 }
 
+int IrdaApplet::position()
+{
+        return 6;
+}
+
 void IrdaApplet::show()
 {
         QWidget::show ( );
         startTimer ( 2000 );
 }
 
 IrdaApplet::~IrdaApplet()
 {
         if ( m_sockfd >= 0 )
                 ::close ( m_sockfd );
 }
 
 void IrdaApplet::popup ( QString message, QString icon )
 {
         if ( !m_popup )
                 m_popup = new QPopupMenu ( this );
 
         m_popup-> clear ( );
 
         if ( icon. isEmpty ( ))
                 m_popup-> insertItem ( message, 0 );
         else
                 m_popup-> insertItem ( QIconSet ( Resource::loadPixmap ( icon )), message, 0 );
 
@@ -329,24 +337,29 @@ void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) {
         if (!m_wasOn)  {
             setIrdaStatus( true );
         }
         if ( !m_wasDiscover ) {
             setIrdaDiscoveryStatus ( true );
         }
     } else if ( str == "disableIrda()") {
         if (!m_wasOn)  {
             setIrdaStatus( false );
         }
         if ( !m_wasDiscover ) {
             setIrdaDiscoveryStatus ( false );
         }
     } else if ( str == "listDevices()") {
         QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)");
 
         QStringList list;
         QMap<QString, QString>::Iterator it;
         for (it = m_devices.begin(); it != m_devices.end(); ++it )
             list << (*it);
 
         e << list;
     }
 }
+
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<IrdaApplet> );
+}
diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h
index ec1d32c..f713bbe 100644
--- a/core/applets/irdaapplet/irda.h
+++ b/core/applets/irdaapplet/irda.h
@@ -7,48 +7,49 @@
 ** 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.
 **
 **********************************************************************/
 
 #ifndef __OPIE_IRDA_APPLET_H__
 #define __OPIE_IRDA_APPLET_H__
 
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qpopupmenu.h>
 #include <qmap.h>
 
 class IrdaApplet : public QWidget
 {
         Q_OBJECT
 
 public:
         IrdaApplet( QWidget *parent = 0, const char *name = 0 );
         ~IrdaApplet();
+        static int position();
 
         virtual void show ( );
 
 protected:
         virtual void timerEvent ( QTimerEvent * );
         virtual void mousePressEvent ( QMouseEvent * );
         virtual void paintEvent ( QPaintEvent* );
 
 private slots:
         void popupTimeout ( );
         void slotMessage( const QCString& , const QByteArray& );
 
 private:
         void popup( QString message, QString icon = QString::null );
 
         bool checkIrdaStatus ( );
         bool setIrdaStatus ( bool );
         bool checkIrdaDiscoveryStatus ();
         bool setIrdaDiscoveryStatus ( bool );
         bool setIrdaReceiveStatus ( bool );
 
         void showDiscovered();
 
 private:
diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro
index 4e94dfb..31e8691 100644
--- a/core/applets/irdaapplet/irdaapplet.pro
+++ b/core/applets/irdaapplet/irdaapplet.pro
@@ -1,13 +1,13 @@
-TEMPLATE  = lib
-CONFIG    += qt plugin warn_on release
-HEADERS =   irda.h irdaappletimpl.h
-SOURCES =   irda.cpp irdaappletimpl.cpp
-TARGET    = irdaapplet
-DESTDIR   = $(OPIEDIR)/plugins/applets
-INCLUDEPATH += $(OPIEDIR)/include
+        TEMPLATE  = lib
+        CONFIG    += qt plugin warn_on release
+        HEADERS = irda.h
+        SOURCES = irda.cpp
+        TARGET    = irdaapplet
+        DESTDIR   = $(OPIEDIR)/plugins/applets
+        INCLUDEPATH+= $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/irdaapplet/irdaappletimpl.cpp b/core/applets/irdaapplet/irdaappletimpl.cpp
deleted file mode 100644
index 33d98af..0000000
--- a/core/applets/irdaapplet/irdaappletimpl.cpp
+++ b/dev/null
@@ -1,66 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** 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)
-{
-}
-
-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/irdaapplet/irdaappletimpl.h b/core/applets/irdaapplet/irdaappletimpl.h
deleted file mode 100644
index 024cc06..0000000
--- a/core/applets/irdaapplet/irdaappletimpl.h
+++ b/dev/null
@@ -1,45 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** 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.
-**
-**********************************************************************/
-#ifndef IRDAAPPLETIMPL_H
-#define IRDAAPPLETIMPL_H
-
-#include <qwidget.h>
-
-#include <qpe/taskbarappletinterface.h>
-
-class IrdaApplet;
-
-class IrdaAppletImpl : public TaskbarAppletInterface
-{
-public:
-    IrdaAppletImpl();
-    virtual ~IrdaAppletImpl();
-
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-
-private:
-    IrdaApplet *irda;
-};
-
-#endif
diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp
index 56a031c..5d6bce4 100644
--- a/core/applets/screenshotapplet/screenshot.cpp
+++ b/core/applets/screenshotapplet/screenshot.cpp
@@ -1,60 +1,63 @@
 /**********************************************************************
 ** Copyright (C) 2002 L.J. Potter ljp@llornkcor.com
 **  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 "screenshot.h"
 #include "inputDialog.h"
 
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <unistd.h>
-
+/* OPIE */
+#include <opie2/otaskbarapplet.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
 
+/* QT */
 #include <qlineedit.h>
 #include <qdir.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qpainter.h>
 #include <qspinbox.h>
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qmessagebox.h>
 
+/* STD */
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <unistd.h>
 
 /* XPM */
 static char * snapshot_xpm[] = {
 "32 32 177 2",
         "  c None",
         ". c #042045",
         "+ c #0D2B47",
         "@ c #0E325E",
         "# c #0D2E50",
         "$ c #0A1C32",
         "% c #0F3A69",
         "& c #164680",
         "* c #165EAE",
         "= c #134D89",
         "- c #0A3A6E",
         "; c #031024",
         "> c #031B36",
         ", c #1A5EA3",
         "' c #1862B1",
         ") c #1866B9",
         "! c #0F5AAC",
         "~ c #0F56A8",
         "{ c #0C4C96",
         "] c #030918",
@@ -476,55 +479,65 @@ void ScreenshotControl::performGrab()
                                 QMessageBox::warning( 0, tr( "Error" ),tr("Please set <b>QWS_DISPLAY</b> environmental variable."));
                         }
                 }
                                 
 }
 
 
 
 //===========================================================================
 
 ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name )
     : QWidget( parent, name )
 {
                 setFixedWidth( AppLnk::smallIconSize());
 
     QImage  img = (const char **)snapshot_xpm;
     img = img.smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize());
     m_icon.convertFromImage(img);
 }
 
 ScreenshotApplet::~ScreenshotApplet()
 {
 }
 
+int ScreenshotApplet::position()
+{
+    return 6;
+}
+
 void ScreenshotApplet::mousePressEvent( QMouseEvent *)
 {
   ScreenshotControl *sc = new ScreenshotControl ( );
   QPoint curPos = mapToGlobal ( QPoint ( 0, 0 ));
 
   // windowPosX is the windows position centered above the applets icon.
   // If the icon is near the edge of the screen, the window would leave the visible area
   // so we check the position against the screen width and correct the difference if needed
   
   int screenWidth = qApp->desktop()->width();
   int windowPosX = curPos. x ( ) - ( sc-> sizeHint ( ). width ( ) - width ( )) / 2 ;
   int ZwindowPosX, XwindowPosX;
   
   // the window would be placed beyond the screen wich doesn't look tooo good
   if ( (windowPosX + sc-> sizeHint ( ). width ( )) > screenWidth ) {
           XwindowPosX = windowPosX + sc-> sizeHint ( ). width ( ) - screenWidth;
         ZwindowPosX = windowPosX - XwindowPosX - 1;
   } else {
           ZwindowPosX = windowPosX;
   }
   
    sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) );
    sc-> show ( );
 }
 
 void ScreenshotApplet::paintEvent( QPaintEvent* )
 {
   QPainter p ( this );
         p.drawPixmap( 0,0, m_icon );
 }
 
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ScreenshotApplet> );
+}
+
diff --git a/core/applets/screenshotapplet/screenshot.h b/core/applets/screenshotapplet/screenshot.h
index 74cc5e6..b753583 100644
--- a/core/applets/screenshotapplet/screenshot.h
+++ b/core/applets/screenshotapplet/screenshot.h
@@ -35,36 +35,37 @@ class ScreenshotControl : public QFrame
 public:
     ScreenshotControl( QWidget *parent=0, const char *name=0 );
 
 private:
     QPushButton *grabItButton, *scapButton;
     QPixmap snapshot;
     QTimer* grabTimer;
     QCheckBox *saveNamedCheck;
     QString FileNamePath;
     bool setFileName;
     QSpinBox  *delaySpin;
     int buttonPushed;
 
 private slots:
     void slotGrab();
     void slotScap(); 
     void savePixmap();
     void performGrab();
 };
 
 class ScreenshotApplet : public QWidget {
 public:
     ScreenshotApplet( QWidget *parent = 0, const char *name=0 );
     ~ScreenshotApplet();
+    static int position();
     
 protected:
     void mousePressEvent( QMouseEvent * );
     void paintEvent( QPaintEvent* );
     
 private:
         QPixmap m_icon;
 };
 
 
 #endif // __SCREENSHOT_APPLET_H__
 
diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro
index 45a5759..c7fcc3e 100644
--- a/core/applets/screenshotapplet/screenshotapplet.pro
+++ b/core/applets/screenshotapplet/screenshotapplet.pro
@@ -1,15 +1,13 @@
 TEMPLATE  = lib
 CONFIG    += qt plugin warn_on release
-HEADERS =   screenshot.h inputDialog.h screenshotappletimpl.h
-SOURCES =   screenshot.cpp inputDialog.cpp screenshotappletimpl.cpp
+HEADERS   = screenshot.h inputDialog.h
+SOURCES   = screenshot.cpp inputDialog.cpp
 TARGET    = screenshotapplet
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
-MOC_DIR=opieobj
-OBJECTS_DIR=opieobj
 
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/screenshotapplet/screenshotappletimpl.cpp b/core/applets/screenshotapplet/screenshotappletimpl.cpp
deleted file mode 100644
index e99ecb0..0000000
--- a/core/applets/screenshotapplet/screenshotappletimpl.cpp
+++ b/dev/null
@@ -1,66 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** 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)
-{
-}
-
-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/screenshotapplet/screenshotappletimpl.h b/core/applets/screenshotapplet/screenshotappletimpl.h
deleted file mode 100644
index 988a34c..0000000
--- a/core/applets/screenshotapplet/screenshotappletimpl.h
+++ b/dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** 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.
-**
-**********************************************************************/
-#ifndef SCREENSHOTAPPLETIMPL_H
-#define SCREENSHOTAPPLETIMPL_H
-
-#include <qpe/taskbarappletinterface.h>
-
-class ScreenshotApplet;
-
-class ScreenshotAppletImpl : public TaskbarAppletInterface
-{
-public:
-    ScreenshotAppletImpl();
-    virtual ~ScreenshotAppletImpl();
-
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-
-private:
-    ScreenshotApplet *screenshot;
-};
-
-#endif
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index fe8ebfd..563d110 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -40,48 +40,49 @@ typedef struct _waveheader {
   u_short bit_p_spl;  /* 8, 12 or 16 bit                 (bitsPerSample)      */
 
   u_long  data_chunk; /* 'data'      */
 
   u_long  data_length;/* samplecount */
 } WaveHeader;
 
 #define RIFF        0x46464952
 #define WAVE        0x45564157
 #define FMT         0x20746D66
 #define DATA        0x61746164
 #define PCM_CODE    1
 #define WAVE_MONO   1
 #define WAVE_STEREO 2
 
 struct adpcm_state encoder_state;
 //struct adpcm_state decoder_state;
 
 #define WAVE_FORMAT_DVI_ADPCM (0x0011)
 #define WAVE_FORMAT_PCM (0x0001)
 
 
 #include "vmemo.h"
 
+#include <opie2/otaskbarapplet.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 
 #include <qpainter.h>
 #include <qmessagebox.h>
 
 int seq = 0;
 
 /* XPM */
 static char * vmemo_xpm[] = {
   "16 16 102 2",
   "   c None",
   ".  c #60636A",
   "+  c #6E6E72",
   "@  c #68696E",
   "#  c #4D525C",
   "$  c #6B6C70",
   "%  c #E3E3E8",
   "&  c #EEEEF2",
   "*  c #EAEAEF",
   "=  c #CACAD0",
   "-  c #474A51",
   ";  c #171819",
   ">  c #9B9B9F",
@@ -216,48 +217,53 @@ VMemo::VMemo( QWidget *parent, const char *_name )
              this, SLOT(receive(const QCString&, const QByteArray&)) );
 
     if( toggleKey != -1 ) {
       // keyRegister(key, channel, message)
       QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)");
       //           e << 4096; // Key_Escape
       //          e << Key_F5; //4148
       e << toggleKey;
       e << QString("QPE/VMemo");
       e << QString("toggleRecord()");
     }
     if(toggleKey == 1)
         usingIcon=TRUE;
     else
         usingIcon=FALSE;
     if( vmCfg.readNumEntry("hideIcon",0) == 1)
       hide();
     recording = FALSE;
     // }
 }
 
 VMemo::~VMemo() {
 }
 
+int VMemo::position()
+{
+    return 6;
+}
+
 void VMemo::receive( const QCString &msg, const QByteArray &data ) {
   qDebug("receive");
   QDataStream stream( data, IO_ReadOnly );
 
   if (msg == "toggleRecord()")  {
       if (recording) {
           fromToggle = TRUE;
           stopRecording();
       }  else {
           fromToggle = TRUE;
           startRecording();
       }
   }
 }
 
 void VMemo::paintEvent( QPaintEvent* ) {
   QPainter p(this);
   p.drawPixmap( 0, 1,( const char** )  vmemo_xpm );
 }
 
 void VMemo::mousePressEvent( QMouseEvent * me) {
   /*  No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
          mousePressEvent and mouseReleaseEvent with a NULL parameter.  */
         
@@ -610,24 +616,30 @@ int VMemo::setToggleButton(int tog) {
       return Key_F12;
       break; 
     case 5:
       return Key_F9;
       break; 
     case 6:
       return Key_F10;
       break; 
     case 7:
       return Key_F11;
       break; 
     case 8:
       return Key_F13;
       break; 
     };
   }
   return -1;
 }
 
 void VMemo::timerBreak() {
   //stop
     stopRecording();
   QMessageBox::message("Vmemo","Vmemo recording has ended");
 }
+
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<VMemo> );
+}
+
diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h
index 31d0a25..1bd735f 100644
--- a/core/applets/vmemo/vmemo.h
+++ b/core/applets/vmemo/vmemo.h
@@ -11,48 +11,49 @@
 *********************************************************************************************/
 
 /*
  * $Id$
  */
 
 #ifndef __VMEMO_H__
 #define __VMEMO_H__
 
 
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qpe/applnk.h>
 #include <qfile.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qlabel.h>
 #include <qtimer.h>
 
 class VMemo : public QWidget
 {
   Q_OBJECT
 public:
   VMemo( QWidget *parent, const char *name = NULL);
   ~VMemo();
+  static int position();
   QFile track;
   int length;
   QString fileName, errorMsg, date;
   QLabel* msgLabel;
   QTimer *t_timer;
 bool usingIcon, useADPCM;
 public slots:
   bool record();
   void mousePressEvent( QMouseEvent * );
   void mouseReleaseEvent( QMouseEvent * );
   void receive( const QCString &msg, const QByteArray &data );
   bool startRecording();
   void stopRecording();
   void timerBreak();
 private:
   bool useAlerts;
   void paintEvent( QPaintEvent* );
   int setToggleButton(int);
   int openDSP();
   int openWAV(const char *filename);
   bool fromToggle;
   QPixmap vmemoPixmap;
   QCopChannel *myChannel;
   bool systemZaurus;
diff --git a/core/applets/vmemo/vmemo.pro b/core/applets/vmemo/vmemo.pro
index f83a53f..2deedfd 100644
--- a/core/applets/vmemo/vmemo.pro
+++ b/core/applets/vmemo/vmemo.pro
@@ -1,13 +1,13 @@
 TEMPLATE  = lib
 CONFIG    += qt plugin warn_on release
-HEADERS =   vmemo.h vmemoimpl.h adpcm.h
-SOURCES =   vmemo.cpp vmemoimpl.cpp adpcm.c
+HEADERS =   vmemo.h adpcm.h
+SOURCES =   vmemo.cpp adpcm.c
 TARGET    = vmemoapplet
 DESTDIR   =$(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/vmemo/vmemoimpl.cpp b/core/applets/vmemo/vmemoimpl.cpp
deleted file mode 100644
index 7779b83..0000000
--- a/core/applets/vmemo/vmemoimpl.cpp
+++ b/dev/null
@@ -1,61 +0,0 @@
-/**************************************************************************************94x78**
- **
- ** 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)
-{
-}
-
-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/vmemo/vmemoimpl.h b/core/applets/vmemo/vmemoimpl.h
deleted file mode 100644
index 985138b..0000000
--- a/core/applets/vmemo/vmemoimpl.h
+++ b/dev/null
@@ -1,40 +0,0 @@
-/**************************************************************************************94x78**
-**
-** 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$
- */
-
-#ifndef __VMEMOIMPLAPPLETIMPL_H__
-#define __VMEMOIMPLAPPLETIMPL_H__
-
-#include <qpe/taskbarappletinterface.h>
-
-class VMemo;
-
-class VMemoAppletImpl : public TaskbarAppletInterface
-{
-public:
-    VMemoAppletImpl();
-    virtual ~VMemoAppletImpl();
-
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-
-private:
-    VMemo *vmemo;
-};
-
-#endif
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp
index c736437..8fd88f6 100644
--- a/core/applets/volumeapplet/volume.cpp
+++ b/core/applets/volumeapplet/volume.cpp
@@ -1,68 +1,64 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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 <stdio.h>
-
 #include "volume.h"
+#include "oledbox.h"
 
+#include <opie2/odevice.h>
+#include <opie2/otaskbarapplet.h>
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
-#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
-#endif
 
 #include <qpainter.h>
 #include <qcheckbox.h>
 #include <qslider.h>
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qlabel.h>
-
 #include <qpushbutton.h>
 #include <qtimer.h>
 
-#include <opie/odevice.h>
-
-#include "oledbox.h"
+#include <stdio.h>
 
 using namespace Opie;
 
 #define RATE_TIMER_INTERVAL 100
 // Ten times per second is fine (RATE_TIMER_INTERVAL 100).  A shorter time
 // results in "hanging" buttons on the iPAQ due to quite high CPU consumption.
 
 
 /* XPM */
 static const char * vol_xpm[] = {
 "20 20 3 1",
 "   c None",
 ".  c #0000FF",
 "+  c #000000",
 "                    ",
 "        .           ",
 "        . . . .     ",
 "    . . . . . .     ",
 "    . . . . . . .   ",
 "    . . ..... . .   ",
 "  . ... ..... ...   ",
 "  ........... ....  ",
 "  ................. ",
 "++++++++++++++++++++",
@@ -716,64 +712,72 @@ void VolumeControl::writeConfigEntry ( const char *entry, int val, eUpdate upd )
   }
 #endif
 }
 
 //===========================================================================
 
 VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
     : QWidget( parent, name )
 {
   setFixedWidth ( AppLnk::smallIconSize()  );
   setFixedHeight ( AppLnk::smallIconSize()+4 );
 
   m_pixmap = new QPixmap ( Resource::loadPixmap ( "volume" ));
   m_dialog = new VolumeControl ( this, true, this, "volumecontrol" );
 
   connect ( qApp, SIGNAL( volumeChanged ( bool )), m_dialog, SLOT( volumeChanged( bool )));
   connect ( qApp, SIGNAL( micChanged ( bool )), m_dialog, SLOT ( micChanged( bool )));
 }
 
 VolumeApplet::~VolumeApplet()
 {
   delete m_pixmap;
 }
 
+int VolumeApplet::position()
+{
+  return 6;
+}
 
 void VolumeApplet::mousePressEvent ( QMouseEvent * )
 {
   if ( m_dialog-> isVisible ( ))
     m_dialog-> hide ( );
   else
     m_dialog-> show ( true );
 }
 
 void VolumeApplet::redraw ( bool all )
 {
         if ( all )
                 repaint ( true );
         else
                 repaint ( 2, height ( ) - 3, width ( ) - 4, 2, false );
 }
 
 
 void VolumeApplet::paintEvent ( QPaintEvent * )
 {
   QPainter p ( this );
 
   p. drawPixmap ( (width()- m_pixmap->width())/2, QMAX( (height()-4-m_pixmap->height() )/2, 1), *m_pixmap );
   p. setPen ( darkGray );
   p. drawRect ( 1, height() - 4, width() - 2, 4 );
 
   int pixelsWide = m_dialog-> volPercent ( ) * ( width() - 4 ) / 100;
   p. fillRect ( 2, height() - 3, pixelsWide, 2, red );
   p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray );
 
   if ( m_dialog-> volMuted ( )) {
     p. setPen ( red );
     p. drawLine ( 1, 2, width() - 2, height() - 5 );
     p. drawLine ( 1, 3, width() - 2, height() - 4 );
     p. drawLine ( width() - 2, 2, 1, height() - 5 );
     p. drawLine ( width() - 2, 3, 1, height() - 4 );
   }
 }
 
 
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<VolumeApplet> );
+}
diff --git a/core/applets/volumeapplet/volume.h b/core/applets/volumeapplet/volume.h
index d2345b5..454a688 100644
--- a/core/applets/volumeapplet/volume.h
+++ b/core/applets/volumeapplet/volume.h
@@ -96,39 +96,40 @@ private:
         QPushButton *upButton;
         QPushButton *downButton;
         QTimer *rateTimer;
 
         int  m_vol_percent;
         int  m_mic_percent;
         int  m_alarm_percent;
         int  m_bass_percent;
         int  m_treble_percent;
         bool m_vol_muted;
                 bool m_mic_muted;
         bool m_snd_alarm;
         bool m_snd_touch;
         bool m_snd_key;
 
                 VolumeApplet *m_icon;
 };
 
 class VolumeApplet : public QWidget {
         Q_OBJECT
 
 public:
         VolumeApplet ( QWidget *parent = 0, const char *name=0 );
         ~VolumeApplet ( );
+        static int position();
 
         void redraw ( bool all = true );
 
 protected:
         virtual void mousePressEvent ( QMouseEvent * );
         virtual void paintEvent ( QPaintEvent* );
         
 private:
         QPixmap *      m_pixmap;
         VolumeControl *m_dialog;
 };
 
 
 #endif // __VOLUME_APPLET_H__
 
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro
index 92c6b0a..b14956e 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -1,13 +1,13 @@
         TEMPLATE= lib
         CONFIG  += qt plugin warn_on release
-        HEADERS=   volume.h volumeappletimpl.h oledbox.h
-        SOURCES=   volume.cpp volumeappletimpl.cpp oledbox.cpp
+        HEADERS         = volume.h oledbox.h
+        SOURCES         = volume.cpp oledbox.cpp
         TARGET  = volumeapplet
         DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/volumeapplet/volumeappletimpl.cpp b/core/applets/volumeapplet/volumeappletimpl.cpp
deleted file mode 100644
index 9c7dea3..0000000
--- a/core/applets/volumeapplet/volumeappletimpl.cpp
+++ b/dev/null
@@ -1,65 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** 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"
-
-VolumeAppletImpl::VolumeAppletImpl()
-    : volume(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/volumeapplet/volumeappletimpl.h b/core/applets/volumeapplet/volumeappletimpl.h
deleted file mode 100644
index a9221c6..0000000
--- a/core/applets/volumeapplet/volumeappletimpl.h
+++ b/dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** 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.
-**
-**********************************************************************/
-#ifndef VOLUMEAPPLETIMPL_H
-#define VOLUMEAPPLETIMPL_H
-
-#include <qpe/taskbarappletinterface.h>
-
-class VolumeApplet;
-
-class VolumeAppletImpl : public TaskbarAppletInterface
-{
-public:
-    VolumeAppletImpl();
-    virtual ~VolumeAppletImpl();
-
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-
-private:
-    VolumeApplet *volume;
-};
-
-#endif
diff --git a/core/obex/obex.pro b/core/obex/obex.pro
index 6f0e6d1..a296b2c 100644
--- a/core/obex/obex.pro
+++ b/core/obex/obex.pro
@@ -1,13 +1,13 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on release
-        HEADERS=   obex.h obeximpl.h obexhandler.h obexsend.h receiver.h
-        SOURCES=   obex.cc obeximpl.cpp obexsend.cpp obexhandler.cpp receiver.cpp
+        HEADERS=   obex.h obexhandler.h obexsend.h receiver.h
+        SOURCES=   obex.cc obexsend.cpp obexhandler.cpp receiver.cpp
         TARGET  = opieobex
         DESTDIR         = $(OPIEDIR)/plugins/obex
 INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
 DEPENDPATH      += ../$(OPIEDIR)/include
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe -lopiecore2
         VERSION         = 0.0.2
 
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets