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
@@ -1,6 +1,6 @@
   config MEMORYAPPLET
     boolean "opie-memoryapplet (view memory status and manage a swap file)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && SYSINFO
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && SYSINFO
   comment "opie-memoryapplet needs a libqpe, libopie and sysinfo"
     depends ! ( LIBOPIE && 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
@@ -14,11 +14,11 @@ SOURCES     = ../../settings/sysinfo/graph.cpp \
             memorymeter.cpp \
             memorystatus.cpp \
             swapfile.cpp
 TARGET      = memoryapplet
 DESTDIR     = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += ../$(OPIEDIR)/include
 VERSION     = 1.0.0
-LIBS        += -lqpe -lopie
+LIBS        += -lqpe -lopieui2
 
 include ( $(OPIEDIR)/include.pro )
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
@@ -21,17 +21,16 @@
 #include "../../settings/sysinfo/memory.h"
 #include "swapfile.h"
 
 #include <qpainter.h>
 #include <qpushbutton.h>
 #include <qdrawutil.h>
 #include <qlabel.h>
 
-#include <opie/otabwidget.h>
 #include <qlayout.h>
 
 MemoryStatus::MemoryStatus(QWidget *parent, WFlags f )
     : QFrame(parent, 0, f), mi(0), sf(0)
 {
     setCaption( tr("Memory Status") );
     //resize( 220, 180 );
 
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
@@ -17,19 +17,21 @@
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef MEMORY_STATUS_H
 #define MEMORY_STATUS_H
 
 #include <qframe.h>
 
+#include <opie2/otabwidget.h>
+
 class MemoryInfo;
 class Swapfile;
-class OTabWidget;
+using Opie::OTabWidget;
 
 class MemoryStatus : public QFrame
 {
     Q_OBJECT
 public:
     MemoryStatus(QWidget *parent = 0, WFlags f = 0);
     ~MemoryStatus();
 
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
@@ -1,10 +1,10 @@
 Package: opie-memoryapplet
 Files: plugins/applets/libmemoryapplet.so* pics/memory
 Priority: optional
 Section: opie/applets
 Maintainer: Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
 Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopieui2
 Description: Memory Applet
  This applet displays the amount of free memory and manages the swap partition
 Version: $QPE_VERSION$EXTRAVERSION