Memory Applet: libopie->libopie2

5 files changed, 6 insertions, 5 deletions

diff --git a/noncore/applets/memoryapplet/config.in b/noncore/applets/memoryapplet/config.in
index 578aaf9..4fc13ba 100644
--- a/noncore/applets/memoryapplet/config.in
+++ b/noncore/applets/memoryapplet/config.in
@@ -3,3 +3,3 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && SYSINFO
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && SYSINFO
   comment "opie-memoryapplet needs a libqpe, libopie and sysinfo"
diff --git a/noncore/applets/memoryapplet/memoryapplet.pro b/noncore/applets/memoryapplet/memoryapplet.pro
index cd3f4a5..6031386 100644
--- a/noncore/applets/memoryapplet/memoryapplet.pro
+++ b/noncore/applets/memoryapplet/memoryapplet.pro
@@ -21,3 +21,3 @@ DEPENDPATH  += ../$(OPIEDIR)/include
 VERSION     = 1.0.0
-LIBS        += -lqpe -lopie
+LIBS        += -lqpe -lopieui2
 
diff --git a/noncore/applets/memoryapplet/memorystatus.cpp b/noncore/applets/memoryapplet/memorystatus.cpp
index b738312..c01ba28 100644
--- a/noncore/applets/memoryapplet/memorystatus.cpp
+++ b/noncore/applets/memoryapplet/memorystatus.cpp
@@ -28,3 +28,2 @@
 
-#include <opie/otabwidget.h>
 #include <qlayout.h>
diff --git a/noncore/applets/memoryapplet/memorystatus.h b/noncore/applets/memoryapplet/memorystatus.h
index 5c73833..c3926db 100644
--- a/noncore/applets/memoryapplet/memorystatus.h
+++ b/noncore/applets/memoryapplet/memorystatus.h
@@ -24,5 +24,7 @@
 
+#include <opie2/otabwidget.h>
+
 class MemoryInfo;
 class Swapfile;
-class OTabWidget;
+using Opie::OTabWidget;
 
diff --git a/noncore/applets/memoryapplet/opie-memoryapplet.control b/noncore/applets/memoryapplet/opie-memoryapplet.control
index 12026a4..c01a93f 100644
--- a/noncore/applets/memoryapplet/opie-memoryapplet.control
+++ b/noncore/applets/memoryapplet/opie-memoryapplet.control
@@ -6,3 +6,3 @@ Maintainer: Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
 Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopieui2
 Description: Memory Applet