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,24 +1,24 @@
 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
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += ../$(OPIEDIR)/include
 VERSION     = 1.0.0
 LIBS        += -lqpe -lopie
 
 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
@@ -1,45 +1,45 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** 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>
 
 #include <opie/otabwidget.h>
 #include <qlayout.h>
 
 MemoryStatus::MemoryStatus(QWidget *parent, WFlags f )
     : QFrame(parent, 0, f), mi(0), sf(0)
 {
     setCaption( tr("Memory Status") );
     //resize( 220, 180 );
 
     QVBoxLayout *lay = new QVBoxLayout( this );
     tab = new OTabWidget( this, "tabwidget", OTabWidget::Global );
     lay->addWidget( tab );
     tab->addTab( mi = new MemoryInfo( tab ), "memory/memorytabicon", tr("Memory") );
     tab->addTab( sf = new Swapfile( tab ), "memory/storagetabicon", tr("Swapfile") );
 
         QLabel* about = new QLabel(tr("<center><b>Memory Monitor Plugin</b><br>"
         "Copyright (C) 2003 Anton Maslovsky<br>"
diff --git a/packages b/packages
index 53f6c09..d570e85 100644
--- a/packages
+++ b/packages
@@ -1,62 +1,62 @@
         CONFIG_ADDRESSBOOK      core/pim/addressbookaddressbook.pro
         CONFIG_ADVANCEDFM       noncore/apps/advancedfmadvancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
         CONFIG_APPSKEY  noncore/settings/appskeyappskey.pro
-        CONFIG_AQPKG    noncore/apps/aqpkgaqpkg.pro
+        CONFIG_AQPKG    noncore/settings/aqpkgaqpkg.pro
         CONFIG_BACKGAMMONnoncore/games/backgammon backgammon.pro
         CONFIG_BACKUP   noncore/settings/backupbackup.pro
         CONFIG_BATTERYAPPLET    core/applets/batteryappletbatteryapplet.pro
         CONFIG_BEND     noncore/mail/bendbend.pro
         CONFIG_BINARY   noncore/tools/calc2/binarybinary.pro
         CONFIG_BLUE-PIN         noncore/net/opietooth/blue-pinblue-pin.pro
         CONFIG_BOUNCE   noncore/games/bouncebounce.pro
         CONFIG_BUTTON-SETTINGS  core/settings/buttonbutton.pro
         CONFIG_BUZZWORD         noncore/games/buzzwordbuzzword.pro
         CONFIG_CALC2    noncore/tools/calc2calc.pro
         CONFIG_CALCULATOR       noncore/tools/calculatorcalculator.pro
         CONFIG_CALIBRATE        core/apps/calibratecalibrate.pro
         CONFIG_CAMERA   noncore/multimedia/cameracamera.pro
         CONFIG_CARDMON  core/applets/cardmoncardmon.pro
         CONFIG_CHECKBOOK        noncore/apps/checkbookcheckbook.pro
         CONFIG_CITYTIME         core/settings/citytimecitytime.pro
         CONFIG_CLIPBOARDAPPLET  core/applets/clipboardappletclipboardapplet.pro
         CONFIG_CLOCK    noncore/tools/clockclock.pro
         CONFIG_CLOCKAPPLET      core/applets/clockappletclockapplet.pro
         CONFIG_CONFEDIT         noncore/apps/confeditconfedit.pro
         CONFIG_DASHER   inputmethods/dasherdasher.pro
         CONFIG_DATEBOOK         core/pim/datebookdatebook.pro
         CONFIG_DECO_FLAT        noncore/decorations/flatflat.pro
         CONFIG_DECO_LIQUID      noncore/decorations/liquidliquid.pro
         CONFIG_DECO_POLISHED    noncore/decorations/polishedpolished.pro
         CONFIG_DICTIONARY       noncore/apps/dictionarydictionary.pro
 CONFIG_DOCTAB  noncore/settings/doctab doctab.pro
         CONFIG_DRAWPAD  noncore/graphics/drawpaddrawpad.pro
         CONFIG_DVORAK   inputmethods/dvorakdvorak.pro
         CONFIG_EMBEDDEDKONSOLE  core/apps/embeddedkonsoleembeddedkonsole.pro
         CONFIG_EUROCONV         noncore/tools/euroconv/ euroconv.pro
         CONFIG_FIFTEEN  noncore/games/fifteenfifteen.pro
-        CONFIG_FILEBROWSER      core/apps/filebrowserfilebrowser.pro
+        CONFIG_FILEBROWSER      noncore/unsupported/filebrowserfilebrowser.pro
         CONFIG_FLAT     noncore/styles/flatflat.pro
         CONFIG_FORMATTER        noncore/tools/formatterformatter.pro
         CONFIG_FREETYPE         freetypefreetype.pro
         CONFIG_FRESH    noncore/styles/freshfresh.pro
         CONFIG_FTPLIB   noncore/net/ftplibftplib.pro
         CONFIG_GO       noncore/games/gogo.pro
         CONFIG_GSMTOOL  noncore/comm/gsmtoolgsmtool.pro
         CONFIG_HANDWRITING      inputmethods/handwritinghandwriting.pro
         CONFIG_HELPBROWSER      core/apps/helpbrowserhelpbrowser.pro
         CONFIG_HOMEAPPLET       core/applets/homeapplethomeapplet.pro
         CONFIG_INTERFACES       noncore/settings/networksettings/interfacesinterfaces.pro
         CONFIG_IRDAAPPLET       core/applets/irdaappletirdaapplet.pro
         CONFIG_JUMPX    inputmethods/jumpxjumpx.pro
         CONFIG_KBILL    noncore/games/kbillkbill.pro
         CONFIG_KCHECKERS        noncore/games/kcheckerskcheckers.pro
         CONFIG_KEYBOARD         inputmethods/keyboardkeyboard.pro
         CONFIG_KEYPEBBLE        noncore/comm/keypebblekeypebble.pro
         CONFIG_KEYVIEW  development/keyviewkeyview.pro
         CONFIG_KJUMPX   inputmethods/kjumpxkjumpx.pro
         CONFIG_KPACMAN  noncore/games/kpacmankpacman.pro
         CONFIG_LANGUAGE         noncore/settings/languagelanguage.pro
         CONFIG_LAUNCHER-SETTINGS        core/settings/launcherlauncher.pro
         CONFIG_LAUNCHER_CORE    core/launcherserver.pro
         CONFIG_LIBFFMPEG        core/multimedia/opieplayer/libffmpeglibffmpeg.pro
@@ -103,71 +103,70 @@ CONFIG_OIPKG	core/apps/oipkg	oipkg.pro
         CONFIG_OPIE-CONSOLE     noncore/apps/opie-consoleopie-console.pro
         CONFIG_OPIE-LOGIN       core/opie-loginopie-login.pro
         CONFIG_OPIE-READER      noncore/apps/opie-readeropie-reader.pro
         CONFIG_OPIE-SH  noncore/tools/opie-shopie-sh.pro
         CONFIG_OPIE-SHEET       noncore/apps/opie-sheetopie-sheet.pro
         CONFIG_OPIE-WRITE       noncore/apps/opie-writeopie-write.pro
         CONFIG_OPIEALARMcore/opiealarm
         CONFIG_OPIEFTP  noncore/net/opieftpopieftp.pro
         CONFIG_OPIEIRC  noncore/net/opieircopieirc.pro
         CONFIG_OPIEMAIL2noncore/mail mail.pro
         CONFIG_OPIEPLAYER       core/multimedia/opieplayeropieplayer.pro
         CONFIG_OPIEPLAYER2      noncore/multimedia/opieplayer2opieplayer2.pro
         CONFIG_OPIE-RDESKTOP    noncore/net/opierdesktopopierdesktop.pro
         CONFIG_OPIEREC          noncore/multimedia/opierecopierec.pro
         CONFIG_TONLEITER        noncore/multimedia/tonleitertonleiter.pro
         CONFIG_OPIETOOTH-APPLET         noncore/net/opietooth/appletapplet.pro
         CONFIG_OPIETOOTH-MANAGER        noncore/net/opietooth/managermanager.pro
         CONFIG_OSEARCH  core/pim/osearchosearch.pro
         CONFIG_OXYGEN   noncore/apps/oxygenoxygen.pro
         CONFIG_PARASHOOT        noncore/games/parashootparashoot.pro
         CONFIG_PICKBOARD        inputmethods/pickboardpickboard.pro
         CONFIG_QASTEROIDS       noncore/games/qasteroidsqasteroids.pro
         CONFIG_QASHMONEY        noncore/apps/qashmoneyqashmoney.pro
         CONFIG_QCOP     core/apps/qcopqcop.pro
-        CONFIG_QPDF     noncore/graphics/qpdfqpdf.pro
-        CONFIG_QPDF2    noncore/graphics/qpdf2qpdf2.pro
+        CONFIG_QPDF     noncore/unsupported/qpdfqpdf.pro
 CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro
         CONFIG_QWS      core/qwsqws.pro
         CONFIG_REMOTE   noncore/tools/remoteremote.pro
         CONFIG_RESTARTAPPLET    core/applets/restartappletrestartapplet.pro
         CONFIG_RESTARTAPPLET2   core/applets/restartapplet2restartapplet2.pro
         CONFIG_ROTATEAPPLET     core/applets/rotateappletrotateapplet.pro
         CONFIG_ROTATION         noncore/settings/rotationrotation.pro
         CONFIG_RUNAPPLET        core/applets/runappletrunapplet.pro
         CONFIG_SCREENSHOTAPPLET         core/applets/screenshotappletscreenshotapplet.pro
         CONFIG_SECURITY         core/settings/securitysecurity.pro
         CONFIG_SFCAVE   noncore/games/sfcavesfcave.pro
         CONFIG_SFCAVE-SDL       noncore/games/sfcave-sdlsfcave-sdl.pro
         CONFIG_SHOWIMG  noncore/multimedia/showimgshowimg.pro
         CONFIG_SIMPLE   noncore/tools/calc2/simplesimple.pro
         CONFIG_SINGLE   singlesingle.pro
         CONFIG_SNAKE    noncore/games/snakesnake.pro
         CONFIG_SOLITAIRE        noncore/games/solitairesolitaire.pro
         CONFIG_SOUND    noncore/settings/soundsound.pro
         CONFIG_SSHKEYS  noncore/settings/sshkeyssshkeys.pro
         CONFIG_SUSPENDAPPLET    core/applets/suspendappletsuspendapplet.pro
-        CONFIG_SYSINFO  noncore/apps/sysinfosysinfo.pro
+        CONFIG_SYSINFO  noncore/settings/sysinfosysinfo.pro
         CONFIG_TABLEVIEWER      noncore/apps/tableviewertableviewer.pro
         CONFIG_TABMANAGER       noncore/settings/tabmanagertabmanager.pro
         CONFIG_TABOAPP  core/apps/taboapptaboapp.pro
         CONFIG_TEST     libsql/testtest.pro
         CONFIG_TEST     noncore/apps/opie-console/testtest.pro
         CONFIG_TETRIX   noncore/games/tetrixtetrix.pro
         CONFIG_TEXTEDIT         core/apps/textedittextedit.pro
         CONFIG_THEME    noncore/styles/themetheme.pro
         CONFIG_TICTAC   noncore/games/tictactictac.pro
         CONFIG_TINYKATE noncore/apps/tinykatetinykate.pro
         CONFIG_TODAY    core/pim/todaytoday.pro
 CONFIG_TODAY_ADDRESSBOOK core/pim/today/plugins/addressbook addressbook.pro
         CONFIG_TODAY_DATEBOOK   core/pim/today/plugins/datebookdatebook.pro
         CONFIG_TODAY_FORTUNE    noncore/todayplugins/fortunefortune.pro
         CONFIG_TODAY_MAIL       core/pim/today/plugins/mailmail.pro
         CONFIG_TODAY_STOCKTICKER        noncore/todayplugins/stockticker/stocktickerstockticker.pro
         CONFIG_TODAY_STOCKTICKERLIB     noncore/todayplugins/stockticker/stocktickerlibstocktickerlib.pro
         CONFIG_TODAY_TODOLIST   core/pim/today/plugins/todolisttodolist.pro
         CONFIG_TODAY_WEATHERnoncore/todayplugins/weather weather.pro
         CONFIG_TODO     core/pim/todotodo.pro
         CONFIG_UBROWSER         noncore/net/ubrowserubrowser.pro
         CONFIG_UNIKEYBOARD      inputmethods/unikeyboardunikeyboard.pro
         CONFIG_USERMANAGER      noncore/settings/usermanagerusermanager.pro
         CONFIG_VMEMO    core/applets/vmemovmemo.pro