summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/memoryapplet/config.in6
-rw-r--r--noncore/applets/memoryapplet/opie-memoryapplet.control2
-rw-r--r--noncore/applets/memoryapplet/swapfile.cpp4
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
@@ -1,10 +1,10 @@
1Package: opie-memoryapplet 1Package: opie-memoryapplet
2Files: plugins/applets/libmemoryapplet.so* pics/memory 2Files: plugins/applets/libmemoryapplet.so* pics/memory
3Priority: optional 3Priority: optional
4Section: opie/applets 4Section: opie/applets
5Maintainer: Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> 5Maintainer: Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal, libopieui2 7Depends: task-opie-minimal, libopiecore2, libopieui2
8Description: Memory Applet 8Description: 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
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $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
@@ -20,13 +20,13 @@
20**********************************************************************/ 20**********************************************************************/
21 21
22#include "swapfile.h" 22#include "swapfile.h"
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>
27using namespace Opie::Core; 27using namespace Opie::Core;
28 28
29/* QT */ 29/* QT */
30#include <qfile.h> 30#include <qfile.h>
31#include <qtextstream.h> 31#include <qtextstream.h>
32#include <qlabel.h> 32#include <qlabel.h>
@@ -290,13 +290,13 @@ void Swapfile::swapon()
290} 290}
291 291
292 292
293void Swapfile::setStatusMessage(const QString& text, bool error /* = false */) 293void 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
300void Swapfile::swapoff() 300void Swapfile::swapoff()
301{ 301{
302 char swapcmd[128] ="swapoff "; 302 char swapcmd[128] ="swapoff ";