-rw-r--r-- | noncore/applets/memoryapplet/memoryapplet.pro | 12 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memorystatus.cpp | 2 | ||||
-rw-r--r-- | packages | 9 |
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 @@ TEMPLATE = lib CONFIG += qt plugin warn_on release -HEADERS = ../../apps/sysinfo/graph.h \ - ../../apps/sysinfo/load.h \ - ../../apps/sysinfo/memory.h \ +HEADERS = ../../settings/sysinfo/graph.h \ + ../../settings/sysinfo/load.h \ + ../../settings/sysinfo/memory.h \ memoryappletimpl.h \ memorymeter.h \ memorystatus.h \ swapfile.h -SOURCES = ../../apps/sysinfo/graph.cpp \ - ../../apps/sysinfo/load.cpp \ - ../../apps/sysinfo/memory.cpp \ +SOURCES = ../../settings/sysinfo/graph.cpp \ + ../../settings/sysinfo/load.cpp \ + ../../settings/sysinfo/memory.cpp \ memoryappletimpl.cpp \ memorymeter.cpp \ 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 @@ ** **********************************************************************/ #include "memorystatus.h" -#include "../../apps/sysinfo/memory.h" +#include "../../settings/sysinfo/memory.h" #include "swapfile.h" #include <qpainter.h> @@ -2,7 +2,7 @@ CONFIG_ADDRESSBOOK core/pim/addressbook addressbook.pro CONFIG_ADVANCEDFM noncore/apps/advancedfm advancedfm.pro CONFIG_APPEARANCE2 noncore/settings/appearance2 appearance2.pro CONFIG_APPSKEY noncore/settings/appskey appskey.pro -CONFIG_AQPKG noncore/apps/aqpkg aqpkg.pro +CONFIG_AQPKG noncore/settings/aqpkg aqpkg.pro CONFIG_BACKGAMMON noncore/games/backgammon backgammon.pro CONFIG_BACKUP noncore/settings/backup backup.pro CONFIG_BATTERYAPPLET core/applets/batteryapplet batteryapplet.pro @@ -35,7 +35,7 @@ CONFIG_DVORAK inputmethods/dvorak dvorak.pro CONFIG_EMBEDDEDKONSOLE core/apps/embeddedkonsole embeddedkonsole.pro CONFIG_EUROCONV noncore/tools/euroconv/ euroconv.pro CONFIG_FIFTEEN noncore/games/fifteen fifteen.pro -CONFIG_FILEBROWSER core/apps/filebrowser filebrowser.pro +CONFIG_FILEBROWSER noncore/unsupported/filebrowser filebrowser.pro CONFIG_FLAT noncore/styles/flat flat.pro CONFIG_FORMATTER noncore/tools/formatter formatter.pro CONFIG_FREETYPE freetype freetype.pro @@ -124,8 +124,7 @@ CONFIG_PICKBOARD inputmethods/pickboard pickboard.pro CONFIG_QASTEROIDS noncore/games/qasteroids qasteroids.pro CONFIG_QASHMONEY noncore/apps/qashmoney qashmoney.pro CONFIG_QCOP core/apps/qcop qcop.pro -CONFIG_QPDF noncore/graphics/qpdf qpdf.pro -CONFIG_QPDF2 noncore/graphics/qpdf2 qpdf2.pro +CONFIG_QPDF noncore/unsupported/qpdf qpdf.pro CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro CONFIG_QWS core/qws qws.pro CONFIG_REMOTE noncore/tools/remote remote.pro @@ -146,7 +145,7 @@ CONFIG_SOLITAIRE noncore/games/solitaire solitaire.pro CONFIG_SOUND noncore/settings/sound sound.pro CONFIG_SSHKEYS noncore/settings/sshkeys sshkeys.pro CONFIG_SUSPENDAPPLET core/applets/suspendapplet suspendapplet.pro -CONFIG_SYSINFO noncore/apps/sysinfo sysinfo.pro +CONFIG_SYSINFO noncore/settings/sysinfo sysinfo.pro CONFIG_TABLEVIEWER noncore/apps/tableviewer tableviewer.pro CONFIG_TABMANAGER noncore/settings/tabmanager tabmanager.pro CONFIG_TABOAPP core/apps/taboapp taboapp.pro |