6 files changed, 21 insertions, 76 deletions

diff --git a/noncore/applets/zkbapplet/.cvsignore b/noncore/applets/zkbapplet/.cvsignore
new file mode 100644
index 0000000..0f79c04
--- a/dev/null
+++ b/noncore/applets/zkbapplet/.cvsignore
@@ -0,0 +1,6 @@
+Makefile*
+advancedconfigbase.cpp
+advancedconfigbase.h
+moc_*
+.moc
+.obj
diff --git a/noncore/applets/zkbapplet/zkbapplet.cpp b/noncore/applets/zkbapplet/zkbapplet.cpp
deleted file mode 100644
index 6c71568..0000000
--- a/noncore/applets/zkbapplet/zkbapplet.cpp
+++ b/dev/null
@@ -1,49 +0,0 @@
-#include <stdio.h>
-#include <qlabel.h>
-#include <qbutton.h>
-#include <qwindowsystem_qws.h>
-#include "zkbapplet.h"
-#include "zkbwidget.h"
-
-
-ZkbApplet::ZkbApplet() : app(0){
-}
-
-ZkbApplet::~ZkbApplet()
-{
-    if (app) delete app;
-}
-
-QWidget* ZkbApplet::applet(QWidget* parent) {
-        if (app == 0) {
-                app = new ZkbWidget(parent);
-        }
-
-        return app;
-}
-
-int ZkbApplet::position() const {
-        return 8;
-}
-
-QRESULT ZkbApplet::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(ZkbApplet)
-}
diff --git a/noncore/applets/zkbapplet/zkbapplet.h b/noncore/applets/zkbapplet/zkbapplet.h
deleted file mode 100644
index fcf03b5..0000000
--- a/noncore/applets/zkbapplet/zkbapplet.h
+++ b/dev/null
@@ -1,23 +0,0 @@
-#include "qpe/taskbarappletinterface.h"
-
-#ifndef ZKBAPPLET_H
-#define ZKBAPPLET_H
-
-class ZkbWidget;
-
-class ZkbApplet : public TaskbarAppletInterface {
-public:
-        ZkbApplet();
-        virtual ~ZkbApplet();
-
-        QRESULT queryInterface(const QUuid&, QUnknownInterface**);
-        Q_REFCOUNT
-
-        virtual QWidget* applet(QWidget*);
-        virtual int position() const;
-
-protected:
-        ZkbWidget* app;
-};
-
-#endif
diff --git a/noncore/applets/zkbapplet/zkbapplet.pro b/noncore/applets/zkbapplet/zkbapplet.pro
index 22615d0..8cc1b58 100644
--- a/noncore/applets/zkbapplet/zkbapplet.pro
+++ b/noncore/applets/zkbapplet/zkbapplet.pro
@@ -1,16 +1,14 @@
 TEMPLATE    = lib
 CONFIG      += qt plugin warn_on release
-HEADERS     = zkbapplet.h\
-            zkbwidget.h \
+HEADERS     = zkbwidget.h \
             ../../apps/keyz-cfg/zkbcfg.h  \
             ../../apps/keyz-cfg/zkbnames.h  \
             ../../apps/keyz-cfg/zkbxml.h  \
             ../../apps/keyz-cfg/zkb.h  
-SOURCES     = zkbapplet.cpp \
-            zkbwidget.cpp \
+SOURCES     = zkbwidget.cpp \
             ../../apps/keyz-cfg/zkbcfg.cpp  \
             ../../apps/keyz-cfg/zkbnames.cpp  \
             ../../apps/keyz-cfg/zkbxml.cpp  \
             ../../apps/keyz-cfg/zkb.cpp  
 TARGET      = zkbapplet
 DESTDIR     = $(OPIEDIR)/plugins/applets
diff --git a/noncore/applets/zkbapplet/zkbwidget.cpp b/noncore/applets/zkbapplet/zkbwidget.cpp
index 05a76e7..0b5ab78 100644
--- a/noncore/applets/zkbapplet/zkbwidget.cpp
+++ b/noncore/applets/zkbapplet/zkbwidget.cpp
@@ -1,6 +1,7 @@
+#include <opie2/otaskbarapplet.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -23,12 +24,17 @@ ZkbWidget::ZkbWidget(QWidget* parent):QLabel(parent),keymap(0),
     setFixedHeight ( AppLnk::smallIconSize()  );
 }
 
 ZkbWidget::~ZkbWidget() {
 }
 
+int ZkbWidget::position()
+{
+        return 8;
+}
+
 bool ZkbWidget::loadKeymap() {
         ZkbConfig c(QPEApplication::qpeDir()+"/share/zkb");
         QFontMetrics fm(font());
 
         if (keymap != 0) {
                 delete keymap;
@@ -145,6 +151,12 @@ void ZkbWidget::signalReceived(const QCString& msg, const QByteArray& data) {
 }
 
 void ZkbWidget::reload() {
         loadKeymap();
         QCopEnvelope("QPE/System", "notBusy()");
 }
+
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ZkbWidget> );
+}
+
diff --git a/noncore/applets/zkbapplet/zkbwidget.h b/noncore/applets/zkbapplet/zkbwidget.h
index a943563..7c67794 100644
--- a/noncore/applets/zkbapplet/zkbwidget.h
+++ b/noncore/applets/zkbapplet/zkbwidget.h
@@ -12,12 +12,13 @@
 class ZkbWidget : public QLabel {
 Q_OBJECT
 
 public:
         ZkbWidget(QWidget* parent);
         ~ZkbWidget();
+        static int position();
 
         QSize sizeHint() const;
 
 protected:
         QLabel* label;
         Keymap* keymap;