author | drw <drw> | 2005-06-04 00:26:18 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-04 00:26:18 (UTC) |
commit | c21c13d9c1aa69cbc6ef5dd596e3345f0cb0e2c6 (patch) (unidiff) | |
tree | 1437946e2e4ca0c2997e62d3bb08e439d2991c6c /noncore/applets/memoryapplet | |
parent | d5f6413fb06e8363eb6c3170905b1b18831438f4 (diff) | |
download | opie-c21c13d9c1aa69cbc6ef5dd596e3345f0cb0e2c6.zip opie-c21c13d9c1aa69cbc6ef5dd596e3345f0cb0e2c6.tar.gz opie-c21c13d9c1aa69cbc6ef5dd596e3345f0cb0e2c6.tar.bz2 |
Resource -> OResource
Diffstat (limited to 'noncore/applets/memoryapplet') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -1,6 +1,6 @@ | |||
1 | config MEMORYAPPLET | 1 | config MEMORYAPPLET |
2 | boolean "opie-memoryapplet (view memory status and manage a swap file)" | 2 | boolean "opie-memoryapplet (view memory status and manage a swap file)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && SYSINFO | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && SYSINFO |
5 | comment "opie-memoryapplet needs a libqpe, libopie2ui and sysinfo" | 5 | comment "opie-memoryapplet needs a libqpe, libopie2core, libopie2ui and sysinfo" |
6 | depends ! ( LIBOPIE && SYSINFO ) | 6 | 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 | |||
@@ -4,7 +4,7 @@ Priority: optional | |||
4 | Section: opie/applets | 4 | Section: opie/applets |
5 | Maintainer: Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> | 5 | Maintainer: Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal, libopieui2 | 7 | Depends: task-opie-minimal, libopiecore2, libopieui2 |
8 | Description: Memory Applet | 8 | Description: Memory Applet |
9 | This applet displays the amount of free memory and manages the swap partition | 9 | This applet displays the amount of free memory and manages the swap partition |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |
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 | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | /* OPIE */ | 24 | /* OPIE */ |
25 | #include <opie2/odebug.h> | 25 | #include <opie2/odebug.h> |
26 | #include <qpe/resource.h> | 26 | #include <opie2/oresource.h> |
27 | using namespace Opie::Core; | 27 | using namespace Opie::Core; |
28 | 28 | ||
29 | /* QT */ | 29 | /* QT */ |
@@ -293,7 +293,7 @@ void Swapfile::swapon() | |||
293 | void Swapfile::setStatusMessage(const QString& text, bool error /* = false */) | 293 | void Swapfile::setStatusMessage(const QString& text, bool error /* = false */) |
294 | { | 294 | { |
295 | swapStatus->setText("<b>" + text + "</b>"); | 295 | swapStatus->setText("<b>" + text + "</b>"); |
296 | swapStatusIcon->setPixmap(Resource::loadPixmap(error ? "close" : "done")); | 296 | swapStatusIcon->setPixmap(Opie::Core::OResource::loadPixmap(error ? "close" : "done", Opie::Core::OResource::SmallIcon)); |
297 | } | 297 | } |
298 | 298 | ||
299 | 299 | ||