remove duplicated boiler plate code in favour of the OTaskbarApplet template

5 files changed, 15 insertions, 118 deletions

diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp
index c736437..8fd88f6 100644
--- a/core/applets/volumeapplet/volume.cpp
+++ b/core/applets/volumeapplet/volume.cpp
@@ -18,16 +18,15 @@
 **
 **********************************************************************/
 
-#include <stdio.h>
-
 #include "volume.h"
+#include "oledbox.h"
 
+#include <opie2/odevice.h>
+#include <opie2/otaskbarapplet.h>
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
-#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
-#endif
 
 #include <qpainter.h>
 #include <qcheckbox.h>
@@ -35,13 +34,10 @@
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qlabel.h>
-
 #include <qpushbutton.h>
 #include <qtimer.h>
 
-#include <opie/odevice.h>
-
-#include "oledbox.h"
+#include <stdio.h>
 
 using namespace Opie;
 
@@ -737,6 +733,10 @@ VolumeApplet::~VolumeApplet()
   delete m_pixmap;
 }
 
+int VolumeApplet::position()
+{
+  return 6;
+}
 
 void VolumeApplet::mousePressEvent ( QMouseEvent * )
 {
@@ -777,3 +777,7 @@ void VolumeApplet::paintEvent ( QPaintEvent * )
 }
 
 
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<VolumeApplet> );
+}
diff --git a/core/applets/volumeapplet/volume.h b/core/applets/volumeapplet/volume.h
index d2345b5..454a688 100644
--- a/core/applets/volumeapplet/volume.h
+++ b/core/applets/volumeapplet/volume.h
@@ -117,6 +117,7 @@ class VolumeApplet : public QWidget {
 public:
 	VolumeApplet ( QWidget *parent = 0, const char *name=0 );
 	~VolumeApplet ( );
+	static int position();
 
 	void redraw ( bool all = true );
 
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro
index 92c6b0a..b14956e 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -1,7 +1,7 @@
 TEMPLATE	= lib
 CONFIG		+= qt plugin warn_on release
-HEADERS	=   volume.h volumeappletimpl.h oledbox.h
-SOURCES	=   volume.cpp volumeappletimpl.cpp oledbox.cpp
+HEADERS		= volume.h oledbox.h
+SOURCES		= volume.cpp oledbox.cpp
 TARGET		= volumeapplet
 DESTDIR		= $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
diff --git a/core/applets/volumeapplet/volumeappletimpl.cpp b/core/applets/volumeapplet/volumeappletimpl.cpp
deleted file mode 100644
index 9c7dea3..0000000
--- a/core/applets/volumeapplet/volumeappletimpl.cpp
+++ b/dev/null
@@ -1,65 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** 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.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#include "volume.h"
-#include "volumeappletimpl.h"
-
-VolumeAppletImpl::VolumeAppletImpl()
-    : volume(0)
-{
-}
-
-VolumeAppletImpl::~VolumeAppletImpl()
-{
-	delete volume;
-}
-
-QWidget *VolumeAppletImpl::applet( QWidget *parent )
-{
-	if ( !volume )
-		volume = new VolumeApplet( parent );
-	return volume;
-}
-
-int VolumeAppletImpl::position() const
-{
-	return 6;
-}
-
-QRESULT VolumeAppletImpl::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( VolumeAppletImpl )
-}
-
-
diff --git a/core/applets/volumeapplet/volumeappletimpl.h b/core/applets/volumeapplet/volumeappletimpl.h
deleted file mode 100644
index a9221c6..0000000
--- a/core/applets/volumeapplet/volumeappletimpl.h
+++ b/dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** 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.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#ifndef VOLUMEAPPLETIMPL_H
-#define VOLUMEAPPLETIMPL_H
-
-#include <qpe/taskbarappletinterface.h>
-
-class VolumeApplet;
-
-class VolumeAppletImpl : public TaskbarAppletInterface
-{
-public:
-    VolumeAppletImpl();
-    virtual ~VolumeAppletImpl();
-
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-
-private:
-    VolumeApplet *volume;
-};
-
-#endif