From c21c13d9c1aa69cbc6ef5dd596e3345f0cb0e2c6 Mon Sep 17 00:00:00 2001
From: drw <drw>
Date: Sat, 04 Jun 2005 00:26:18 +0000
Subject: Resource -> OResource

---
(limited to 'noncore')

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 @@
   config MEMORYAPPLET
     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
@@ -4,7 +4,7 @@ Priority: optional
 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
 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 @@
 
 /* OPIE */
 #include <opie2/odebug.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 using namespace Opie::Core;
 
 /* QT */
@@ -293,7 +293,7 @@ void Swapfile::swapon()
 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));
 }
 
 
--
cgit v0.9.0.2