-rw-r--r-- | noncore/applets/memoryapplet/memoryapplet.pro | 12 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memorystatus.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/noncore/applets/memoryapplet/memoryapplet.pro b/noncore/applets/memoryapplet/memoryapplet.pro index eafabce..cd3f4a5 100644 --- a/noncore/applets/memoryapplet/memoryapplet.pro +++ b/noncore/applets/memoryapplet/memoryapplet.pro | |||
@@ -1,24 +1,24 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt plugin warn_on release | 2 | CONFIG += qt plugin warn_on release |
3 | HEADERS = ../../apps/sysinfo/graph.h \ | 3 | HEADERS = ../../settings/sysinfo/graph.h \ |
4 | ../../apps/sysinfo/load.h \ | 4 | ../../settings/sysinfo/load.h \ |
5 | ../../apps/sysinfo/memory.h \ | 5 | ../../settings/sysinfo/memory.h \ |
6 | memoryappletimpl.h \ | 6 | memoryappletimpl.h \ |
7 | memorymeter.h \ | 7 | memorymeter.h \ |
8 | memorystatus.h \ | 8 | memorystatus.h \ |
9 | swapfile.h | 9 | swapfile.h |
10 | SOURCES = ../../apps/sysinfo/graph.cpp \ | 10 | SOURCES = ../../settings/sysinfo/graph.cpp \ |
11 | ../../apps/sysinfo/load.cpp \ | 11 | ../../settings/sysinfo/load.cpp \ |
12 | ../../apps/sysinfo/memory.cpp \ | 12 | ../../settings/sysinfo/memory.cpp \ |
13 | memoryappletimpl.cpp \ | 13 | memoryappletimpl.cpp \ |
14 | memorymeter.cpp \ | 14 | memorymeter.cpp \ |
15 | memorystatus.cpp \ | 15 | memorystatus.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 -lopie |
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 a800fa5..b738312 100644 --- a/noncore/applets/memoryapplet/memorystatus.cpp +++ b/noncore/applets/memoryapplet/memorystatus.cpp | |||
@@ -9,25 +9,25 @@ | |||
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "memorystatus.h" | 20 | #include "memorystatus.h" |
21 | #include "../../apps/sysinfo/memory.h" | 21 | #include "../../settings/sysinfo/memory.h" |
22 | #include "swapfile.h" | 22 | #include "swapfile.h" |
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> | 29 | #include <opie/otabwidget.h> |
30 | #include <qlayout.h> | 30 | #include <qlayout.h> |
31 | 31 | ||
32 | MemoryStatus::MemoryStatus(QWidget *parent, WFlags f ) | 32 | MemoryStatus::MemoryStatus(QWidget *parent, WFlags f ) |
33 | : QFrame(parent, 0, f), mi(0), sf(0) | 33 | : QFrame(parent, 0, f), mi(0), sf(0) |