libopie1-->libopie2

4 files changed, 19 insertions, 5 deletions

diff --git a/core/applets/multikeyapplet/config.in b/core/applets/multikeyapplet/config.in
index fc7affe..2e1a9e2 100644
--- a/core/applets/multikeyapplet/config.in
+++ b/core/applets/multikeyapplet/config.in
@@ -3,2 +3,2 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && MULTIKEY
+    depends ( LIBQPE || LIBQPE-X11 ) && MULTIKEY
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp
index d304f54..b36ee12 100644
--- a/core/applets/multikeyapplet/multikey.cpp
+++ b/core/applets/multikeyapplet/multikey.cpp
@@ -16,2 +16,4 @@
 
+/* OPIE */
+#include <opie2/otaskbarapplet.h>
 #include <qpe/global.h>
@@ -21,2 +23,3 @@
 
+/* QT */
 #include <qlabel.h>
@@ -114,3 +117,3 @@ void Multikey::message(const QCString &message, const QByteArray &data)
                     if (line.find(QRegExp("^sw\\s*=\\s*")) != -1) {
-                
+
                         if (i != sw.count()-1) {
@@ -136 +139,11 @@ void Multikey::message(const QCString &message, const QByteArray &data)
 }
+
+int Multikey::position()
+{
+    return 10;
+}
+
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<Multikey> );
+}
diff --git a/core/applets/multikeyapplet/multikey.h b/core/applets/multikeyapplet/multikey.h
index 1c5aa0c..acddfc8 100644
--- a/core/applets/multikeyapplet/multikey.h
+++ b/core/applets/multikeyapplet/multikey.h
@@ -26,2 +26,3 @@ public:
     Multikey(QWidget *parent);
+    static int position();
 
diff --git a/core/applets/multikeyapplet/multikeyapplet.pro b/core/applets/multikeyapplet/multikeyapplet.pro
index 4be1f74..86e41c0 100644
--- a/core/applets/multikeyapplet/multikeyapplet.pro
+++ b/core/applets/multikeyapplet/multikeyapplet.pro
@@ -2,4 +2,4 @@ TEMPLATE	= lib
         CONFIG  += qt plugin warn_on release
-        HEADERS=   multikey.h multikeyappletimpl.h
-        SOURCES=   multikey.cpp multikeyappletimpl.cpp
+        HEADERS=   multikey.h
+        SOURCES=   multikey.cpp
         TARGET  = multikeyapplet
@@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ..
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe
         VERSION         = 1.0.0