summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
Diffstat (limited to 'noncore') (more/less context) (show whitespace changes)
-rw-r--r--noncore/applets/memoryapplet/config.in2
-rw-r--r--noncore/applets/memoryapplet/memoryapplet.pro2
-rw-r--r--noncore/applets/memoryapplet/memorystatus.cpp1
-rw-r--r--noncore/applets/memoryapplet/memorystatus.h4
-rw-r--r--noncore/applets/memoryapplet/opie-memoryapplet.control2
5 files changed, 6 insertions, 5 deletions
diff --git a/noncore/applets/memoryapplet/config.in b/noncore/applets/memoryapplet/config.in
index 578aaf9..4fc13ba 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 ) && LIBOPIE && SYSINFO 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && SYSINFO
5 comment "opie-memoryapplet needs a libqpe, libopie and sysinfo" 5 comment "opie-memoryapplet needs a libqpe, libopie and sysinfo"
6 depends ! ( LIBOPIE && SYSINFO ) 6 depends ! ( LIBOPIE && SYSINFO )
diff --git a/noncore/applets/memoryapplet/memoryapplet.pro b/noncore/applets/memoryapplet/memoryapplet.pro
index cd3f4a5..6031386 100644
--- a/noncore/applets/memoryapplet/memoryapplet.pro
+++ b/noncore/applets/memoryapplet/memoryapplet.pro
@@ -16,9 +16,9 @@ SOURCES = ../../settings/sysinfo/graph.cpp \
16 swapfile.cpp 16 swapfile.cpp
17TARGET = memoryapplet 17TARGET = memoryapplet
18DESTDIR = $(OPIEDIR)/plugins/applets 18DESTDIR = $(OPIEDIR)/plugins/applets
19INCLUDEPATH += $(OPIEDIR)/include 19INCLUDEPATH += $(OPIEDIR)/include
20DEPENDPATH += ../$(OPIEDIR)/include 20DEPENDPATH += ../$(OPIEDIR)/include
21VERSION = 1.0.0 21VERSION = 1.0.0
22LIBS += -lqpe -lopie 22LIBS += -lqpe -lopieui2
23 23
24include ( $(OPIEDIR)/include.pro ) 24include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/memoryapplet/memorystatus.cpp b/noncore/applets/memoryapplet/memorystatus.cpp
index b738312..c01ba28 100644
--- a/noncore/applets/memoryapplet/memorystatus.cpp
+++ b/noncore/applets/memoryapplet/memorystatus.cpp
@@ -23,13 +23,12 @@
23 23
24#include <qpainter.h> 24#include <qpainter.h>
25#include <qpushbutton.h> 25#include <qpushbutton.h>
26#include <qdrawutil.h> 26#include <qdrawutil.h>
27#include <qlabel.h> 27#include <qlabel.h>
28 28
29#include <opie/otabwidget.h>
30#include <qlayout.h> 29#include <qlayout.h>
31 30
32MemoryStatus::MemoryStatus(QWidget *parent, WFlags f ) 31MemoryStatus::MemoryStatus(QWidget *parent, WFlags f )
33 : QFrame(parent, 0, f), mi(0), sf(0) 32 : QFrame(parent, 0, f), mi(0), sf(0)
34{ 33{
35 setCaption( tr("Memory Status") ); 34 setCaption( tr("Memory Status") );
diff --git a/noncore/applets/memoryapplet/memorystatus.h b/noncore/applets/memoryapplet/memorystatus.h
index 5c73833..c3926db 100644
--- a/noncore/applets/memoryapplet/memorystatus.h
+++ b/noncore/applets/memoryapplet/memorystatus.h
@@ -19,15 +19,17 @@
19**********************************************************************/ 19**********************************************************************/
20#ifndef MEMORY_STATUS_H 20#ifndef MEMORY_STATUS_H
21#define MEMORY_STATUS_H 21#define MEMORY_STATUS_H
22 22
23#include <qframe.h> 23#include <qframe.h>
24 24
25#include <opie2/otabwidget.h>
26
25class MemoryInfo; 27class MemoryInfo;
26class Swapfile; 28class Swapfile;
27class OTabWidget; 29using Opie::OTabWidget;
28 30
29class MemoryStatus : public QFrame 31class MemoryStatus : public QFrame
30{ 32{
31 Q_OBJECT 33 Q_OBJECT
32public: 34public:
33 MemoryStatus(QWidget *parent = 0, WFlags f = 0); 35 MemoryStatus(QWidget *parent = 0, WFlags f = 0);
diff --git a/noncore/applets/memoryapplet/opie-memoryapplet.control b/noncore/applets/memoryapplet/opie-memoryapplet.control
index 12026a4..c01a93f 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 7Depends: task-opie-minimal, 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