5 files changed, 14 insertions, 64 deletions
diff --git a/noncore/applets/autorotateapplet/autorotate.cpp b/noncore/applets/autorotateapplet/autorotate.cpp
index 5152904..94be0ae 100644
--- a/noncore/applets/autorotateapplet/autorotate.cpp
+++ b/noncore/applets/autorotateapplet/autorotate.cpp
@@ -16,2 +16,3 @@
 #include <opie2/odevice.h>
+#include <opie2/otaskbarapplet.h>
 #include <qpe/applnk.h>
@@ -45,2 +46,7 @@ AutoRotate::~AutoRotate()
 
+int AutoRotate::position()
+{
+    return 7;
+}
+
 void AutoRotate::mousePressEvent(QMouseEvent *)
@@ -90 +96,6 @@ bool AutoRotate::isRotateEnabled()
 
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<AutoRotate> );
+}
+
diff --git a/noncore/applets/autorotateapplet/autorotate.h b/noncore/applets/autorotateapplet/autorotate.h
index e05e7a0..ef322a6 100644
--- a/noncore/applets/autorotateapplet/autorotate.h
+++ b/noncore/applets/autorotateapplet/autorotate.h
@@ -24,4 +24,3 @@ public:
     ~AutoRotate();
-
-private slots:
+    static int position();
 
diff --git a/noncore/applets/autorotateapplet/autorotateapplet.pro b/noncore/applets/autorotateapplet/autorotateapplet.pro
index 0ccbeba..465b165 100644
--- a/noncore/applets/autorotateapplet/autorotateapplet.pro
+++ b/noncore/applets/autorotateapplet/autorotateapplet.pro
@@ -2,4 +2,4 @@ TEMPLATE    = lib
 CONFIG        += qt plugin warn_on release
-HEADERS    =    autorotate.h autorotateimpl.h
-SOURCES    =    autorotate.cpp autorotateimpl.cpp
+HEADERS       = autorotate.h
+SOURCES       = autorotate.cpp
 TARGET        = autorotateapplet
diff --git a/noncore/applets/autorotateapplet/autorotateimpl.cpp b/noncore/applets/autorotateapplet/autorotateimpl.cpp
deleted file mode 100644
index 305ac50..0000000
--- a/noncore/applets/autorotateapplet/autorotateimpl.cpp
+++ b/dev/null
@@ -1,42 +0,0 @@
-#include "autorotate.h"
-#include "autorotateimpl.h"
-
-
-AutoRotateImpl::AutoRotateImpl()
-    : autoRotate(0){
-        qDebug ("here");
-}
-
-AutoRotateImpl::~AutoRotateImpl() {
-    delete autoRotate;
-}
-
-QWidget *AutoRotateImpl::applet( QWidget *parent ) {
-    if ( !autoRotate ) {
-	autoRotate = new AutoRotate( parent );
-    }
-    return autoRotate;
-}
-
-int AutoRotateImpl::position() const {
-    return 7;
-}
-
-QRESULT AutoRotateImpl::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( AutoRotateImpl )
-}
diff --git a/noncore/applets/autorotateapplet/autorotateimpl.h b/noncore/applets/autorotateapplet/autorotateimpl.h
deleted file mode 100644
index fde23a9..0000000
--- a/noncore/applets/autorotateapplet/autorotateimpl.h
+++ b/dev/null
@@ -1,18 +0,0 @@
-#include <qpe/taskbarappletinterface.h>
-
-class AutoRotate;
-
-class AutoRotateImpl : public TaskbarAppletInterface {
-public:
-    AutoRotateImpl();
-    virtual ~AutoRotateImpl();
-
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-
-private:
-    AutoRotate *autoRotate;
-};