-rw-r--r-- | noncore/applets/memoryapplet/config.in | 2 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memoryapplet.pro | 2 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memorystatus.cpp | 1 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memorystatus.h | 4 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/opie-memoryapplet.control | 2 |
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 @@ -2,5 +2,5 @@ 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 @@ -20,5 +20,5 @@ 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 @@ -27,5 +27,4 @@ #include <qlabel.h> -#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 @@ -23,7 +23,9 @@ #include <qframe.h> +#include <opie2/otabwidget.h> + class MemoryInfo; class Swapfile; -class OTabWidget; +using Opie::OTabWidget; class MemoryStatus : public QFrame 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 @@ -5,5 +5,5 @@ 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 |