author | drw <drw> | 2004-02-22 17:17:08 (UTC) |
---|---|---|
committer | drw <drw> | 2004-02-22 17:17:08 (UTC) |
commit | 5b27ef38d45ae4aa751c6e364cb62ed428808e3f (patch) (unidiff) | |
tree | 14e149df51b9016c0128b277eb698cf14582d639 /noncore/applets | |
parent | f31e19e2d828dc6d8563b2540e45ee60184f91aa (diff) | |
download | opie-5b27ef38d45ae4aa751c6e364cb62ed428808e3f.zip opie-5b27ef38d45ae4aa751c6e364cb62ed428808e3f.tar.gz opie-5b27ef38d45ae4aa751c6e364cb62ed428808e3f.tar.bz2 |
Memory Applet: libopie->libopie2
-rw-r--r-- | noncore/applets/memoryapplet/config.in | 2 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memoryapplet.pro | 2 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memorystatus.cpp | 1 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memorystatus.h | 4 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/opie-memoryapplet.control | 2 |
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 |
17 | TARGET = memoryapplet | 17 | TARGET = memoryapplet |
18 | DESTDIR = $(OPIEDIR)/plugins/applets | 18 | DESTDIR = $(OPIEDIR)/plugins/applets |
19 | INCLUDEPATH += $(OPIEDIR)/include | 19 | INCLUDEPATH += $(OPIEDIR)/include |
20 | DEPENDPATH += ../$(OPIEDIR)/include | 20 | DEPENDPATH += ../$(OPIEDIR)/include |
21 | VERSION = 1.0.0 | 21 | VERSION = 1.0.0 |
22 | LIBS += -lqpe -lopie | 22 | LIBS += -lqpe -lopieui2 |
23 | 23 | ||
24 | include ( $(OPIEDIR)/include.pro ) | 24 | include ( $(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 | ||
32 | MemoryStatus::MemoryStatus(QWidget *parent, WFlags f ) | 31 | MemoryStatus::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 | |||
25 | class MemoryInfo; | 27 | class MemoryInfo; |
26 | class Swapfile; | 28 | class Swapfile; |
27 | class OTabWidget; | 29 | using Opie::OTabWidget; |
28 | 30 | ||
29 | class MemoryStatus : public QFrame | 31 | class MemoryStatus : public QFrame |
30 | { | 32 | { |
31 | Q_OBJECT | 33 | Q_OBJECT |
32 | public: | 34 | public: |
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 @@ | |||
1 | Package: opie-memoryapplet | 1 | Package: opie-memoryapplet |
2 | Files: plugins/applets/libmemoryapplet.so* pics/memory | 2 | Files: plugins/applets/libmemoryapplet.so* pics/memory |
3 | Priority: optional | 3 | 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 | 7 | Depends: task-opie-minimal, 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 |