3 files changed, 15 insertions, 16 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
@@ -32,14 +32,15 @@
 #include <qtopia/applnk.h>
 
+using namespace Opie::Ui;
 MemoryMeter::MemoryMeter( QWidget *parent )
     : QWidget( parent ), memoryView(0)
 {
         bvsz = QSize();
-        if ( qApp->desktop()->height() >= 300 ) 
+        if ( qApp->desktop()->height() >= 300 )
         {
                 memoryView = new MemoryStatus( 0, WStyle_StaysOnTop | WType_Popup );
                 memoryView->setFrameStyle( QFrame::Panel | QFrame::Raised );
-        } 
-        else 
+        }
+        else
         {
                 memoryView = new MemoryStatus( 0 );
@@ -80,9 +81,9 @@ bool MemoryMeter::updateMemoryViewGeometry()
         {
                 QSize sz = memoryView->sizeHint();
-                if ( sz != bvsz ) 
+                if ( sz != bvsz )
                 {
                         bvsz = sz;
                         QRect r(memoryView->pos(), memoryView->sizeHint());
-                        if ( qApp->desktop()->height() >= 300 ) 
+                        if ( qApp->desktop()->height() >= 300 )
                         {
                                 QPoint curPos = mapToGlobal( rect().topLeft() );
@@ -101,9 +102,9 @@ bool MemoryMeter::updateMemoryViewGeometry()
 void MemoryMeter::mousePressEvent( QMouseEvent *)
 {
-    if ( memoryView->isVisible() ) 
+    if ( memoryView->isVisible() )
         {
                 memoryView->hide();
-        } 
-        else 
+        }
+        else
         {
                 bvsz = QSize();
@@ -207,5 +208,5 @@ void MemoryMeter::paintEvent( QPaintEvent* )
     // Drained section.
     //
-    if (used_height != 0) 
+    if (used_height != 0)
         {
                 p.setPen(NoPen);
@@ -224,5 +225,5 @@ void MemoryMeter::paintEvent( QPaintEvent* )
     // Unused section.
     //
-    if ( batt_height - used_height > 0 ) 
+    if ( batt_height - used_height > 0 )
         {
                 int unused_offset = used_height + batt_yoffset;
@@ -241,7 +242,4 @@ 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
@@ -29,4 +29,5 @@
 #include <qlayout.h>
 
+using namespace Opie::Ui;
 MemoryStatus::MemoryStatus(QWidget *parent, WFlags f )
     : QFrame(parent, 0, f), mi(0), sf(0)
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
@@ -27,5 +27,5 @@
 class MemoryInfo;
 class Swapfile;
-using Opie::OTabWidget;
+
 
 class MemoryStatus : public QFrame
@@ -43,5 +43,5 @@ public:
 
 private:
-    OTabWidget *tab;
+    Opie::Ui::OTabWidget *tab;
 };