| author | mickeyl <mickeyl> | 2003-12-07 15:15:32 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-12-07 15:15:32 (UTC) |
| commit | 6da5abf5f5c094ee8b431250573a662b53110c01 (patch) (side-by-side diff) | |
| tree | e77f61ca12190f0bfd5bc7237e436bc6b6951686 | |
| parent | d4f47b47a8d0b64daca4becf9169dee70c629bab (diff) | |
| download | opie-6da5abf5f5c094ee8b431250573a662b53110c01.zip opie-6da5abf5f5c094ee8b431250573a662b53110c01.tar.gz opie-6da5abf5f5c094ee8b431250573a662b53110c01.tar.bz2 | |
adapt to directory structure changes done on cvs server
| -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,18 +1,18 @@ 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 \ swapfile.cpp TARGET = memoryapplet DESTDIR = $(OPIEDIR)/plugins/applets 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 @@ -15,13 +15,13 @@ ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "memorystatus.h" -#include "../../apps/sysinfo/memory.h" +#include "../../settings/sysinfo/memory.h" #include "swapfile.h" #include <qpainter.h> #include <qpushbutton.h> #include <qdrawutil.h> #include <qlabel.h> @@ -1,11 +1,11 @@ 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 CONFIG_BEND noncore/mail/bend bend.pro CONFIG_BINARY noncore/tools/calc2/binary binary.pro CONFIG_BLUE-PIN noncore/net/opietooth/blue-pin blue-pin.pro @@ -32,13 +32,13 @@ CONFIG_DICTIONARY noncore/apps/dictionary dictionary.pro CONFIG_DOCTAB noncore/settings/doctab doctab.pro CONFIG_DRAWPAD noncore/graphics/drawpad drawpad.pro 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 CONFIG_FRESH noncore/styles/fresh fresh.pro CONFIG_FTPLIB noncore/net/ftplib ftplib.pro CONFIG_GO noncore/games/go go.pro @@ -121,14 +121,13 @@ CONFIG_OSEARCH core/pim/osearch osearch.pro CONFIG_OXYGEN noncore/apps/oxygen oxygen.pro CONFIG_PARASHOOT noncore/games/parashoot parashoot.pro 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 CONFIG_RESTARTAPPLET core/applets/restartapplet restartapplet.pro CONFIG_RESTARTAPPLET2 core/applets/restartapplet2 restartapplet2.pro CONFIG_ROTATEAPPLET core/applets/rotateapplet rotateapplet.pro @@ -143,13 +142,13 @@ CONFIG_SIMPLE noncore/tools/calc2/simple simple.pro CONFIG_SINGLE single single.pro CONFIG_SNAKE noncore/games/snake snake.pro 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 CONFIG_TEST libsql/test test.pro CONFIG_TEST noncore/apps/opie-console/test test.pro CONFIG_TETRIX noncore/games/tetrix tetrix.pro |