Introduce the namespace

and the new APPLET_EXPORT define

3 files changed, 5 insertions, 6 deletions

diff --git a/noncore/applets/memoryapplet/memorymeter.cpp b/noncore/applets/memoryapplet/memorymeter.cpp
index 9299f49..9cdeaf4 100644
--- a/noncore/applets/memoryapplet/memorymeter.cpp
+++ b/noncore/applets/memoryapplet/memorymeter.cpp
@@ -33,2 +33,3 @@
 
+using namespace Opie::Ui;
 MemoryMeter::MemoryMeter( QWidget *parent )
@@ -242,6 +243,3 @@ void MemoryMeter::paintEvent( QPaintEvent* )
 
-Q_EXPORT_INTERFACE()
-{
-    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<MemoryMeter> );
-}
+EXPORT_OPIE_APPLET_v1( MemoryMeter )
 
diff --git a/noncore/applets/memoryapplet/memorystatus.cpp b/noncore/applets/memoryapplet/memorystatus.cpp
index c01ba28..95ae06b 100644
--- a/noncore/applets/memoryapplet/memorystatus.cpp
+++ b/noncore/applets/memoryapplet/memorystatus.cpp
@@ -30,2 +30,3 @@
 
+using namespace Opie::Ui;
 MemoryStatus::MemoryStatus(QWidget *parent, WFlags f )
diff --git a/noncore/applets/memoryapplet/memorystatus.h b/noncore/applets/memoryapplet/memorystatus.h
index c3926db..d16787b 100644
--- a/noncore/applets/memoryapplet/memorystatus.h
+++ b/noncore/applets/memoryapplet/memorystatus.h
@@ -28,3 +28,3 @@ class MemoryInfo;
 class Swapfile;
-using Opie::OTabWidget;
+
 
@@ -44,3 +44,3 @@ public:
 private:
-    OTabWidget *tab;
+    Opie::Ui::OTabWidget *tab;
 };