Introduce the namespace

and the new APPLET_EXPORT define

1 files changed, 5 insertions, 6 deletions

diff --git a/noncore/applets/zkbapplet/zkbwidget.cpp b/noncore/applets/zkbapplet/zkbwidget.cpp
index 0083e9b..3acff1e 100644
--- a/noncore/applets/zkbapplet/zkbwidget.cpp
+++ b/noncore/applets/zkbapplet/zkbwidget.cpp
@@ -1,27 +1,28 @@
 #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>
 #include "zkbwidget.h"
 #include "zkbcfg.h"
 
+using namespace Opie::Ui;
 ZkbWidget::ZkbWidget(QWidget* parent):QLabel(parent),keymap(0),
 	disabled(Resource::loadPixmap("zkb-disabled")) {
 
 	labels = new QPopupMenu();
-	connect(labels, SIGNAL(activated(int)), this, 
+	connect(labels, SIGNAL(activated(int)), this,
 		SLOT(labelChanged(int)));
 
 	loadKeymap();
 
 	channel = new QCopChannel("QPE/zkb", this);
 	connect(channel, SIGNAL(received(const QCString&,const QByteArray&)),
 		this, SLOT(signalReceived(const QCString&,const QByteArray&)));
     setFixedWidth ( AppLnk::smallIconSize()  );
     setFixedHeight ( AppLnk::smallIconSize()  );
 }
 
 ZkbWidget::~ZkbWidget() {
@@ -59,25 +60,25 @@ bool ZkbWidget::loadKeymap() {
 
 	if (oldkm != 0) {
 		delete oldkm;
 	}
 
 	setText(keymap->getCurrentLabel());
 
 	labels->clear();
 	QStringList l = keymap->listLabels();
 	labels->insertItem(disabled, 0, 0);
 	int n = 1;
 	w = 0;
-	for(QStringList::Iterator it = l.begin(); it != l.end(); 
+	for(QStringList::Iterator it = l.begin(); it != l.end();
 		++it, n++) {
 
 //		printf("label: %s\n", (const char*) (*it).utf8());
 
 		labels->insertItem(*it, n, n);
 		int lw = fm.width(*it);
 		if (lw > w) {
 			w = lw;
 		}
 	}
 
 	if (w == 0) {
@@ -146,17 +147,15 @@ void ZkbWidget::signalReceived(const QCString& msg, const QByteArray& data) {
 		}
 	} else if (msg == "debug(QString)") {
 		QString flag;
 		stream >> flag;
 	}
 }
 
 void ZkbWidget::reload() {
 	loadKeymap();
 	QCopEnvelope("QPE/System", "notBusy()");
 }
 
-Q_EXPORT_INTERFACE()
-{
-    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ZkbWidget> );
-}
+EXPORT_OPIE_APPLET_v1( ZkbWidget )
+