summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/memoryapplet/memoryapplet.pro12
-rw-r--r--noncore/applets/memoryapplet/memorystatus.cpp2
-rw-r--r--packages9
3 files changed, 11 insertions, 12 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,15 +1,15 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt plugin warn_on release 2CONFIG += qt plugin warn_on release
3HEADERS = ../../apps/sysinfo/graph.h \ 3HEADERS = ../../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
10SOURCES = ../../apps/sysinfo/graph.cpp \ 10SOURCES = ../../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 \
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
@@ -18,7 +18,7 @@
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>
diff --git a/packages b/packages
index 53f6c09..d570e85 100644
--- a/packages
+++ b/packages
@@ -2,7 +2,7 @@ CONFIG_ADDRESSBOOK core/pim/addressbook addressbook.pro
2 CONFIG_ADVANCEDFM noncore/apps/advancedfmadvancedfm.pro 2 CONFIG_ADVANCEDFM noncore/apps/advancedfmadvancedfm.pro
3 CONFIG_APPEARANCE2 noncore/settings/appearance2appearance2.pro 3 CONFIG_APPEARANCE2 noncore/settings/appearance2appearance2.pro
4 CONFIG_APPSKEY noncore/settings/appskeyappskey.pro 4 CONFIG_APPSKEY noncore/settings/appskeyappskey.pro
5 CONFIG_AQPKG noncore/apps/aqpkgaqpkg.pro 5 CONFIG_AQPKG noncore/settings/aqpkgaqpkg.pro
6 CONFIG_BACKGAMMONnoncore/games/backgammon backgammon.pro 6 CONFIG_BACKGAMMONnoncore/games/backgammon backgammon.pro
7 CONFIG_BACKUP noncore/settings/backupbackup.pro 7 CONFIG_BACKUP noncore/settings/backupbackup.pro
8 CONFIG_BATTERYAPPLET core/applets/batteryappletbatteryapplet.pro 8 CONFIG_BATTERYAPPLET core/applets/batteryappletbatteryapplet.pro
@@ -35,7 +35,7 @@ CONFIG_DVORAK inputmethods/dvorak dvorak.pro
35 CONFIG_EMBEDDEDKONSOLE core/apps/embeddedkonsoleembeddedkonsole.pro 35 CONFIG_EMBEDDEDKONSOLE core/apps/embeddedkonsoleembeddedkonsole.pro
36 CONFIG_EUROCONV noncore/tools/euroconv/ euroconv.pro 36 CONFIG_EUROCONV noncore/tools/euroconv/ euroconv.pro
37 CONFIG_FIFTEEN noncore/games/fifteenfifteen.pro 37 CONFIG_FIFTEEN noncore/games/fifteenfifteen.pro
38 CONFIG_FILEBROWSER core/apps/filebrowserfilebrowser.pro 38 CONFIG_FILEBROWSER noncore/unsupported/filebrowserfilebrowser.pro
39 CONFIG_FLAT noncore/styles/flatflat.pro 39 CONFIG_FLAT noncore/styles/flatflat.pro
40 CONFIG_FORMATTER noncore/tools/formatterformatter.pro 40 CONFIG_FORMATTER noncore/tools/formatterformatter.pro
41 CONFIG_FREETYPE freetypefreetype.pro 41 CONFIG_FREETYPE freetypefreetype.pro
@@ -124,8 +124,7 @@ CONFIG_PICKBOARD inputmethods/pickboard pickboard.pro
124 CONFIG_QASTEROIDS noncore/games/qasteroidsqasteroids.pro 124 CONFIG_QASTEROIDS noncore/games/qasteroidsqasteroids.pro
125 CONFIG_QASHMONEY noncore/apps/qashmoneyqashmoney.pro 125 CONFIG_QASHMONEY noncore/apps/qashmoneyqashmoney.pro
126 CONFIG_QCOP core/apps/qcopqcop.pro 126 CONFIG_QCOP core/apps/qcopqcop.pro
127 CONFIG_QPDF noncore/graphics/qpdfqpdf.pro 127 CONFIG_QPDF noncore/unsupported/qpdfqpdf.pro
128 CONFIG_QPDF2 noncore/graphics/qpdf2qpdf2.pro
129CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro 128CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro
130 CONFIG_QWS core/qwsqws.pro 129 CONFIG_QWS core/qwsqws.pro
131 CONFIG_REMOTE noncore/tools/remoteremote.pro 130 CONFIG_REMOTE noncore/tools/remoteremote.pro
@@ -146,7 +145,7 @@ CONFIG_SOLITAIRE noncore/games/solitaire solitaire.pro
146 CONFIG_SOUND noncore/settings/soundsound.pro 145 CONFIG_SOUND noncore/settings/soundsound.pro
147 CONFIG_SSHKEYS noncore/settings/sshkeyssshkeys.pro 146 CONFIG_SSHKEYS noncore/settings/sshkeyssshkeys.pro
148 CONFIG_SUSPENDAPPLET core/applets/suspendappletsuspendapplet.pro 147 CONFIG_SUSPENDAPPLET core/applets/suspendappletsuspendapplet.pro
149 CONFIG_SYSINFO noncore/apps/sysinfosysinfo.pro 148 CONFIG_SYSINFO noncore/settings/sysinfosysinfo.pro
150 CONFIG_TABLEVIEWER noncore/apps/tableviewertableviewer.pro 149 CONFIG_TABLEVIEWER noncore/apps/tableviewertableviewer.pro
151 CONFIG_TABMANAGER noncore/settings/tabmanagertabmanager.pro 150 CONFIG_TABMANAGER noncore/settings/tabmanagertabmanager.pro
152 CONFIG_TABOAPP core/apps/taboapptaboapp.pro 151 CONFIG_TABOAPP core/apps/taboapptaboapp.pro