5 files changed, 13 insertions, 94 deletions

diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp
index 7b8bdd9..1142028 100644
--- a/noncore/applets/notesapplet/notes.cpp
+++ b/noncore/applets/notesapplet/notes.cpp
@@ -10,24 +10,25 @@
 **
 ** 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 "notes.h"
 
 #include <qapplication.h>
 #include <stdlib.h>
 #include <qstringlist.h>
 
+#include <opie2/otaskbarapplet.h>
 #include <qpe/filemanager.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/timestring.h>
 #include <qpe/applnk.h>
 #include <qpe/ir.h>
 #include <qpe/config.h>
 
 // #include <qsocket.h>
 // #include <qclipboard.h>
 #include <qmultilineedit.h>
 #include <qlistbox.h>
 #include <qpopupmenu.h>
@@ -457,24 +458,29 @@ void NotesControl::slotSearch() {
 
 NotesApplet::NotesApplet( QWidget *parent, const char *name )
         : QWidget( parent, name ) {
     setFixedHeight( 18 );
     setFixedWidth( 14 );
    vc = new NotesControl;
 }
 
 NotesApplet::~NotesApplet() {
     delete vc;
 }
 
+int NotesApplet::position()
+{
+    return 6;
+}
+
 void NotesApplet::mousePressEvent( QMouseEvent *) {
     if( !vc->isHidden()) {
         vc->doPopulate=false;
         vc->save();
         vc->close();
     } else {
 //    vc = new NotesControl;
 //    QPoint curPos = mapToGlobal( rect().topLeft() );
          if(vc->showMax) {
              qDebug("show max");
              vc->showMaximized();
          } else {
@@ -493,12 +499,16 @@ void NotesApplet::mousePressEvent( QMouseEvent *) {
 
         vc->load();
 //        this->setFocus();
         vc->view->setFocus();
     }
 }
 
 void NotesApplet::paintEvent( QPaintEvent* ) {
     QPainter p(this);
     p.drawPixmap( 0, 1,  ( const char** ) notes_xpm );
 }
 
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<NotesApplet> );
+}
diff --git a/noncore/applets/notesapplet/notes.h b/noncore/applets/notesapplet/notes.h
index 08253cb..ed1f98c 100644
--- a/noncore/applets/notesapplet/notes.h
+++ b/noncore/applets/notesapplet/notes.h
@@ -67,24 +67,25 @@ private slots:
     void loadDoc( const DocLnk &);
     void slotViewEdited();
     void slotBoxSelected(const QString &);
 //    void keyReleaseEvent( QKeyEvent *);
 
 };
 
 class NotesApplet : public QWidget {
     Q_OBJECT
 public:
     NotesApplet( QWidget *parent = 0, const char *name=0 );
     ~NotesApplet();
+    static int position();
     NotesControl *vc;
 public slots:
 private:
     void mousePressEvent( QMouseEvent * );
     void paintEvent( QPaintEvent* );
 
 private:
     QPixmap notesPixmap;
 private slots:
 
 
 };
diff --git a/noncore/applets/notesapplet/notesapplet.pro b/noncore/applets/notesapplet/notesapplet.pro
index 3075948..38ba184 100644
--- a/noncore/applets/notesapplet/notesapplet.pro
+++ b/noncore/applets/notesapplet/notesapplet.pro
@@ -1,16 +1,12 @@
 TEMPLATE  = lib
 CONFIG    += qt plugin warn_on release
-HEADERS =   notes.h notesappletimpl.h
-SOURCES =   notes.cpp notesappletimpl.cpp
+HEADERS =   notes.h
+SOURCES =   notes.cpp
 TARGET    = notesapplet
 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 )
diff --git a/noncore/applets/notesapplet/notesappletimpl.cpp b/noncore/applets/notesapplet/notesappletimpl.cpp
deleted file mode 100644
index 8a9da7f..0000000
--- a/noncore/applets/notesapplet/notesappletimpl.cpp
+++ b/dev/null
@@ -1,53 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2002 L.J. Potter <llornkcor@handhelds.org>
-**
-**
-** 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.
-**
-**
-**********************************************************************/
-#include "notes.h"
-#include "notesappletimpl.h"
-
-
-NotesAppletImpl::NotesAppletImpl()
-    : notes(0){
-}
-
-NotesAppletImpl::~NotesAppletImpl() {
-    // not needed though cause we should have a valid parent
-    delete notes;
-}
-
-QWidget *NotesAppletImpl::applet( QWidget *parent ) {
-    if ( !notes )
-  notes = new NotesApplet( parent );
-    return notes;
-}
-
-int NotesAppletImpl::position() const {
-    return 6;
-}
-
-QRESULT NotesAppletImpl::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( NotesAppletImpl )
-}
-
-
diff --git a/noncore/applets/notesapplet/notesappletimpl.h b/noncore/applets/notesapplet/notesappletimpl.h
deleted file mode 100644
index a87118c..0000000
--- a/noncore/applets/notesapplet/notesappletimpl.h
+++ b/dev/null
@@ -1,35 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2002 L.J. Potter <llornkcor@handhelds.org>
-**
-**
-** 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.
-**
-**
-**********************************************************************/
-#ifndef NOTESAPPLETIMPL_H
-#define NOTESAPPLETIMPL_H
-
-#include <qpe/taskbarappletinterface.h>
-
-class NotesApplet;
-
-class NotesAppletImpl : public TaskbarAppletInterface
-{
-public:
-    NotesAppletImpl();
-    virtual ~NotesAppletImpl();
-
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-
-private:
-    NotesApplet *notes;
-};
-
-#endif