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
@@ -33,2 +33,3 @@
 
+using namespace Opie::Ui;
 MemoryMeter::MemoryMeter( QWidget *parent )
@@ -37,3 +38,3 @@ MemoryMeter::MemoryMeter( QWidget *parent )
         bvsz = QSize();
-        if ( qApp->desktop()->height() >= 300 ) 
+        if ( qApp->desktop()->height() >= 300 )
         {
@@ -41,4 +42,4 @@ MemoryMeter::MemoryMeter( QWidget *parent )
                 memoryView->setFrameStyle( QFrame::Panel | QFrame::Raised );
-        } 
-        else 
+        }
+        else
         {
@@ -81,3 +82,3 @@ bool MemoryMeter::updateMemoryViewGeometry()
                 QSize sz = memoryView->sizeHint();
-                if ( sz != bvsz ) 
+                if ( sz != bvsz )
                 {
@@ -85,3 +86,3 @@ bool MemoryMeter::updateMemoryViewGeometry()
                         QRect r(memoryView->pos(), memoryView->sizeHint());
-                        if ( qApp->desktop()->height() >= 300 ) 
+                        if ( qApp->desktop()->height() >= 300 )
                         {
@@ -102,7 +103,7 @@ void MemoryMeter::mousePressEvent( QMouseEvent *)
 {
-    if ( memoryView->isVisible() ) 
+    if ( memoryView->isVisible() )
         {
                 memoryView->hide();
-        } 
-        else 
+        }
+        else
         {
@@ -208,3 +209,3 @@ void MemoryMeter::paintEvent( QPaintEvent* )
     //
-    if (used_height != 0) 
+    if (used_height != 0)
         {
@@ -225,3 +226,3 @@ void MemoryMeter::paintEvent( QPaintEvent* )
     //
-    if ( batt_height - used_height > 0 ) 
+    if ( batt_height - used_height > 0 )
         {
@@ -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;
 };