5 files changed, 15 insertions, 103 deletions

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
@@ -52,24 +52,25 @@ typedef struct _waveheader {
 #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",
@@ -228,24 +229,29 @@ VMemo::VMemo( QWidget *parent, const char *_name )
         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();
       }
@@ -622,12 +628,18 @@ int VMemo::setToggleButton(int tog) {
       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
@@ -23,24 +23,25 @@
 #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();
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