author | drw <drw> | 2005-06-04 00:26:18 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-04 00:26:18 (UTC) |
commit | c21c13d9c1aa69cbc6ef5dd596e3345f0cb0e2c6 (patch) (side-by-side diff) | |
tree | 1437946e2e4ca0c2997e62d3bb08e439d2991c6c /noncore/applets/memoryapplet | |
parent | d5f6413fb06e8363eb6c3170905b1b18831438f4 (diff) | |
download | opie-c21c13d9c1aa69cbc6ef5dd596e3345f0cb0e2c6.zip opie-c21c13d9c1aa69cbc6ef5dd596e3345f0cb0e2c6.tar.gz opie-c21c13d9c1aa69cbc6ef5dd596e3345f0cb0e2c6.tar.bz2 |
Resource -> OResource
-rw-r--r-- | noncore/applets/memoryapplet/config.in | 6 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/opie-memoryapplet.control | 2 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/swapfile.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/noncore/applets/memoryapplet/config.in b/noncore/applets/memoryapplet/config.in index a35e35d..a06f888 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 ) && LIBOPIE2UI && SYSINFO - comment "opie-memoryapplet needs a libqpe, libopie2ui and sysinfo" - depends ! ( LIBOPIE && SYSINFO ) + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && SYSINFO + comment "opie-memoryapplet needs a libqpe, libopie2core, libopie2ui and sysinfo" + depends ! (( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && SYSINFO) diff --git a/noncore/applets/memoryapplet/opie-memoryapplet.control b/noncore/applets/memoryapplet/opie-memoryapplet.control index c01a93f..40f1ec1 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, libopieui2 +Depends: task-opie-minimal, libopiecore2, libopieui2 Description: Memory Applet This applet displays the amount of free memory and manages the swap partition diff --git a/noncore/applets/memoryapplet/swapfile.cpp b/noncore/applets/memoryapplet/swapfile.cpp index 50c173b..cd16d6d 100644 --- a/noncore/applets/memoryapplet/swapfile.cpp +++ b/noncore/applets/memoryapplet/swapfile.cpp @@ -24,5 +24,5 @@ /* OPIE */ #include <opie2/odebug.h> -#include <qpe/resource.h> +#include <opie2/oresource.h> using namespace Opie::Core; @@ -294,5 +294,5 @@ void Swapfile::setStatusMessage(const QString& text, bool error /* = false */) { swapStatus->setText("<b>" + text + "</b>"); - swapStatusIcon->setPixmap(Resource::loadPixmap(error ? "close" : "done")); + swapStatusIcon->setPixmap(Opie::Core::OResource::loadPixmap(error ? "close" : "done", Opie::Core::OResource::SmallIcon)); } |