summaryrefslogtreecommitdiff
authordrw <drw>2005-06-04 00:26:18 (UTC)
committer drw <drw>2005-06-04 00:26:18 (UTC)
commitc21c13d9c1aa69cbc6ef5dd596e3345f0cb0e2c6 (patch) (side-by-side diff)
tree1437946e2e4ca0c2997e62d3bb08e439d2991c6c
parentd5f6413fb06e8363eb6c3170905b1b18831438f4 (diff)
downloadopie-c21c13d9c1aa69cbc6ef5dd596e3345f0cb0e2c6.zip
opie-c21c13d9c1aa69cbc6ef5dd596e3345f0cb0e2c6.tar.gz
opie-c21c13d9c1aa69cbc6ef5dd596e3345f0cb0e2c6.tar.bz2
Resource -> OResource
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 @@
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
@@ -1,10 +1,10 @@
Package: opie-memoryapplet
Files: plugins/applets/libmemoryapplet.so* pics/memory
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
@@ -14,25 +14,25 @@
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#include "swapfile.h"
/* OPIE */
#include <opie2/odebug.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
using namespace Opie::Core;
/* QT */
#include <qfile.h>
#include <qtextstream.h>
#include <qlabel.h>
#include <qtimer.h>
#include <qlayout.h>
#include <qpushbutton.h>
#include <qhbuttongroup.h>
#include <qradiobutton.h>
#include <qlineedit.h>
@@ -284,25 +284,25 @@ void Swapfile::swapon()
}
else {
/* QMessageBox::information(this, "Information", "Swapfile is active!"); */
setStatusMessage("Swapfile activated.");
}
Swapfile::status();
}
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));
}
void Swapfile::swapoff()
{
char swapcmd[128] ="swapoff ";
if (Swapfile::cfRB->isChecked() == TRUE)
Swapfile::cfsdchecked();
strcat(swapcmd,swapPath1->text());
char *runcmd = swapcmd;
rc = exec(QString("%1").arg(runcmd));
if (rc != 0) {