Add license

remove old unneeded files

16 files changed, 20 insertions, 3206 deletions

diff --git a/core/launcher/Makefile b/core/launcher/Makefile
deleted file mode 100644
index a45dec8..0000000
--- a/core/launcher/Makefile
+++ b/dev/null
@@ -1,1085 +0,0 @@
-#############################################################################
-# Automatically generated from server/Makefile.in
-# Build options from 
-#############################################################################
-
-default: all  # package
-
-CONTROL = server/qpe-taskbar.control
-
-# Compiling
-INTERFACE_DECL_PATH 	= .
-SYSCONF_CXX		= g++
-SYSCONF_CC		= gcc
-DASHCROSS		= 
-
-# Compiling with support libraries
-SYSCONF_CXXFLAGS_X11	= 
-SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
-SYSCONF_CXXFLAGS_QTOPIA	= -I$(QPEDIR)/include
-SYSCONF_CFLAGS_QTOPIA	= -I$(QPEDIR)/include
-SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
-
-# Compiling YACC output
-SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
-
-# Linking with support libraries
-SYSCONF_RPATH_X11	= 
-SYSCONF_RPATH_QT	= -Wl,-rpath,$(QTDIR)/lib
-SYSCONF_RPATH_QTOPIA	= -Wl,-rpath,$(QPEDIR)/lib
-SYSCONF_RPATH_OPENGL	= -Wl,-rpath,/usr/X11R6/lib
-
-# Linking with support libraries
-# X11
-SYSCONF_LFLAGS_X11	= 
-SYSCONF_LIBS_X11	= 
-# Qt, Qt+OpenGL
-SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
-SYSCONF_LFLAGS_QTOPIA	= -L$(QPEDIR)/lib
-SYSCONF_LIBS_QT		= -lqte$(QT_THREAD_SUFFIX)
-SYSCONF_LIBS_QT_OPENGL	= 
-SYSCONF_LIBS_QTOPIA	= -lqtopia
-# OpenGL
-SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-SYSCONF_LIBS_OPENGL	= 
-# Yacc
-SYSCONF_LIBS_YACC	= 
-
-# Linking applications
-SYSCONF_LINK		= gcc
-SYSCONF_LFLAGS		= 
-SYSCONF_LIBS		= 
-
-# Link flags for shared objects
-SYSCONF_LFLAGS_SHOBJ	= -shared
-
-# Flags for threading
-SYSCONF_CFLAGS_THREAD	= -D_REENTRANT
-SYSCONF_CXXFLAGS_THREAD	= -D_REENTRANT
-SYSCONF_LFLAGS_THREAD	= 
-SYSCONF_LIBS_THREAD	=  -lpthread
-
-# Meta-object compiler
-SYSCONF_MOC		= $(QTDIR)/bin/moc
-
-# UI compiler
-SYSCONF_UIC		= $(QTDIR)/bin/uic
-
-# Linking shared libraries
-#   - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
-#   - Place target in $(DESTDIR) - which has a trailing /
-#   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
-#
-SYSCONF_LINK_SHLIB	= gcc
-SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
-				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
-				     $(OBJECTS) $(OBJMOC) $(LIBS) && \
-				 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
-				 cd $(DESTDIR) && \
-				 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
-
-# Linking static libraries
-#   - Build the $(TARGET) library, eg. lib$(TARGET).a
-#   - Place target in $(DESTDIR) - which has a trailing /
-#
-SYSCONF_AR		= ar cqs
-SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
-SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
-				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
-# Compiling application source
-SYSCONF_CXXFLAGS	= -pipe -DQWS -fno-exceptions -fno-rtti -g -Wall -W
-SYSCONF_CFLAGS		= -pipe -g -Wall -W
-# Default link type (static linking is still be used where required)
-SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
-SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
-# Compiling library source
-SYSCONF_CXXFLAGS_LIB	= -fPIC
-SYSCONF_CFLAGS_LIB	= -fPIC
-# Compiling shared-object source
-SYSCONF_CXXFLAGS_SHOBJ	= -fPIC
-SYSCONF_CFLAGS_SHOBJ	= -fPIC
-# Linking Qt
-SYSCONF_LIBS_QTLIB	= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT)
-# Linking Qt applications
-SYSCONF_LIBS_QTAPP	= 
-
-# Platform output directories
-MOC_DIR = .moc/linux-generic-g++/
-OBJECTS_DIR = .obj/linux-generic-g++/
-
-#############################################################################
-
-####### Compiler, tools and options
-
-CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
-CXXFLAGS=	$(SYSCONF_CXXFLAGS_QTOPIA) $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQTOPIA_APP_INTERFACE
-CC	=	$(SYSCONF_CC) $(QT_C_MT)
-CFLAGS	=	$(SYSCONF_CFLAGS_QTOPIA) $(SYSCONF_CFLAGS) -DQTOPIA_APP_INTERFACE
-INCPATH =	-I$(MOC_DIR) -I$(QPEDIR)/src/settings/calibrate -I$(QPEDIR)/src/3rdparty/libraries/rsync
-LFLAGS	=	$(SYSCONF_LFLAGS_QTOPIA) $(SYSCONF_RPATH_QTOPIA) $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
-LIBS	=	$(SUBLIBS) -ljpeg -Wl,-Bstatic -Wl,-whole-archive  -Wl,-no-whole-archive -Wl,-Bdynamic -lcrypt -luuid -lqpe $(SYSCONF_LIBS_QTOPIA) $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
-MOC	=	$(SYSCONF_MOC)
-UIC	=	$(SYSCONF_UIC)
-
-####### Target
-
-DESTDIR = $(QPEDIR)/bin/
-VER_MAJ = 1
-VER_MIN = 0
-VER_PATCH = 0
-TARGET	= qpe
-TARGET1 = lib$(TARGET).so.$(VER_MAJ)
-
-####### Files
-
-HEADERS =	server.h \
-		serverinterface.h \
-		launchertab.h \
-		documentlist.h \
-		suspendmonitor.h \
-		appicons.h \
-		taskbar.h \
-		runningappbar.h \
-		applauncher.h \
-		stabmon.h \
-		inputmethods.h \
-		systray.h \
-		wait.h \
-		shutdownimpl.h \
-		launcher.h \
-		launcherview.h \
-		$(QPEDIR)/src/settings/calibrate/calibrate.h \
-		startmenu.h \
-		transferserver.h \
-		qcopbridge.h \
-		packageslave.h \
-		irserver.h \
-		firstuse.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/buf.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/checksum.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/command.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/emit.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/job.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/netint.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/protocol.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/prototab.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/search.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/stream.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/sumset.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/types.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/whole.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/qrsync.h \
-		syncdialog.h \
-		serverapp.h
-SOURCES =	server.cpp \
-		serverinterface.cpp \
-		launchertab.cpp \
-		documentlist.cpp \
-		suspendmonitor.cpp \
-		appicons.cpp \
-		taskbar.cpp \
-		runningappbar.cpp \
-		applauncher.cpp \
-		stabmon.cpp \
-		inputmethods.cpp \
-		systray.cpp \
-		wait.cpp \
-		shutdownimpl.cpp \
-		launcher.cpp \
-		launcherview.cpp \
-		$(QPEDIR)/src/settings/calibrate/calibrate.cpp \
-		transferserver.cpp \
-		packageslave.cpp \
-		irserver.cpp \
-		qcopbridge.cpp \
-		startmenu.cpp \
-		main.cpp \
-		firstuse.cpp \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/base64.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/buf.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/checksum.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/command.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/delta.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/emit.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/hex.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/job.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/mdfour.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/mksum.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/msg.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/netint.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/patch.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/prototab.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/readsums.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/scoop.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/search.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/stats.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/stream.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/sumset.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/tube.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/version.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/whole.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/qrsync.cpp \
-		syncdialog.cpp \
-		serverapp.cpp
-OBJECTS =	$(OBJECTS_DIR)/server.o \
-		$(OBJECTS_DIR)/serverinterface.o \
-		$(OBJECTS_DIR)/launchertab.o \
-		$(OBJECTS_DIR)/documentlist.o \
-		$(OBJECTS_DIR)/suspendmonitor.o \
-		$(OBJECTS_DIR)/appicons.o \
-		$(OBJECTS_DIR)/taskbar.o \
-		$(OBJECTS_DIR)/runningappbar.o \
-		$(OBJECTS_DIR)/applauncher.o \
-		$(OBJECTS_DIR)/stabmon.o \
-		$(OBJECTS_DIR)/inputmethods.o \
-		$(OBJECTS_DIR)/systray.o \
-		$(OBJECTS_DIR)/wait.o \
-		$(OBJECTS_DIR)/shutdownimpl.o \
-		$(OBJECTS_DIR)/launcher.o \
-		$(OBJECTS_DIR)/launcherview.o \
-		$(OBJECTS_DIR)/calibrate.o \
-		$(OBJECTS_DIR)/transferserver.o \
-		$(OBJECTS_DIR)/packageslave.o \
-		$(OBJECTS_DIR)/irserver.o \
-		$(OBJECTS_DIR)/qcopbridge.o \
-		$(OBJECTS_DIR)/startmenu.o \
-		$(OBJECTS_DIR)/main.o \
-		$(OBJECTS_DIR)/firstuse.o \
-		$(OBJECTS_DIR)/base64.o \
-		$(OBJECTS_DIR)/buf.o \
-		$(OBJECTS_DIR)/checksum.o \
-		$(OBJECTS_DIR)/command.o \
-		$(OBJECTS_DIR)/delta.o \
-		$(OBJECTS_DIR)/emit.o \
-		$(OBJECTS_DIR)/hex.o \
-		$(OBJECTS_DIR)/job.o \
-		$(OBJECTS_DIR)/mdfour.o \
-		$(OBJECTS_DIR)/mksum.o \
-		$(OBJECTS_DIR)/msg.o \
-		$(OBJECTS_DIR)/netint.o \
-		$(OBJECTS_DIR)/patch.o \
-		$(OBJECTS_DIR)/prototab.o \
-		$(OBJECTS_DIR)/readsums.o \
-		$(OBJECTS_DIR)/scoop.o \
-		$(OBJECTS_DIR)/search.o \
-		$(OBJECTS_DIR)/stats.o \
-		$(OBJECTS_DIR)/stream.o \
-		$(OBJECTS_DIR)/sumset.o \
-		$(OBJECTS_DIR)/trace.o \
-		$(OBJECTS_DIR)/tube.o \
-		$(OBJECTS_DIR)/util.o \
-		$(OBJECTS_DIR)/version.o \
-		$(OBJECTS_DIR)/whole.o \
-		$(OBJECTS_DIR)/qrsync.o \
-		$(OBJECTS_DIR)/syncdialog.o \
-		$(OBJECTS_DIR)/serverapp.o \
-		$(OBJECTS_DIR)/shutdown.o
-INTERFACES =    shutdown.ui
-UICDECLS =      shutdown.h
-UICIMPLS =      shutdown.cpp
-SRCMOC	=	$(MOC_DIR)/moc_server.cpp \
-		$(MOC_DIR)/moc_launchertab.cpp \
-		$(MOC_DIR)/moc_documentlist.cpp \
-		$(MOC_DIR)/moc_suspendmonitor.cpp \
-		$(MOC_DIR)/moc_appicons.cpp \
-		$(MOC_DIR)/moc_taskbar.cpp \
-		$(MOC_DIR)/moc_runningappbar.cpp \
-		$(MOC_DIR)/moc_applauncher.cpp \
-		$(MOC_DIR)/moc_inputmethods.cpp \
-		$(MOC_DIR)/moc_systray.cpp \
-		$(MOC_DIR)/moc_shutdownimpl.cpp \
-		$(MOC_DIR)/moc_launcher.cpp \
-		$(MOC_DIR)/moc_launcherview.cpp \
-		$(MOC_DIR)/moc_calibrate.cpp \
-		$(MOC_DIR)/moc_startmenu.cpp \
-		$(MOC_DIR)/moc_transferserver.cpp \
-		$(MOC_DIR)/moc_qcopbridge.cpp \
-		$(MOC_DIR)/moc_packageslave.cpp \
-		$(MOC_DIR)/moc_irserver.cpp \
-		$(MOC_DIR)/moc_firstuse.cpp \
-		$(MOC_DIR)/moc_syncdialog.cpp \
-		$(MOC_DIR)/moc_serverapp.cpp \
-		$(MOC_DIR)/moc_shutdown.cpp \
-		$(MOC_DIR)/serverinterface.moc \
-		$(MOC_DIR)/documentlist.moc \
-		$(MOC_DIR)/appicons.moc \
-		$(MOC_DIR)/taskbar.moc \
-		$(MOC_DIR)/serverapp.moc
-OBJMOC	=	$(OBJECTS_DIR)/moc_server.o \
-		$(OBJECTS_DIR)/moc_launchertab.o \
-		$(OBJECTS_DIR)/moc_documentlist.o \
-		$(OBJECTS_DIR)/moc_suspendmonitor.o \
-		$(OBJECTS_DIR)/moc_appicons.o \
-		$(OBJECTS_DIR)/moc_taskbar.o \
-		$(OBJECTS_DIR)/moc_runningappbar.o \
-		$(OBJECTS_DIR)/moc_applauncher.o \
-		$(OBJECTS_DIR)/moc_inputmethods.o \
-		$(OBJECTS_DIR)/moc_systray.o \
-		$(OBJECTS_DIR)/moc_shutdownimpl.o \
-		$(OBJECTS_DIR)/moc_launcher.o \
-		$(OBJECTS_DIR)/moc_launcherview.o \
-		$(OBJECTS_DIR)/moc_calibrate.o \
-		$(OBJECTS_DIR)/moc_startmenu.o \
-		$(OBJECTS_DIR)/moc_transferserver.o \
-		$(OBJECTS_DIR)/moc_qcopbridge.o \
-		$(OBJECTS_DIR)/moc_packageslave.o \
-		$(OBJECTS_DIR)/moc_irserver.o \
-		$(OBJECTS_DIR)/moc_firstuse.o \
-		$(OBJECTS_DIR)/moc_syncdialog.o \
-		$(OBJECTS_DIR)/moc_serverapp.o \
-		$(OBJECTS_DIR)/moc_shutdown.o
-
-
-####### Implicit rules
-
-.SUFFIXES: .cpp .cxx .cc .C .c
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-
-####### Build rules
-
-
-all: $(DESTDIR)$(TARGET)
-
-$(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
-	$(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-
-moc: $(SRCMOC)
-
-tmake:
-	tmake server.pro
-
-clean:
-	-rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS)
-	-rm -f *~ core
-	-rm -f allmoc.cpp
-
-####### Extension Modules
-
-listpromodules:
-	@echo 
-
-listallmodules:
-	@echo 
-
-listaddonpromodules:
-	@echo 
-
-listaddonentmodules:
-	@echo 
-
-
-REQUIRES=
-
-####### Sub-libraries
-
-
-###### Combined headers
-
-
-
-####### Compile
-
-$(OBJECTS_DIR)/server.o: server.cpp \
-		server.h \
-		serverapp.h \
-		shutdownimpl.h \
-		shutdown.h \
-		launcher.h \
-		launcherview.h \
-		launchertab.h \
-		serverinterface.h \
-		startmenu.h \
-		transferserver.h \
-		qcopbridge.h \
-		irserver.h \
-		packageslave.h \
-		$(QPEDIR)/src/settings/calibrate/calibrate.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/qrsync.h \
-		syncdialog.h \
-		applauncher.h \
-		suspendmonitor.h \
-		documentlist.h \
-		apps.h \
-		../applications/addressbook/addressbook.h \
-		../applications/datebook/datebook.h \
-		../applications/todo/mainwindow.h \
-		../libraries/qtopiacalc/calculator.h \
-		../applications/clock/clock.h \
-		../applications/helpbrowser/helpbrowser.h \
-		../applications/imageviewer/showimg.h \
-		../applications/mediaplayer/maindocumentwidgetstack.h \
-		../applications/textedit/textedit.h \
-		../games/fifteen/fifteen.h \
-		../games/mindbreaker/mindbreaker.h \
-		../games/minesweep/minesweep.h \
-		../games/qasteroids/toplevel.h \
-		../games/snake/interface.h \
-		../games/solitaire/canvascardwindow.h \
-		../settings/systemtime/settime.h \
-		../settings/appearance/appearance.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/server.o server.cpp
-
-$(OBJECTS_DIR)/serverinterface.o: serverinterface.cpp \
-		$(MOC_DIR)/serverinterface.moc \
-		serverinterface.h \
-		server.h \
-		documentlist.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/serverinterface.o serverinterface.cpp
-
-$(OBJECTS_DIR)/launchertab.o: launchertab.cpp \
-		launchertab.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/launchertab.o launchertab.cpp
-
-$(OBJECTS_DIR)/documentlist.o: documentlist.cpp \
-		$(MOC_DIR)/documentlist.moc \
-		documentlist.h \
-		serverinterface.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/documentlist.o documentlist.cpp
-
-$(OBJECTS_DIR)/suspendmonitor.o: suspendmonitor.cpp \
-		suspendmonitor.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/suspendmonitor.o suspendmonitor.cpp
-
-$(OBJECTS_DIR)/appicons.o: appicons.cpp \
-		$(MOC_DIR)/appicons.moc \
-		appicons.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/appicons.o appicons.cpp
-
-$(OBJECTS_DIR)/taskbar.o: taskbar.cpp \
-		$(MOC_DIR)/taskbar.moc \
-		startmenu.h \
-		inputmethods.h \
-		runningappbar.h \
-		systray.h \
-		wait.h \
-		appicons.h \
-		taskbar.h \
-		serverinterface.h \
-		server.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/taskbar.o taskbar.cpp
-
-$(OBJECTS_DIR)/runningappbar.o: runningappbar.cpp \
-		runningappbar.h \
-		serverinterface.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/runningappbar.o runningappbar.cpp
-
-$(OBJECTS_DIR)/applauncher.o: applauncher.cpp \
-		applauncher.h \
-		documentlist.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/applauncher.o applauncher.cpp
-
-$(OBJECTS_DIR)/stabmon.o: stabmon.cpp \
-		stabmon.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/stabmon.o stabmon.cpp
-
-$(OBJECTS_DIR)/inputmethods.o: inputmethods.cpp \
-		inputmethods.h \
-		../plugins/inputmethods/handwriting/handwritingimpl.h \
-		../plugins/inputmethods/keyboard/keyboardimpl.h \
-		../3rdparty/plugins/inputmethods/pickboard/pickboardimpl.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/inputmethods.o inputmethods.cpp
-
-$(OBJECTS_DIR)/systray.o: systray.cpp \
-		systray.h \
-		../plugins/applets/clockapplet/clockappletimpl.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/systray.o systray.cpp
-
-$(OBJECTS_DIR)/wait.o: wait.cpp \
-		wait.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/wait.o wait.cpp
-
-$(OBJECTS_DIR)/shutdownimpl.o: shutdownimpl.cpp \
-		shutdownimpl.h \
-		shutdown.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/shutdownimpl.o shutdownimpl.cpp
-
-$(OBJECTS_DIR)/launcher.o: launcher.cpp \
-		startmenu.h \
-		taskbar.h \
-		serverinterface.h \
-		launcherview.h \
-		launcher.h \
-		launchertab.h \
-		server.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/launcher.o launcher.cpp
-
-$(OBJECTS_DIR)/launcherview.o: launcherview.cpp \
-		launcherview.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/launcherview.o launcherview.cpp
-
-$(OBJECTS_DIR)/calibrate.o: $(QPEDIR)/src/settings/calibrate/calibrate.cpp \
-		$(QPEDIR)/src/settings/calibrate/calibrate.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/calibrate.o $(QPEDIR)/src/settings/calibrate/calibrate.cpp
-
-$(OBJECTS_DIR)/transferserver.o: transferserver.cpp \
-		transferserver.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/transferserver.o transferserver.cpp
-
-$(OBJECTS_DIR)/packageslave.o: packageslave.cpp \
-		packageslave.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/packageslave.o packageslave.cpp
-
-$(OBJECTS_DIR)/irserver.o: irserver.cpp \
-		irserver.h \
-		obexinterface.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/irserver.o irserver.cpp
-
-$(OBJECTS_DIR)/qcopbridge.o: qcopbridge.cpp \
-		qcopbridge.h \
-		transferserver.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/qcopbridge.o qcopbridge.cpp
-
-$(OBJECTS_DIR)/startmenu.o: startmenu.cpp \
-		startmenu.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/startmenu.o startmenu.cpp
-
-$(OBJECTS_DIR)/main.o: main.cpp \
-		server.h \
-		serverapp.h \
-		shutdownimpl.h \
-		shutdown.h \
-		taskbar.h \
-		serverinterface.h \
-		startmenu.h \
-		stabmon.h \
-		launcher.h \
-		launcherview.h \
-		launchertab.h \
-		firstuse.h \
-		$(QPEDIR)/src/settings/calibrate/../calibrate/calibrate.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/main.o main.cpp
-
-$(OBJECTS_DIR)/firstuse.o: firstuse.cpp \
-		firstuse.h \
-		inputmethods.h \
-		applauncher.h \
-		serverapp.h \
-		shutdownimpl.h \
-		shutdown.h \
-		../settings/calibrate/calibrate.h \
-		documentlist.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/firstuse.o firstuse.cpp
-
-$(OBJECTS_DIR)/base64.o: $(QPEDIR)/src/3rdparty/libraries/rsync/base64.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/base64.o $(QPEDIR)/src/3rdparty/libraries/rsync/base64.c
-
-$(OBJECTS_DIR)/buf.o: $(QPEDIR)/src/3rdparty/libraries/rsync/buf.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/buf.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/buf.o $(QPEDIR)/src/3rdparty/libraries/rsync/buf.c
-
-$(OBJECTS_DIR)/checksum.o: $(QPEDIR)/src/3rdparty/libraries/rsync/checksum.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/checksum.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/checksum.o $(QPEDIR)/src/3rdparty/libraries/rsync/checksum.c
-
-$(OBJECTS_DIR)/command.o: $(QPEDIR)/src/3rdparty/libraries/rsync/command.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/command.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/command.o $(QPEDIR)/src/3rdparty/libraries/rsync/command.c
-
-$(OBJECTS_DIR)/delta.o: $(QPEDIR)/src/3rdparty/libraries/rsync/delta.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/emit.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/stream.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/sumset.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/job.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/checksum.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/search.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/types.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/delta.o $(QPEDIR)/src/3rdparty/libraries/rsync/delta.c
-
-$(OBJECTS_DIR)/emit.o: $(QPEDIR)/src/3rdparty/libraries/rsync/emit.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/command.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/protocol.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/emit.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/prototab.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/netint.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/sumset.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/job.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/emit.o $(QPEDIR)/src/3rdparty/libraries/rsync/emit.c
-
-$(OBJECTS_DIR)/hex.o: $(QPEDIR)/src/3rdparty/libraries/rsync/hex.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/hex.o $(QPEDIR)/src/3rdparty/libraries/rsync/hex.c
-
-$(OBJECTS_DIR)/job.o: $(QPEDIR)/src/3rdparty/libraries/rsync/job.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/stream.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/sumset.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/job.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/job.o $(QPEDIR)/src/3rdparty/libraries/rsync/job.c
-
-$(OBJECTS_DIR)/mdfour.o: $(QPEDIR)/src/3rdparty/libraries/rsync/mdfour.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/types.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/mdfour.o $(QPEDIR)/src/3rdparty/libraries/rsync/mdfour.c
-
-$(OBJECTS_DIR)/mksum.o: $(QPEDIR)/src/3rdparty/libraries/rsync/mksum.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/stream.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/sumset.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/job.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/protocol.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/netint.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/checksum.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/mksum.o $(QPEDIR)/src/3rdparty/libraries/rsync/mksum.c
-
-$(OBJECTS_DIR)/msg.o: $(QPEDIR)/src/3rdparty/libraries/rsync/msg.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/msg.o $(QPEDIR)/src/3rdparty/libraries/rsync/msg.c
-
-$(OBJECTS_DIR)/netint.o: $(QPEDIR)/src/3rdparty/libraries/rsync/netint.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/job.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/netint.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/stream.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/netint.o $(QPEDIR)/src/3rdparty/libraries/rsync/netint.c
-
-$(OBJECTS_DIR)/patch.o: $(QPEDIR)/src/3rdparty/libraries/rsync/patch.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/protocol.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/netint.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/command.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/sumset.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/prototab.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/stream.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/job.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/patch.o $(QPEDIR)/src/3rdparty/libraries/rsync/patch.c
-
-$(OBJECTS_DIR)/prototab.o: $(QPEDIR)/src/3rdparty/libraries/rsync/prototab.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/protocol.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/command.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/prototab.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/prototab.o $(QPEDIR)/src/3rdparty/libraries/rsync/prototab.c
-
-$(OBJECTS_DIR)/readsums.o: $(QPEDIR)/src/3rdparty/libraries/rsync/readsums.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/sumset.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/job.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/netint.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/protocol.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/stream.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/readsums.o $(QPEDIR)/src/3rdparty/libraries/rsync/readsums.c
-
-$(OBJECTS_DIR)/scoop.o: $(QPEDIR)/src/3rdparty/libraries/rsync/scoop.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/job.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/stream.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/scoop.o $(QPEDIR)/src/3rdparty/libraries/rsync/scoop.c
-
-$(OBJECTS_DIR)/search.o: $(QPEDIR)/src/3rdparty/libraries/rsync/search.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/sumset.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/search.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/checksum.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/search.o $(QPEDIR)/src/3rdparty/libraries/rsync/search.c
-
-$(OBJECTS_DIR)/stats.o: $(QPEDIR)/src/3rdparty/libraries/rsync/stats.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/stats.o $(QPEDIR)/src/3rdparty/libraries/rsync/stats.c
-
-$(OBJECTS_DIR)/stream.o: $(QPEDIR)/src/3rdparty/libraries/rsync/stream.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/stream.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/stream.o $(QPEDIR)/src/3rdparty/libraries/rsync/stream.c
-
-$(OBJECTS_DIR)/sumset.o: $(QPEDIR)/src/3rdparty/libraries/rsync/sumset.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/sumset.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/sumset.o $(QPEDIR)/src/3rdparty/libraries/rsync/sumset.c
-
-$(OBJECTS_DIR)/trace.o: $(QPEDIR)/src/3rdparty/libraries/rsync/trace.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/trace.o $(QPEDIR)/src/3rdparty/libraries/rsync/trace.c
-
-$(OBJECTS_DIR)/tube.o: $(QPEDIR)/src/3rdparty/libraries/rsync/tube.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/job.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/stream.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/tube.o $(QPEDIR)/src/3rdparty/libraries/rsync/tube.c
-
-$(OBJECTS_DIR)/util.o: $(QPEDIR)/src/3rdparty/libraries/rsync/util.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/util.o $(QPEDIR)/src/3rdparty/libraries/rsync/util.c
-
-$(OBJECTS_DIR)/version.o: $(QPEDIR)/src/3rdparty/libraries/rsync/version.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/version.o $(QPEDIR)/src/3rdparty/libraries/rsync/version.c
-
-$(OBJECTS_DIR)/whole.o: $(QPEDIR)/src/3rdparty/libraries/rsync/whole.c \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/config_linux.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/fileutil.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/sumset.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/job.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/buf.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/whole.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/util.h
-	$(CC) -c $(CFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/whole.o $(QPEDIR)/src/3rdparty/libraries/rsync/whole.c
-
-$(OBJECTS_DIR)/qrsync.o: $(QPEDIR)/src/3rdparty/libraries/rsync/qrsync.cpp \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/qrsync.h \
-		$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/qrsync.o $(QPEDIR)/src/3rdparty/libraries/rsync/qrsync.cpp
-
-$(OBJECTS_DIR)/syncdialog.o: syncdialog.cpp \
-		syncdialog.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/syncdialog.o syncdialog.cpp
-
-$(OBJECTS_DIR)/serverapp.o: serverapp.cpp \
-		$(MOC_DIR)/serverapp.moc \
-		serverapp.h \
-		shutdownimpl.h \
-		shutdown.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/serverapp.o serverapp.cpp
-
-shutdown.h: shutdown.ui
-	$(UIC) shutdown.ui -o $(INTERFACE_DECL_PATH)/shutdown.h
-
-shutdown.cpp: shutdown.ui
-	$(UIC) shutdown.ui -i shutdown.h -o shutdown.cpp
-
-$(OBJECTS_DIR)/shutdown.o: shutdown.cpp \
-		shutdown.h \
-		shutdown.ui
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/shutdown.o shutdown.cpp
-
-$(OBJECTS_DIR)/moc_server.o: $(MOC_DIR)/moc_server.cpp \
-		server.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_server.o $(MOC_DIR)/moc_server.cpp
-
-$(OBJECTS_DIR)/moc_launchertab.o: $(MOC_DIR)/moc_launchertab.cpp \
-		launchertab.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_launchertab.o $(MOC_DIR)/moc_launchertab.cpp
-
-$(OBJECTS_DIR)/moc_documentlist.o: $(MOC_DIR)/moc_documentlist.cpp \
-		documentlist.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_documentlist.o $(MOC_DIR)/moc_documentlist.cpp
-
-$(OBJECTS_DIR)/moc_suspendmonitor.o: $(MOC_DIR)/moc_suspendmonitor.cpp \
-		suspendmonitor.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_suspendmonitor.o $(MOC_DIR)/moc_suspendmonitor.cpp
-
-$(OBJECTS_DIR)/moc_appicons.o: $(MOC_DIR)/moc_appicons.cpp \
-		appicons.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_appicons.o $(MOC_DIR)/moc_appicons.cpp
-
-$(OBJECTS_DIR)/moc_taskbar.o: $(MOC_DIR)/moc_taskbar.cpp \
-		taskbar.h \
-		serverinterface.h \
-		startmenu.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_taskbar.o $(MOC_DIR)/moc_taskbar.cpp
-
-$(OBJECTS_DIR)/moc_runningappbar.o: $(MOC_DIR)/moc_runningappbar.cpp \
-		runningappbar.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_runningappbar.o $(MOC_DIR)/moc_runningappbar.cpp
-
-$(OBJECTS_DIR)/moc_applauncher.o: $(MOC_DIR)/moc_applauncher.cpp \
-		applauncher.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_applauncher.o $(MOC_DIR)/moc_applauncher.cpp
-
-$(OBJECTS_DIR)/moc_inputmethods.o: $(MOC_DIR)/moc_inputmethods.cpp \
-		inputmethods.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_inputmethods.o $(MOC_DIR)/moc_inputmethods.cpp
-
-$(OBJECTS_DIR)/moc_systray.o: $(MOC_DIR)/moc_systray.cpp \
-		systray.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_systray.o $(MOC_DIR)/moc_systray.cpp
-
-$(OBJECTS_DIR)/moc_shutdownimpl.o: $(MOC_DIR)/moc_shutdownimpl.cpp \
-		shutdownimpl.h \
-		shutdown.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_shutdownimpl.o $(MOC_DIR)/moc_shutdownimpl.cpp
-
-$(OBJECTS_DIR)/moc_launcher.o: $(MOC_DIR)/moc_launcher.cpp \
-		launcher.h \
-		launcherview.h \
-		launchertab.h \
-		serverinterface.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_launcher.o $(MOC_DIR)/moc_launcher.cpp
-
-$(OBJECTS_DIR)/moc_launcherview.o: $(MOC_DIR)/moc_launcherview.cpp \
-		launcherview.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_launcherview.o $(MOC_DIR)/moc_launcherview.cpp
-
-$(OBJECTS_DIR)/moc_calibrate.o: $(MOC_DIR)/moc_calibrate.cpp \
-		$(QPEDIR)/src/settings/calibrate/calibrate.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_calibrate.o $(MOC_DIR)/moc_calibrate.cpp
-
-$(OBJECTS_DIR)/moc_startmenu.o: $(MOC_DIR)/moc_startmenu.cpp \
-		startmenu.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_startmenu.o $(MOC_DIR)/moc_startmenu.cpp
-
-$(OBJECTS_DIR)/moc_transferserver.o: $(MOC_DIR)/moc_transferserver.cpp \
-		transferserver.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_transferserver.o $(MOC_DIR)/moc_transferserver.cpp
-
-$(OBJECTS_DIR)/moc_qcopbridge.o: $(MOC_DIR)/moc_qcopbridge.cpp \
-		qcopbridge.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_qcopbridge.o $(MOC_DIR)/moc_qcopbridge.cpp
-
-$(OBJECTS_DIR)/moc_packageslave.o: $(MOC_DIR)/moc_packageslave.cpp \
-		packageslave.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_packageslave.o $(MOC_DIR)/moc_packageslave.cpp
-
-$(OBJECTS_DIR)/moc_irserver.o: $(MOC_DIR)/moc_irserver.cpp \
-		irserver.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_irserver.o $(MOC_DIR)/moc_irserver.cpp
-
-$(OBJECTS_DIR)/moc_firstuse.o: $(MOC_DIR)/moc_firstuse.cpp \
-		firstuse.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_firstuse.o $(MOC_DIR)/moc_firstuse.cpp
-
-$(OBJECTS_DIR)/moc_syncdialog.o: $(MOC_DIR)/moc_syncdialog.cpp \
-		syncdialog.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_syncdialog.o $(MOC_DIR)/moc_syncdialog.cpp
-
-$(OBJECTS_DIR)/moc_serverapp.o: $(MOC_DIR)/moc_serverapp.cpp \
-		serverapp.h \
-		shutdownimpl.h \
-		shutdown.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_serverapp.o $(MOC_DIR)/moc_serverapp.cpp
-
-$(OBJECTS_DIR)/moc_shutdown.o: $(MOC_DIR)/moc_shutdown.cpp \
-		shutdown.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJECTS_DIR)/moc_shutdown.o $(MOC_DIR)/moc_shutdown.cpp
-
-$(MOC_DIR)/moc_server.cpp: server.h
-	$(MOC) server.h -o $(MOC_DIR)/moc_server.cpp
-
-$(MOC_DIR)/moc_launchertab.cpp: launchertab.h
-	$(MOC) launchertab.h -o $(MOC_DIR)/moc_launchertab.cpp
-
-$(MOC_DIR)/moc_documentlist.cpp: documentlist.h
-	$(MOC) documentlist.h -o $(MOC_DIR)/moc_documentlist.cpp
-
-$(MOC_DIR)/moc_suspendmonitor.cpp: suspendmonitor.h
-	$(MOC) suspendmonitor.h -o $(MOC_DIR)/moc_suspendmonitor.cpp
-
-$(MOC_DIR)/moc_appicons.cpp: appicons.h
-	$(MOC) appicons.h -o $(MOC_DIR)/moc_appicons.cpp
-
-$(MOC_DIR)/moc_taskbar.cpp: taskbar.h
-	$(MOC) taskbar.h -o $(MOC_DIR)/moc_taskbar.cpp
-
-$(MOC_DIR)/moc_runningappbar.cpp: runningappbar.h
-	$(MOC) runningappbar.h -o $(MOC_DIR)/moc_runningappbar.cpp
-
-$(MOC_DIR)/moc_applauncher.cpp: applauncher.h
-	$(MOC) applauncher.h -o $(MOC_DIR)/moc_applauncher.cpp
-
-$(MOC_DIR)/moc_inputmethods.cpp: inputmethods.h
-	$(MOC) inputmethods.h -o $(MOC_DIR)/moc_inputmethods.cpp
-
-$(MOC_DIR)/moc_systray.cpp: systray.h
-	$(MOC) systray.h -o $(MOC_DIR)/moc_systray.cpp
-
-$(MOC_DIR)/moc_shutdownimpl.cpp: shutdownimpl.h
-	$(MOC) shutdownimpl.h -o $(MOC_DIR)/moc_shutdownimpl.cpp
-
-$(MOC_DIR)/moc_launcher.cpp: launcher.h
-	$(MOC) launcher.h -o $(MOC_DIR)/moc_launcher.cpp
-
-$(MOC_DIR)/moc_launcherview.cpp: launcherview.h
-	$(MOC) launcherview.h -o $(MOC_DIR)/moc_launcherview.cpp
-
-$(MOC_DIR)/moc_calibrate.cpp: $(QPEDIR)/src/settings/calibrate/calibrate.h
-	$(MOC) $(QPEDIR)/src/settings/calibrate/calibrate.h -o $(MOC_DIR)/moc_calibrate.cpp
-
-$(MOC_DIR)/moc_startmenu.cpp: startmenu.h
-	$(MOC) startmenu.h -o $(MOC_DIR)/moc_startmenu.cpp
-
-$(MOC_DIR)/moc_transferserver.cpp: transferserver.h
-	$(MOC) transferserver.h -o $(MOC_DIR)/moc_transferserver.cpp
-
-$(MOC_DIR)/moc_qcopbridge.cpp: qcopbridge.h
-	$(MOC) qcopbridge.h -o $(MOC_DIR)/moc_qcopbridge.cpp
-
-$(MOC_DIR)/moc_packageslave.cpp: packageslave.h
-	$(MOC) packageslave.h -o $(MOC_DIR)/moc_packageslave.cpp
-
-$(MOC_DIR)/moc_irserver.cpp: irserver.h
-	$(MOC) irserver.h -o $(MOC_DIR)/moc_irserver.cpp
-
-$(MOC_DIR)/moc_firstuse.cpp: firstuse.h
-	$(MOC) firstuse.h -o $(MOC_DIR)/moc_firstuse.cpp
-
-$(MOC_DIR)/moc_syncdialog.cpp: syncdialog.h
-	$(MOC) syncdialog.h -o $(MOC_DIR)/moc_syncdialog.cpp
-
-$(MOC_DIR)/moc_serverapp.cpp: serverapp.h
-	$(MOC) serverapp.h -o $(MOC_DIR)/moc_serverapp.cpp
-
-$(MOC_DIR)/serverinterface.moc: serverinterface.cpp
-	$(MOC) serverinterface.cpp -o $(MOC_DIR)/serverinterface.moc
-
-$(MOC_DIR)/documentlist.moc: documentlist.cpp
-	$(MOC) documentlist.cpp -o $(MOC_DIR)/documentlist.moc
-
-$(MOC_DIR)/appicons.moc: appicons.cpp
-	$(MOC) appicons.cpp -o $(MOC_DIR)/appicons.moc
-
-$(MOC_DIR)/taskbar.moc: taskbar.cpp
-	$(MOC) taskbar.cpp -o $(MOC_DIR)/taskbar.moc
-
-$(MOC_DIR)/serverapp.moc: serverapp.cpp
-	$(MOC) serverapp.cpp -o $(MOC_DIR)/serverapp.moc
-
-$(MOC_DIR)/moc_shutdown.cpp: shutdown.h
-	$(MOC) shutdown.h -o $(MOC_DIR)/moc_shutdown.cpp
-
-
-
-lupdate-check:
-	@sed -e '/$$$$QTOPIA1DIR[^ ]*/ d' \
-	    -e '/$$(.*/ d' \
-	    -e 's/^static:.*//' \
-	    <server.pro >t$$$$.pro && \
-	rm -rf t$$$$&& \
-	mkdir t$$$$ && \
-	cp -a *.ts t$$$$ && \
-	chmod +w *.ts && \
-	lupdate  t$$$$.pro && \
-	rm t$$$$.pro && \
-	for i in *.ts; \
-	do \
-	    if cmp -s $$i t$$$$/$$i; \
-	    then \
-		true; \
-	    else \
-		echo out-of-date $$i; \
-	    fi; \
-	    rm $$i; \
-	    mv t$$$$/$$i $$i; \
-	done && \
-	rmdir t$$$$
-
-lupdate:
-	sed -e '/$$$$QTOPIA1DIR[^ ]*/ d' \
-	    -e '/$$(.*/ d' \
-	    -e 's/^static:.*//' \
-	    <server.pro >t$$$$.pro && \
-	lupdate  t$$$$.pro && \
-	rm t$$$$.pro
-
-lrelease:
-	lrelease server.pro
-	$(QPEDIR)/bin/qtopia-linstall server.pro
-
-
-ipkg: $(DESTDIR)$(TARGET) # among other things...
-	CTL="$(CONTROL)"; for ctrl in $$CTL; do cd $(QPEDIR)/ipkg; ../bin/mkipks -platform generic  $(QPEDIR)/src/$$ctrl ; done
-
-package: ipkg
-	cd $(QPEDIR)/ipkg; 	../bin/mkPackages
-
-Makefile: server.pro
-	cd $(QPEDIR)/src; 	./configure  -debug -make server
diff --git a/core/launcher/background.cpp b/core/launcher/background.cpp
deleted file mode 100644
index 04ebc37..0000000
--- a/core/launcher/background.cpp
+++ b/dev/null
@@ -1,41 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of 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 "background.h"
-#include "desktop.h"
-
-#include <qpe/resource.h>
-
-#include <qpainter.h>
-
-
-Background::Background( Desktop *d ) :
-    QWidget( d, 0, WStyle_Tool | WStyle_Customize )
-{
-/*
-    if ( QPixmap::defaultDepth() < 12 ) {
-	setBackgroundColor(QColor(0x20, 0xb0, 0x50));
-    } else {
-	setBackgroundPixmap( Resource::loadPixmap( "bg" ) );
-    }
-*/
-    setBackgroundMode( PaletteButton );
-}
-
diff --git a/core/launcher/background.h b/core/launcher/background.h
deleted file mode 100644
index 0885747..0000000
--- a/core/launcher/background.h
+++ b/dev/null
@@ -1,40 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of 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.
-**
-**********************************************************************/
-
-#ifndef __BACKGROUND_H__
-#define __BACKGROUND_H__
-
-
-#include <qwidget.h>
-
-
-class Desktop;
-
-
-class Background : public QWidget {
-    Q_OBJECT
-public:
-    Background( Desktop *d );
-};
-
-
-#endif // __BACKGROUND_H__
-
-
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
deleted file mode 100644
index 067a167..0000000
--- a/core/launcher/desktop.cpp
+++ b/dev/null
@@ -1,878 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of 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 <syslog.h>
-
-#include "desktop.h"
-#include "info.h"
-#include "launcher.h"
-#include "qcopbridge.h"
-#include "shutdownimpl.h"
-#include "startmenu.h"
-#include "taskbar.h"
-#include "transferserver.h"
-#include "irserver.h"
-#include "packageslave.h"
-#include "screensaver.h"
-
-#include <qpe/applnk.h>
-#include <qpe/mimetype.h>
-#include <qpe/password.h>
-#include <qpe/config.h>
-#include <qpe/power.h>
-#include <qpe/timeconversion.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qpe/network.h>
-#include <qpe/global.h>
-
-#if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ ) || defined(QT_QWS_RAMSES)
-#include <qpe/custom.h>
-#endif
-
-#include <opie/odevice.h>
-
-#include <qgfx_qws.h>
-#include <qmainwindow.h>
-#include <qmessagebox.h>
-#include <qtimer.h>
-#include <qwindowsystem_qws.h>
-
-#include <qvaluelist.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-
-using namespace Opie;
-
-class QCopKeyRegister
-{
-public:
-	QCopKeyRegister() : keyCode( 0 )
-	{ }
-	QCopKeyRegister( int k, const QCString &c, const QCString &m )
-			: keyCode( k ), channel( c ), message( m )
-	{ }
-
-	int getKeyCode() const
-	{
-		return keyCode;
-	}
-	QCString getChannel() const
-	{
-		return channel;
-	}
-	QCString getMessage() const
-	{
-		return message;
-	}
-
-private:
-	int keyCode;
-	QCString channel, message;
-};
-
-typedef QValueList<QCopKeyRegister> KeyRegisterList;
-KeyRegisterList keyRegisterList;
-
-static Desktop* qpedesktop = 0;
-static int loggedin = 0;
-static void login( bool at_poweron )
-{
-	if ( !loggedin ) {
-		Global::terminateBuiltin( "calibrate" );
-		Password::authenticate( at_poweron );
-		loggedin = 1;
-		QCopEnvelope e( "QPE/Desktop", "unlocked()" );
-	}
-}
-
-bool Desktop::screenLocked()
-{
-	return loggedin == 0;
-}
-
-/*
-  Priority is number of alerts that are needed to pop up
-  alert.
- */
-class DesktopPowerAlerter : public QMessageBox
-{
-public:
-	DesktopPowerAlerter( QWidget *parent, const char *name = 0 )
-			: QMessageBox( tr( "Battery Status" ), "Low Battery",
-			               QMessageBox::Critical,
-			               QMessageBox::Ok | QMessageBox::Default,
-			               QMessageBox::NoButton, QMessageBox::NoButton,
-			               parent, name, FALSE )
-	{
-		currentPriority = INT_MAX;
-		alertCount = 0;
-	}
-
-	void alert( const QString &text, int priority );
-	void hideEvent( QHideEvent * );
-private:
-	int currentPriority;
-	int alertCount;
-};
-
-void DesktopPowerAlerter::alert( const QString &text, int priority )
-{
-	alertCount++;
-	if ( alertCount < priority )
-		return ;
-	if ( priority > currentPriority )
-		return ;
-	currentPriority = priority;
-	setText( text );
-	show();
-}
-
-
-void DesktopPowerAlerter::hideEvent( QHideEvent *e )
-{
-	QMessageBox::hideEvent( e );
-	alertCount = 0;
-	currentPriority = INT_MAX;
-}
-
-
-void DesktopApplication::switchLCD ( bool on )
-{
-	if ( qApp ) {
-		DesktopApplication *dapp = (DesktopApplication *) qApp;
-
-		if ( dapp-> m_screensaver ) {
-			if ( on ) {
-				dapp-> m_screensaver-> setDisplayState ( true );
-				dapp-> m_screensaver-> setBacklight ( -3 );
-			}
-			else {
-				dapp-> m_screensaver-> setDisplayState ( false );
-			}
-		}
-	}
-}
-
-
-DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType )
-		: QPEApplication( argc, argv, appType )
-{
-	m_ps = new PowerStatus;
-	m_ps_last = new PowerStatus;
-	pa = new DesktopPowerAlerter( 0 );
-
-	m_apm_timer = new QTimer ( this );
-	connect ( m_apm_timer, SIGNAL( timeout ( )), this, SLOT( apmTimeout ( )));	
-	reloadPowerWarnSettings ( );
-
-	m_last_button = 0;
-	m_button_timer = new QTimer ( );
-	connect ( m_button_timer, SIGNAL( timeout ( )), this, SLOT( sendHeldAction ( )));
-	
-	channel = new QCopChannel( "QPE/System", this );
-	connect( channel, SIGNAL( received( const QCString&, const QByteArray& ) ),
-	         this, SLOT( systemMessage( const QCString&, const QByteArray& ) ) );
-
-	channel = new QCopChannel( "QPE/Launcher", this );
-	connect( channel, SIGNAL( received( const QCString&, const QByteArray& ) ),
-	         this, SLOT( launcherMessage( const QCString&, const QByteArray& ) ) );
-
-	m_screensaver = new OpieScreenSaver ( );
-	m_screensaver-> setInterval ( -1 );
-	QWSServer::setScreenSaver( m_screensaver );
-
-	rereadVolumes();
-	connect( qApp, SIGNAL( volumeChanged( bool ) ), this, SLOT( rereadVolumes() ) );
-	
-	apmTimeout ( );
-	
-	grabKeyboard ( );
-}
-
-
-DesktopApplication::~DesktopApplication()
-{
-	ungrabKeyboard ( );
-
-	delete m_ps;
-	delete m_ps_last;
-	delete pa;
-}
-
-void DesktopApplication::apmTimeout()
-{
-	qpedesktop-> checkMemory ( ); // in case no events are being generated
-
-	*m_ps_last = *m_ps;
-	*m_ps = PowerStatusManager::readStatus();
-
-	if ( m_ps-> acStatus ( ) != m_ps_last-> acStatus ( ))
-		m_screensaver-> powerStatusChanged ( *m_ps );
-
-	if ( m_ps-> acStatus ( ) != PowerStatus::Online ) {
-		int bat = m_ps-> batteryPercentRemaining ( );
-
-		if ( bat < m_ps_last-> batteryPercentRemaining ( )) {
-			if ( bat <= m_powerCritical )
-				pa->alert( tr( "Battery level is critical!\nKeep power off until power restored!" ), 1 );
-			else if ( bat <= m_powerVeryLow )
-				pa->alert( tr( "Battery is running very low." ), 2 );
-		}
-		if ( m_ps-> backupBatteryStatus ( ) == PowerStatus::VeryLow )
-			pa->alert( tr( "The Back-up battery is very low.\nPlease charge the back-up battery." ), 2 );
-	}
-}
-
-
-void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & data )
-{
-	QDataStream stream ( data, IO_ReadOnly );
-
-	if ( msg == "setScreenSaverInterval(int)" ) {
-		int time;
-		stream >> time;
-		m_screensaver-> setInterval( time );
-	}
-	else if ( msg == "setScreenSaverIntervals(int,int,int)" ) {
-		int t1, t2, t3;
-		stream >> t1 >> t2 >> t3;
-		m_screensaver-> setIntervals( t1, t2, t3 );
-	}
-	else if ( msg == "setBacklight(int)" ) {
-		int bright;
-		stream >> bright;
-		m_screensaver-> setBacklight( bright );
-	}
-	else if ( msg == "setScreenSaverMode(int)" ) {
-		int mode;
-		stream >> mode;
-		m_screensaver-> setMode ( mode );
-	}
-	else if ( msg == "reloadPowerWarnSettings()" ) {
-		reloadPowerWarnSettings();
-	}
-	else if ( msg == "setDisplayState(int)" ) {
-		int state;
-		stream >> state;
-		m_screensaver-> setDisplayState ( state != 0 );
-	}
-	else if ( msg == "suspend()" ) {
-		emit power();
-	}
-	else if ( msg == "sendBusinessCard()" ) {
-		QString card = ::getenv ( "HOME" );
-		card += "/Applications/addressbook/businesscard.vcf";
-
-		if ( QFile::exists( card ) ) {
-			QCopEnvelope e ( "QPE/Obex", "send(QString,QString,QString)" );
-			QString mimetype = "text/x-vCard";
-			e << tr( "business card" ) << card << mimetype;
-		}
-	}
-}
-
-void DesktopApplication::reloadPowerWarnSettings ( )
-{
-	Config cfg ( "apm" );
-	cfg. setGroup ( "Warnings" );
-
-	int iv = cfg. readNumEntry ( "checkinterval", 10000 );
-
-	m_apm_timer-> stop ( );	
-	if ( iv )
-		m_apm_timer-> start ( iv );
-		
-	m_powerVeryLow  = cfg. readNumEntry ( "powerverylow", 10 );
-	m_powerCritical = cfg. readNumEntry ( "powervcritical", 5 );
-}
-
-
-enum MemState { Unknown, VeryLow, Low, Normal } memstate = Unknown;
-
-
-void DesktopApplication::launcherMessage( const QCString & msg, const QByteArray & data )
-{
-	QDataStream stream ( data, IO_ReadOnly );
-
-	if ( msg == "deviceButton(int,int,int)" ) {
-		int keycode, press, autoRepeat;
-		stream >> keycode >> press >> autoRepeat;
-		
-		const ODeviceButton *db = ODevice::inst ( )-> buttonForKeycode ( keycode );
-		
-		if ( db )
-	    	checkButtonAction ( db, keycode, press, autoRepeat );
-	}
-	else if ( msg == "keyRegister(int,QCString,QCString)" ) {
-		int k;
-		QCString c, m;
-		stream >> k >> c >> m;
-
-		keyRegisterList.append ( QCopKeyRegister ( k, c, m ));
-	}
-}
-
-void DesktopApplication::sendHeldAction ( )
-{
-	if ( m_last_button ) {
-		m_last_button-> heldAction ( ). send ( );
-		m_last_button = 0;
-	}
-}
-
-
-
-bool DesktopApplication::checkButtonAction ( const ODeviceButton *db, int /*keycode*/, bool press, bool autoRepeat )
-{		
-	if ( db ) {
-		if ( !press && !autoRepeat && m_button_timer-> isActive ( )) {
-			m_button_timer-> stop ( );
-			
-			if (!db-> pressedAction ( ). channel ( ) .isEmpty())
-			{
-
-				if ( db-> pressedAction ( ). channel ( )!="ignore") {
-
-					db-> pressedAction ( ). send ( );
-				}
-				else 
-				   return false;
-			}
-		}
-		else if ( press && !autoRepeat ) {
-			m_button_timer-> stop ( );
-			if (!db-> pressedAction ( ). channel ( ) .isEmpty())
-			{
-			
-				if ( db-> heldAction ( ). channel ( )!="ignore") {
-					m_last_button = db;
-					m_button_timer-> start ( ODevice::inst ( )-> buttonHoldTime ( ), true );
-				}
-				else return false;
-			}
-		}
-	}
-	return true;
-}
-
-bool DesktopApplication::eventFilter ( QObject *o, QEvent *e )
-{
-
-	if ( e-> type ( ) == QEvent::KeyPress || e-> type ( ) == QEvent::KeyRelease ) {
-		QKeyEvent *ke = (QKeyEvent *) e;
-	
-		const ODeviceButton *db = ODevice::inst ( )-> buttonForKeycode ( ke-> key ( ));
-        
-		if ( db ) {
-			if (checkButtonAction ( db, ke-> key ( ), e-> type ( ) == QEvent::KeyPress, ke-> isAutoRepeat ( )))
-				return true;		//checkButtonAction retrune false if events should be routed through
-		}
-	}
-	return QPEApplication::eventFilter ( o, e );
-}
-
-#ifdef Q_WS_QWS
-
-bool DesktopApplication::qwsEventFilter( QWSEvent *e )
-{
-	qpedesktop->checkMemory();
-
-	if ( e->type == QWSEvent::Key ) {
-		QWSKeyEvent * ke = (QWSKeyEvent *) e;
-		ushort keycode = ke-> simpleData. keycode;
-
-		if ( !loggedin && keycode != Key_F34 )
-			return true;
-			
-		bool press = ke-> simpleData. is_press;
-		bool autoRepeat = ke-> simpleData. is_auto_repeat;
-
-		if ( !keyboardGrabbed ( )) {
-			// app that registers key/message to be sent back to the app, when it doesn't have focus,
-			// when user presses key, unless keyboard has been requested from app.
-			// will not send multiple repeats if user holds key
-			// i.e. one shot
-		 
-			if ( keycode != 0 && press && !autoRepeat ) {
-				for ( KeyRegisterList::Iterator it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it ) {
-					if (( *it ). getKeyCode ( ) == keycode ) {
-						QCopEnvelope (( *it ). getChannel ( ), ( *it ). getMessage ( ));
-						return true;
-					}
-				}
-			}
-		}
-
-		if ( keycode == HardKey_Suspend ) {
-			if ( press )
-				emit power ( );
-			return true;
-		}
-		else if ( keycode == HardKey_Backlight ) {
-			if ( press )
-				emit backlight ( );
-			return true;
-		}
-		else if ( keycode == Key_F32 ) {
-			if ( press )
-				QCopEnvelope e( "QPE/Desktop", "startSync()" );
-			return true;
-		}
-		else if ( keycode == Key_F31 && !ke-> simpleData. modifiers ) { // Symbol Key -> show Unicode IM
-			if ( press )
-				emit symbol ( );
-			return true;
-		}
-		else if ( keycode == Key_NumLock ) {
-			if ( press )
-				emit numLockStateToggle ( );
-		}
-		else if ( keycode == Key_CapsLock ) {
-			if ( press )
-				emit capsLockStateToggle();
-		}
-		if (( press && !autoRepeat ) || ( !press && autoRepeat )) {
-			if ( m_keyclick_sound )
-				ODevice::inst ( )-> keySound ( );
-		}
-	}
-	else if ( e-> type == QWSEvent::Mouse ) {
-		QWSMouseEvent * me = ( QWSMouseEvent * ) e;
-		static bool up = true;
-
-		if ( me-> simpleData. state & LeftButton ) {
-			if ( up ) {
-				up = false;
-				if ( m_screentap_sound )
-					ODevice::inst ( ) -> touchSound ( );
-			}
-		}
-		else {
-			up = true;
-		}
-	}
-
-	return QPEApplication::qwsEventFilter ( e );
-}
-#endif
-
-
-
-#if defined(QPE_HAVE_MEMALERTER)
-QPE_MEMALERTER_IMPL
-#endif
-
-//===========================================================================
-
-Desktop::Desktop() :
-		QWidget( 0, 0, WStyle_Tool | WStyle_Customize ),
-		qcopBridge( 0 ),
-		transferServer( 0 ),
-		packageSlave( 0 )
-{
-	qpedesktop = this;
-
-	//    bg = new Info( this );
-	tb = new TaskBar;
-
-	launcher = new Launcher( 0, 0, WStyle_Customize | QWidget::WGroupLeader );
-
-	connect( launcher, SIGNAL( busy() ), tb, SLOT( startWait() ) );
-	connect( launcher, SIGNAL( notBusy( const QString& ) ), tb, SLOT( stopWait( const QString& ) ) );
-
-	int displayw = qApp->desktop() ->width();
-	int displayh = qApp->desktop() ->height();
-
-
-	QSize sz = tb->sizeHint();
-
-	setGeometry( 0, displayh - sz.height(), displayw, sz.height() );
-	layout();
-
-	tb->show();
-	launcher->showMaximized();
-	launcher->show();
-	launcher->raise();
-#if defined(QPE_HAVE_MEMALERTER)
-
-	initMemalerter();
-#endif
-	// start services
-	startTransferServer();
-	( void ) new IrServer( this );
-
-	packageSlave = new PackageSlave( this );
-
-	qApp->installEventFilter( this );
-	qApp->desktop()->installEventFilter( this );
-
-	qApp-> setMainWidget ( launcher );
-}
-
-void Desktop::show()
-{
-	login( TRUE );
-	QWidget::show();
-}
-
-Desktop::~Desktop()
-{
-	delete launcher;
-	delete tb;
-	delete qcopBridge;
-	delete transferServer;
-}
-
-bool Desktop::recoverMemory()
-{
-	return tb->recoverMemory();
-}
-
-void Desktop::checkMemory()
-{
-#if defined(QPE_HAVE_MEMALERTER)
-	static bool ignoreNormal = FALSE;
-	static bool existingMessage = FALSE;
-
-	if ( existingMessage )
-		return ; // don't show a second message while still on first
-
-	existingMessage = TRUE;
-	switch ( memstate ) {
-		case Unknown:
-			break;
-		case Low:
-			memstate = Unknown;
-			if ( recoverMemory() )
-				ignoreNormal = TRUE;
-			else
-				QMessageBox::warning( 0 , "Memory Status",
-				                      "The memory smacks of shortage. \n"
-				                      "Please save data. " );
-			break;
-		case Normal:
-			memstate = Unknown;
-			if ( ignoreNormal )
-				ignoreNormal = FALSE;
-			//       else
-			//         QMessageBox::information ( 0 , "Memory Status",
-			//                                    "There is enough memory again." );
-			break;
-		case VeryLow:
-			memstate = Unknown;
-			QMessageBox::critical( 0 , "Memory Status",
-			                       "The memory is very low. \n"
-			                       "Please end this application \n"
-			                       "immediately." );
-			recoverMemory();
-	}
-	existingMessage = FALSE;
-#endif
-}
-
-static bool isVisibleWindow( int wid )
-{
-#ifdef QWS
-	const QList<QWSWindow> &list = qwsServer->clientWindows();
-	QWSWindow* w;
-	for ( QListIterator<QWSWindow> it( list ); ( w = it.current() ); ++it ) {
-		if ( w->winId() == wid )
-			return !w->isFullyObscured();
-	}
-#endif
-	return FALSE;
-}
-
-static bool hasVisibleWindow( const QString& clientname )
-{
-#ifdef QWS
-	const QList<QWSWindow> &list = qwsServer->clientWindows();
-	QWSWindow* w;
-	for ( QListIterator<QWSWindow> it( list ); ( w = it.current() ); ++it ) {
-		if ( w->client() ->identity() == clientname && !w->isFullyObscured() )
-			return TRUE;
-	}
-#endif
-	return FALSE;
-}
-
-
-void Desktop::executeOrModify( const QString& appLnkFile )
-{
-	AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile );
-	if ( lnk.isValid() ) {
-		QCString app = lnk.exec().utf8();
-		Global::terminateBuiltin( "calibrate" );
-		if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) {
-			//  MRUList::addTask( &lnk );
-			if ( hasVisibleWindow( app ) )
-				QCopChannel::send( "QPE/Application/" + app, "nextView()" );
-			else
-				QCopChannel::send( "QPE/Application/" + app, "raise()" );
-		}
-		else {
-			lnk.execute();
-		}
-	}
-}
-
-// autoStarts apps on resume and start
-void Desktop::execAutoStart()
-{
-	QString appName;
-	int delay;
-	QDateTime now = QDateTime::currentDateTime();
-	Config cfg( "autostart" );
-	cfg.setGroup( "AutoStart" );
-	appName = cfg.readEntry( "Apps", "" );
-	delay = ( cfg.readEntry( "Delay", "0" ) ).toInt();
-	// If the time between suspend and resume was longer then the
-	// value saved as delay, start the app
-	if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) {
-		QCopEnvelope e( "QPE/System", "execute(QString)" );
-		e << QString( appName );
-	}
-}
-
-#if defined(QPE_HAVE_TOGGLELIGHT)
-#include <qpe/config.h>
-
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <linux/ioctl.h>
-#include <time.h>
-#endif
-
-
-void Desktop::togglePower()
-{
-	static bool excllock = false;
-
-	if ( excllock )
-		return ;
-
-	excllock = true;
-
-	bool wasloggedin = loggedin;
-	loggedin = 0;
-	suspendTime = QDateTime::currentDateTime();
-
-#ifdef QWS
-
-	if ( Password::needToAuthenticate ( true ) && qt_screen ) {
-		// Should use a big black window instead.
-		// But this would not show up fast enough
-		QGfx *g = qt_screen-> screenGfx ( );
-		g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( ));
-		delete g;
-	}
-#endif
-
-	ODevice::inst ( )-> suspend ( );
-
-	DesktopApplication::switchLCD ( true ); // force LCD on without slow qcop call
-	QWSServer::screenSaverActivate ( false );
-
-	{
-		QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep
-	}
-
-	if ( wasloggedin )
-		login ( true );
-
-	execAutoStart();
-	//qcopBridge->closeOpenConnections();
-
-	excllock = false;
-}
-
-void Desktop::toggleLight()
-{
-	QCopEnvelope e( "QPE/System", "setBacklight(int)" );
-	e << -2; // toggle
-}
-
-void Desktop::toggleSymbolInput()
-{
-	tb->toggleSymbolInput();
-}
-
-void Desktop::toggleNumLockState()
-{
-	tb->toggleNumLockState();
-}
-
-void Desktop::toggleCapsLockState()
-{
-	tb->toggleCapsLockState();
-}
-
-void Desktop::styleChange( QStyle &s )
-{
-	QWidget::styleChange( s );
-	layout();
-}
-
-void DesktopApplication::shutdown()
-{
-	if ( type() != GuiServer )
-		return ;
-	ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose );
-	connect( sd, SIGNAL( shutdown( ShutdownImpl::Type ) ),
-	         this, SLOT( shutdown( ShutdownImpl::Type ) ) );
-	sd->showMaximized();
-}
-
-void DesktopApplication::shutdown( ShutdownImpl::Type t )
-{
-	char *opt = 0;
-
-	switch ( t ) {
-		case ShutdownImpl::ShutdownSystem:
-			opt = "-h";
-			// fall through
-		case ShutdownImpl::RebootSystem:
-			if ( opt == 0 )
-				opt = "-r";
-
-			if ( execl( "/sbin/shutdown", "shutdown", opt, "now", ( void* ) 0) < 0 )
-				perror("shutdown");
-//				::syslog ( LOG_ERR, "Erroring execing shutdown\n" );
-
-			break;
-		case ShutdownImpl::RestartDesktop:
-			restart();
-			break;
-		case ShutdownImpl::TerminateDesktop:
-			prepareForTermination( FALSE );
-
-			// This is a workaround for a Qt bug
-			// clipboard applet has to stop its poll timer, or Qt/E
-			// will hang on quit() right before it emits aboutToQuit()
-			emit aboutToQuit ( );
-
-			quit();
-			break;
-	}
-}
-
-void DesktopApplication::restart()
-{
-	prepareForTermination( TRUE );
-
-#ifdef Q_WS_QWS
-
-	for ( int fd = 3; fd < 100; fd++ )
-		close( fd );
-#if defined(QT_DEMO_SINGLE_FLOPPY)
-
-	execl( "/sbin/init", "qpe", 0 );
-#elif defined(QT_QWS_CASSIOPEIA)
-
-	execl( "/bin/sh", "sh", 0 );
-#else
-
-	execl( ( qpeDir() + "/bin/qpe" ).latin1(), "qpe", 0 );
-#endif
-
-	exit( 1 );
-#endif
-}
-
-void Desktop::layout()
-{
-	int displayw = qApp->desktop() ->width();
-	int displayh = qApp->desktop() ->height();
-
-	QSize sz = tb->sizeHint();
-
-	tb->setGeometry( 0, displayh - sz.height(), displayw, sz.height() );
-	tb->calcMaxWindowRect();
-}
-
-void Desktop::startTransferServer()
-{
-	// start qcop bridge server
-	qcopBridge = new QCopBridge( 4243 );
-	if ( !qcopBridge->ok() ) {
-		delete qcopBridge;
-		qcopBridge = 0;
-	}
-	// start transfer server
-	transferServer = new TransferServer( 4242 );
-	if ( !transferServer->ok() ) {
-		delete transferServer;
-		transferServer = 0;
-	}
-	if ( !transferServer || !qcopBridge )
-		startTimer( 2000 );
-}
-
-void Desktop::timerEvent( QTimerEvent *e )
-{
-	killTimer( e->timerId() );
-	startTransferServer();
-}
-
-bool Desktop::eventFilter( QObject *o, QEvent *ev )
-{
-    if ( o != qApp->desktop() || ev->type() != QEvent::Resize )
-	return QWidget::eventFilter( o, ev );
-
-    layout();
-
-    return QWidget::eventFilter( o, ev );
-}
-
-void Desktop::terminateServers()
-{
-	delete transferServer;
-	delete qcopBridge;
-	transferServer = 0;
-	qcopBridge = 0;
-}
-
-void DesktopApplication::rereadVolumes()
-{
-	Config cfg( "qpe" );
-	cfg. setGroup ( "Volume" );
-	
-	m_screentap_sound = cfg. readBoolEntry ( "TouchSound" );
-	m_keyclick_sound  = cfg. readBoolEntry ( "KeySound" );
-	m_alarm_sound     = cfg. readBoolEntry ( "AlarmSound" );
-}
-
-void DesktopApplication::soundAlarm()
-{
-	if ( me ( )-> m_alarm_sound )
-		ODevice::inst ( )-> alarmSound ( );
-}
-
-DesktopApplication *DesktopApplication::me ( )
-{
-	return (DesktopApplication *) qApp;
-}
-
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h
deleted file mode 100644
index 86d8aa8..0000000
--- a/core/launcher/desktop.h
+++ b/dev/null
@@ -1,157 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of 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.
-**
-**********************************************************************/
-
-#ifndef __DESKTOP_H__
-#define __DESKTOP_H__
-
-
-#include "shutdownimpl.h"
-
-#include <qpe/qpeapplication.h>
-#include <opie/odevicebutton.h>
-
-#include <qwidget.h>
-#include <qdatetime.h>
-
-class Background;
-class Launcher;
-class TaskBar;
-class PowerStatus;
-class QCopBridge;
-class TransferServer;
-class DesktopPowerAlerter;
-class PackageSlave;
-class OpieScreenSaver;
-
-class DesktopApplication : public QPEApplication
-{
-	Q_OBJECT
-public:
-	DesktopApplication( int& argc, char **argv, Type t );
-	~DesktopApplication();
-
-	static void switchLCD ( bool on ); // only for togglePower in Desktop
-
-	static void soundAlarm(); // only because QCop soundAlarm() is defined in QPE/TaskBar
-
-signals:
-	void menu();
-	void home();
-	void launch();
-	void backlight();
-	void power();
-	void symbol();
-	void numLockStateToggle();
-	void capsLockStateToggle();
-	void prepareForRestart();
-
-protected:
-#ifdef Q_WS_QWS
-
-	bool qwsEventFilter( QWSEvent * );
-#endif
-
-	void shutdown();
-	void restart();
-
-public slots:
-	virtual void systemMessage ( const QCString &msg, const QByteArray &data );
-	virtual void launcherMessage ( const QCString &msg, const QByteArray &data );
-	void rereadVolumes();
-
-protected slots:
-	void shutdown ( ShutdownImpl::Type );
-	void apmTimeout ( );
-	void sendHeldAction ( );
-
-protected:
-	virtual bool eventFilter ( QObject *o, QEvent *e );
-	bool checkButtonAction ( const Opie::ODeviceButton *db, int keycode, bool press, bool autoRepeat );
-	
-private:
-	static DesktopApplication *me ( );
-	
-private:
-	void reloadPowerWarnSettings();
-	DesktopPowerAlerter *pa;
-	PowerStatus *m_ps, *m_ps_last;
-	QTimer *cardSendTimer;
-	QCopChannel *channel;
-	OpieScreenSaver *m_screensaver;
-	QTimer * m_apm_timer;
-	int m_powerVeryLow;
-	int m_powerCritical;
-	int m_currentPowerLevel;
-
-	const Opie::ODeviceButton *m_last_button;
-	QTimer *m_button_timer;	
-
-	bool m_keyclick_sound  : 1;
-	bool m_screentap_sound : 1;
-	bool m_alarm_sound     : 1;
-};
-
-
-class Desktop : public QWidget
-{
-	Q_OBJECT
-public:
-	Desktop();
-	~Desktop();
-
-	static bool screenLocked();
-
-	void show();
-	void checkMemory();
-
-public slots:
-	void execAutoStart();
-	void togglePower();
-	void toggleLight();
-	void toggleNumLockState();
-	void toggleCapsLockState();
-	void toggleSymbolInput();
-	void terminateServers();
-
-protected:
-	void executeOrModify( const QString& appLnkFile );
-	void styleChange( QStyle & );
-	void timerEvent( QTimerEvent *e );
-	virtual bool eventFilter( QObject *o, QEvent *ev );
-
-	QWidget *bg;
-	Launcher *launcher;
-	TaskBar *tb;
-
-private:
-	void layout();
-	void startTransferServer();
-	bool recoverMemory();
-
-	QCopBridge *qcopBridge;
-	TransferServer *transferServer;
-	PackageSlave *packageSlave;
-
-	QDateTime suspendTime;
-};
-
-
-#endif // __DESKTOP_H__
-
diff --git a/core/launcher/info.cpp b/core/launcher/info.cpp
deleted file mode 100644
index 609e9e2..0000000
--- a/core/launcher/info.cpp
+++ b/dev/null
@@ -1,116 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of 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 "info.h"
-#include "desktop.h"
-
-#include <qpe/resource.h>
-#include <qpe/version.h>
-
-#include <qlayout.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qsimplerichtext.h>
-
-
-Info *desktopInfo = NULL;
-
-
-Info::Info( Desktop *d ) : Background( d ), needsClear(FALSE), menuHasBeenClicked(FALSE)
-{
-    QString motd;
-    /* eg.
-	=
-	"<table width=100% cellspacing=0 cellpadding=2>"
-	"<tr><td bgcolor=#9090ff><h2>Today&nbsp;&nbsp;&nbsp;&nbsp;<small>June 15, 2001</small></h2></td>"
-	"<tr><td bgcolor=#c0c0ff><big><a href=datebook>Appointments</a></big>"
-	"<tr><td bgcolor=#e0e0ff>"
-	    "<b>8:30am</b> Meeting with John<br>"
-	    "<b>1:10pm</b> Lunch with Sharon"
-	"<tr><td bgcolor=#c0c0ff><big><a href=todo>Reminders</a></big>"
-	"<tr><td bgcolor=#e0e0ff>"
-	    "<b>#1</b> Port XMAME to QPE<br>"
-	    "<b>#2</b> Flowers for wife"
-	"<tr><td bgcolor=#c0c0ff><big><a href=channels>Net channels</a></big>"
-	"<tr><td bgcolor=#e0e0ff>"
-	    "<b>LinuxDevices:</b><a href=http://www.linuxdevices.com> QPE announcement</a><br>"
-	    "<b>Slashdot:</b><a href=http://www.slashdot.org> GPL Examined</a>"
-	"</table>";
-    */
-    info = new QSimpleRichText(motd, QFont("lucidux_sans",10));
-    desktopInfo = this;
-}
-
-
-void Info::mouseReleaseEvent( QMouseEvent * )
-{
-}
-
-
-void Info::menuClicked( )
-{
-    QPainter p(this);
-    if ( needsClear ) {
-	QColor col = colorGroup().color( QColorGroup::Button ).dark( 0 );
-	p.fillRect( 5, height() - 24, width() - 5, 20, col );
-	needsClear = FALSE;
-	menuHasBeenClicked = TRUE;
-    }
-}
-
-
-void Info::paintEvent( QPaintEvent *e )
-{
-    QPainter p(this);
-
-    BrushStyle styles[] = { Dense1Pattern, Dense2Pattern, Dense3Pattern,
-			    Dense4Pattern, Dense5Pattern, Dense6Pattern };
-
-    QColor shade = colorGroup().color( QColorGroup::Button ).dark( 110 ); 
-    int blend = width() * 3 / 4;
-    int step = blend/6;
-    p.fillRect( 0, 0, width()-blend, 30, shade );
-    for ( int i = 0; i < 6; i++ ) {
-	QBrush brush( shade, styles[i] );
-	p.fillRect( width()-blend+i*step, 0, step, 30, brush );
-    }
-    p.setFont( QFont("Helvetica", 24, QFont::Bold) );
-    p.setPen( shade.dark( 140 ) );
-    p.drawText( 5, 24, "QPE" );
-    int pos = 5 + p.fontMetrics().width( "QPE" );
-    QFont f("Helvetica", 10, QFont::Bold);
-    p.setFont( f );
-    p.drawText( pos + 5, 24, QString( "Version " ) + QPE_VERSION );
-
-    if (!menuHasBeenClicked) {
-	p.drawText( 5, height()-10, QString( "Click on the " ) );
-	int pos = 5 + p.fontMetrics().width( "Click on the " );
-	p.drawPixmap( pos, height()-10-14, Resource::loadPixmap( "go" ) );
-	p.drawText( pos + 16, height()-10, QString( " logo to start." ) );
-	needsClear = TRUE;
-    }
-
-    if ( info ) {
-	info->setWidth(&p,width()-10);
-	info->draw(&p, 5, 35, e->region(), colorGroup());
-    }
-}
-
-
diff --git a/core/launcher/info.h b/core/launcher/info.h
deleted file mode 100644
index 317dec5..0000000
--- a/core/launcher/info.h
+++ b/dev/null
@@ -1,55 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of 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.
-**
-**********************************************************************/
-
-#ifndef __INFO_H__
-#define __INFO_H__
-
-
-#include <qwidget.h>
-#include <qpainter.h>
-#include "background.h"
-
-class QSimpleRichText;
-
-class Info : public Background {
-    Q_OBJECT
-public:
-    Info( Desktop *d );
-    void menuClicked( );
-
-signals:
-    void giveInfo( );
-
-protected:
-    void mouseReleaseEvent( QMouseEvent *e );
-    void paintEvent( QPaintEvent *pe );
-
-private:
-    QSimpleRichText* info;
-    bool needsClear;
-    bool menuHasBeenClicked;
-};
-
-
-extern Info *desktopInfo;
-
-
-#endif // __INFO_H__
-
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
deleted file mode 100644
index f5597c5..0000000
--- a/core/launcher/launcher.pro
+++ b/dev/null
@@ -1,125 +0,0 @@
-TEMPLATE	= app
-CONFIG		= qt warn_on release
-DESTDIR		= ../../bin
-HEADERS		= background.h \
-		  desktop.h \
-		  screensaver.h \
-		  mediummountgui.h \
-		  info.h \
-		  appicons.h \
-		  taskbar.h \
-		  sidething.h \
-		  runningappbar.h \
-		  stabmon.h \
-		  inputmethods.h \
-		  systray.h \
-		  wait.h \
-		  shutdownimpl.h \
-		  launcher.h \
-		  launcherview.h \
-		  ../../core/apps/calibrate/calibrate.h \
-		  startmenu.h \
-		  transferserver.h \
-		  qcopbridge.h \
-		  packageslave.h \
-		irserver.h \
-	../../rsync/buf.h \
-	../../rsync/checksum.h \
-	../../rsync/command.h \
-	../../rsync/emit.h \
-	../../rsync/job.h \
-	../../rsync/netint.h \
-	../../rsync/protocol.h \
-	../../rsync/prototab.h \
-	../../rsync/rsync.h \
-	../../rsync/search.h \
-	../../rsync/stream.h \
-	../../rsync/sumset.h \
-	../../rsync/trace.h \
-	../../rsync/types.h \
-	../../rsync/util.h \
-	../../rsync/whole.h \
-	../../rsync/config_rsync.h \
-	../../rsync/qrsync.h \
-		  quicklauncher.h 
-SOURCES		= background.cpp \
-		  desktop.cpp \
-		  screensaver.cpp \
-		  mediummountgui.cpp \
-		  info.cpp \
-		  appicons.cpp \
-		  taskbar.cpp \
-		  sidething.cpp \
- 	          runningappbar.cpp \
-		  stabmon.cpp \
-		  inputmethods.cpp \
-		  systray.cpp \
-		  wait.cpp \
-		  shutdownimpl.cpp \
-		  launcher.cpp \
-		  launcherview.cpp \
-		  ../../core/apps/calibrate/calibrate.cpp \
-		  transferserver.cpp \
-		  packageslave.cpp \
-		irserver.cpp \
-		  qcopbridge.cpp \
-		  startmenu.cpp \
-		  main.cpp \
-	../../rsync/base64.c \
-	../../rsync/buf.c \
-	../../rsync/checksum.c \
-	../../rsync/command.c \
-	../../rsync/delta.c \
-	../../rsync/emit.c \
-	../../rsync/hex.c \
-	../../rsync/job.c \
-	../../rsync/mdfour.c \
-	../../rsync/mksum.c \
-	../../rsync/msg.c \
-	../../rsync/netint.c \
-	../../rsync/patch.c \
-	../../rsync/prototab.c \
-	../../rsync/readsums.c \
-	../../rsync/scoop.c \
-	../../rsync/search.c \
-	../../rsync/stats.c \
-	../../rsync/stream.c \
-	../../rsync/sumset.c \
-	../../rsync/trace.c \
-	../../rsync/tube.c \
-	../../rsync/util.c \
-	../../rsync/version.c \
-	../../rsync/whole.c \
-	../../rsync/qrsync.cpp
-INTERFACES	= syncdialog.ui
-INCLUDEPATH += ../../include
-DEPENDPATH	+= ../../include .
-INCLUDEPATH += ../../core/apps/calibrate
-DEPENDPATH	+= ../../core/apps/calibrate
-INCLUDEPATH += ../../rsync
-DEPENDPATH	+= ../../rsync
-TARGET		= qpe
-LIBS		+= -lqpe -lcrypt -lopie 
-
-TRANSLATIONS = ../../i18n/de/qpe.ts \
-	 ../../i18n/nl/qpe.ts \
-	 ../../i18n/xx/qpe.ts \
-	 ../../i18n/en/qpe.ts \
-	 ../../i18n/es/qpe.ts \
-	 ../../i18n/fr/qpe.ts \
-	 ../../i18n/hu/qpe.ts \
-	 ../../i18n/ja/qpe.ts \
-	 ../../i18n/ko/qpe.ts \
-	 ../../i18n/no/qpe.ts \
-	 ../../i18n/pl/qpe.ts \
-	 ../../i18n/pt/qpe.ts \
-	 ../../i18n/pt_BR/qpe.ts \
-	 ../../i18n/sl/qpe.ts \
-	 ../../i18n/zh_CN/qpe.ts \
-	 ../../i18n/it/qpe.ts \
-	 ../../i18n/zh_TW/qpe.ts \
-	 ../../i18n/da/qpe.ts
-
-
-
-include ( $(OPIEDIR)/include.pro )
diff --git a/core/launcher/mediummountgui.cpp b/core/launcher/mediummountgui.cpp
deleted file mode 100644
index b0a1b10..0000000
--- a/core/launcher/mediummountgui.cpp
+++ b/dev/null
@@ -1,207 +0,0 @@
-
-#include "mediummountgui.h"
-
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qimage.h>
-#include <qpixmap.h>
-#include <qvbox.h>
-#include <qhbox.h>
-
-#include <qpe/resource.h>
-#include <qpe/config.h>
-
-
-MediumMountGui::MediumMountGui( Config *cfg, const QString &path ,QWidget* parent,  const char* name, bool , WFlags  )
-  : QDialog( parent, name, true ) {
-
-    m_cfg = cfg;
-    setCaption( tr( "Medium inserted" ) );
-
-    mediumPath = path;
-    readConfig();
-    startGui();
-    showMaximized();
-}
-
-void MediumMountGui::readConfig() {
-
-    //OConfig cfg (mediumPath +"/.opiestorage.cf");
-    m_cfg->setGroup( "main" );
-    checkagain = m_cfg->readBoolEntry( "check", false );
-
-    m_cfg->setGroup( "mimetypes" );
-    checkmimeaudio = m_cfg->readBoolEntry( "audio", true );
-    checkmimeimage = m_cfg->readBoolEntry( "image", true );
-    checkmimetext  = m_cfg->readBoolEntry( "text" , true );
-    checkmimevideo = m_cfg->readBoolEntry( "video", true );
-    checkmimeall   = m_cfg->readBoolEntry( "all"  , false );
-
-    m_cfg->setGroup( "dirs" );
-    limittodirs = m_cfg->readEntry( "dirs", "" );
-}
-
-bool MediumMountGui::check() {
-    return !checkagain;
-}
-
-QStringList MediumMountGui::dirs() {
-    return QStringList::split( ",", limittodirs );
-}
-
-void MediumMountGui::writeConfig( bool autocheck ) {
-
-    //OConfig cfg (mediumPath +"/.opiestorage.cf");
-    m_cfg->setGroup( "main" );
-    m_cfg->writeEntry( "check", AskBox->isChecked() );
-    m_cfg->writeEntry( "autocheck", autocheck );
-
-    m_cfg->setGroup( "mimetypes" );
-
-    m_cfg->writeEntry( "audio", CheckBoxAudio->isChecked() );
-    m_cfg->writeEntry( "image", CheckBoxImage->isChecked() );
-    m_cfg->writeEntry( "text", CheckBoxImage->isChecked() );
-    m_cfg->writeEntry( "video", CheckBoxVideo->isChecked() );
-    m_cfg->writeEntry( "all", CheckBoxAll->isChecked() );
-
-    m_cfg->setGroup( "dirs" );
-    m_cfg->writeEntry( "dirs", "" );
-
-    // if all is checked then add only "QString::null" to the list.
-    if ( checkmimeall ) {
-        mimeTypeList.clear();
-        mimeTypeList += QString::null;
-    } else {
-        if ( checkmimeaudio ) {
-            mimeTypeList += ( "audio/*" );
-        }
-        if ( checkmimetext ) {
-            mimeTypeList += ( "text/*" );
-        }
-        if ( checkmimevideo ) {
-            mimeTypeList += ( "video/*" );
-        }
-        if ( checkmimeimage ) {
-            mimeTypeList += ( "image/*" );
-        }
-    }
-    m_cfg->write(); // not really needed here but just to be sure
-}
-
-void MediumMountGui::startGui() {
-
-    QVBoxLayout* mainLayout = new QVBoxLayout( this );
-
-    QHBoxLayout * titelBox = new QHBoxLayout( mainLayout );
-    Text_2 = new QLabel( this );
-    // FIXME needs an image
-    Text_2->setPixmap( Resource::loadPixmap( "mediummount/mediummount" ) );
-
-    Text = new QLabel( this, "Text" );
-    Text->setText( tr( "A <b>storage medium</b> was inserted. Should it be scanned for media files?" ) );
-    titelBox->addWidget( Text_2 );
-    titelBox->setStretchFactor( Text_2, 2 );
-    titelBox->addWidget( Text );
-    titelBox->setStretchFactor( Text, 8 );
-
-    // media box
-    GroupBox1 = new QGroupBox( this, "GroupBox1" );
-    GroupBox1->setTitle( tr( "Which media files" ) );
-
-    QGridLayout *mimeLayout = new QGridLayout( GroupBox1, 3, 2, 10 );
-
-    CheckBoxAudio = new QCheckBox( GroupBox1, "CheckBoxAudio" );
-    CheckBoxAudio->setText( tr( "Audio" ) );
-
-    CheckBoxImage = new QCheckBox( GroupBox1, "CheckBoxImage" );
-    CheckBoxImage->setText( tr( "Image" ) );
-
-    CheckBoxText = new QCheckBox( GroupBox1, "CheckBoxText" );
-    CheckBoxText->setText( tr( "Text" ) );
-
-    CheckBoxVideo = new QCheckBox( GroupBox1, "CheckBoxVideo" );
-    CheckBoxVideo->setText( tr( "Video" ) );
-
-    CheckBoxAll = new QCheckBox ( GroupBox1 );
-    CheckBoxAll->setText( tr( "All" ) );
-
-    CheckBoxLink = new QCheckBox ( GroupBox1 );
-    CheckBoxLink->setText( tr( "Link apps" ) );
-    // as long as the feature is not supported
-    CheckBoxLink->setEnabled( false );
-
-    mimeLayout->addWidget( CheckBoxAudio, 0, 0 );
-    mimeLayout->addWidget( CheckBoxImage, 0, 1 );
-    mimeLayout->addWidget( CheckBoxText , 1, 0 );
-    mimeLayout->addWidget( CheckBoxVideo, 1, 1 );
-    mimeLayout->addWidget( CheckBoxAll, 2, 0 );
-    mimeLayout->addWidget( CheckBoxLink, 2, 1 );
-
-    connect( CheckBoxAll, SIGNAL( clicked() ), this, SLOT( deactivateOthers() ) );
-
-    QVBox* dirBox = new QVBox( this );
-    dirBox->setMargin( 5 );
-
-    // select dirs
-    DirSelectText = new QLabel( dirBox, "DirSelectText" );
-    DirSelectText->setText( tr( "Limit search to dir: (not used yet)" ) );
-
-    QHBox* dirLineBox = new QHBox( dirBox );
-    LineEdit1 = new QLineEdit( dirLineBox );
-    PushButton3 = new QPushButton( dirLineBox );
-    PushButton3->setText( tr( "Add" ) );
-    PushButton3->setFocus();
-
-    // decision
-    DirSelectText_2 = new QLabel( dirBox );
-    DirSelectText_2->setText( tr( "Your decision will be stored on the medium." ) );
-
-    // ask again
-    AskBox = new QCheckBox( dirBox );
-    AskBox->setText( tr( "Do not ask again for this medium" ) );
-
-    AskBox->setChecked( checkagain );
-    CheckBoxAudio->setChecked( checkmimeaudio );
-    CheckBoxImage->setChecked( checkmimeimage );
-    CheckBoxText->setChecked( checkmimetext );
-    CheckBoxVideo->setChecked( checkmimevideo );
-    CheckBoxAll->setChecked( checkmimeall );
-    deactivateOthers();
-
-    mainLayout->addWidget( GroupBox1 );
-    mainLayout->addWidget( dirBox );
-    mainLayout->addStretch( 0 );
-}
-
-
-void MediumMountGui::deactivateOthers() {
-    bool mod = !( CheckBoxAll->isChecked() );
-    CheckBoxVideo->setEnabled( mod );
-    CheckBoxAudio->setEnabled( mod );
-    CheckBoxText->setEnabled( mod );
-    CheckBoxImage->setEnabled( mod );
-}
-
-void MediumMountGui::accept() {
-    writeConfig( true );
-    // and do something
-    QDialog::accept();
-}
-
-
-QStringList MediumMountGui::mimeTypes() {
-    return mimeTypeList;
-}
-
-void MediumMountGui::reject() {
-    writeConfig( false );
-    QDialog::reject();
-}
-
-MediumMountGui::~MediumMountGui() {
-}
-
diff --git a/core/launcher/mediummountgui.h b/core/launcher/mediummountgui.h
deleted file mode 100644
index d5c0fe7..0000000
--- a/core/launcher/mediummountgui.h
+++ b/dev/null
@@ -1,67 +0,0 @@
-#ifndef MEDIUMMOUNTGUI_H
-#define MEDIUMMOUNTGUI_H
-
-#include <qvariant.h>
-#include <qdialog.h>
-
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QCheckBox;
-class QGroupBox;
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class Config;
-
-class MediumMountGui : public QDialog {
-    Q_OBJECT
-
-public:
-    MediumMountGui( Config *cfg, const QString &path = "tmp/", QWidget* parent = 0, const char* name = 0, bool modal = FALSE  ,WFlags fl = 0 );
-    ~MediumMountGui();
-
-protected:
-    QLabel* DirSelectText_2;
-    QLineEdit* LineEdit1;
-    QPushButton* PushButton3;
-    QLabel* DirSelectText;
-    QLabel* Text_2;
-    QLabel* Text;
-    QGroupBox* GroupBox1;
-    QCheckBox* CheckBoxAudio;
-    QCheckBox* CheckBoxImage;
-    QCheckBox* CheckBoxText;
-    QCheckBox* CheckBoxVideo;
-    QCheckBox* CheckBoxAll;
-    QCheckBox* CheckBoxLink;
-    QCheckBox* AskBox;
-
-public:
-    bool check();
-    QStringList mimeTypes();
-    QStringList dirs();
-private:
-    void startGui();
-    void readConfig();
-    void writeConfig( bool checkagain );
-
-private slots:
-    void accept();
-    void reject();
-    void deactivateOthers();
- private:
-    QString mediumPath;
-    bool checkagain:1;
-    bool checkmimeaudio:1;
-    bool checkmimeimage:1;
-    bool checkmimetext:1;
-    bool checkmimevideo:1;
-    bool checkmimeall:1;
-    QString limittodirs;
-    QStringList mimeTypeList;
-    Config *m_cfg;
-
-};
-
-#endif
diff --git a/core/launcher/qcleanuphandler_p.h b/core/launcher/qcleanuphandler_p.h
index d8cddac..04d5c7e 100644
--- a/core/launcher/qcleanuphandler_p.h
+++ b/core/launcher/qcleanuphandler_p.h
@@ -1,51 +1,71 @@
+/**********************************************************************
+** 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.
+**
+**********************************************************************/
+
 #ifndef QCLEANUPHANDLER_H
 #define QCLEANUPHANDLER_H
 
 #ifndef QT_H
 #include <qlist.h>
 #endif // QT_H
 
 template<class Type>
 class Q_EXPORT QCleanupHandler
 {
 public:
     QCleanupHandler() : cleanupObjects( 0 ) {}
     ~QCleanupHandler() { clear(); }
 
     Type* add( Type **object ) {
 	if ( !cleanupObjects )
 	    cleanupObjects = new QList<Type*>;
 	cleanupObjects->insert( 0, object );
 	return *object;
     }
 
     void remove( Type **object ) {
 	if ( !cleanupObjects )
 	    return;
 	if ( cleanupObjects->findRef( object ) >= 0 )
 	    (void) cleanupObjects->take();
     }
 
     bool isEmpty() const {
 	return cleanupObjects ? cleanupObjects->isEmpty() : TRUE;
     }
 
     void clear() {
 	if ( !cleanupObjects )
 	    return;
 	QListIterator<Type*> it( *cleanupObjects );
 	Type **object;
 	while ( ( object = it.current() ) ) {
 	    delete *object;
 	    *object = 0;
 	    cleanupObjects->remove( object );
 	}
 	delete cleanupObjects;
 	cleanupObjects = 0;
     }
 
 private:
     QList<Type*> *cleanupObjects;
 };
 
 #endif //QCLEANUPHANDLER_H
diff --git a/core/launcher/quicklauncher.cpp b/core/launcher/quicklauncher.cpp
deleted file mode 100644
index 925b3b5..0000000
--- a/core/launcher/quicklauncher.cpp
+++ b/dev/null
@@ -1,49 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of 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 <qapplication.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <applnk.h>
-#include <resource.h>
-#include "quicklauncher.h"
-
-
-void QuickLauncher::addLauncherButton( AppLnk *appLnk )
-{
-    QPushButton *pb = new QPushButton( this );
-    // It's no a QObject anymore
-    //pb->connect( pb, SIGNAL( clicked( ) ), appLnk, SLOT( execute() ) );
-    pb->setPixmap( appLnk->pixmap() );
-    pb->setFocusPolicy( QWidget::NoFocus );
-    pb->setFlat( TRUE );
-    pb->setFixedSize( 18, 18 );
-}
-
-
-QuickLauncher::QuickLauncher( QWidget *parent ) : QHBox( parent )
-{
-//  Example usage to add icons to the quick launcher area
-//    addLauncherButton( "filebrowser_icon", "filebrowser" );
-//    addLauncherButton( "textedit_icon", "textedit" );
-//    addLauncherButton( "help_icon", "helpbrowser" );
-}
-
-
diff --git a/core/launcher/quicklauncher.h b/core/launcher/quicklauncher.h
deleted file mode 100644
index 92c6c66..0000000
--- a/core/launcher/quicklauncher.h
+++ b/dev/null
@@ -1,40 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of 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.
-**
-**********************************************************************/
-
-#ifndef __QUICK_LAUNCHER_H__
-#define __QUICK_LAUNCHER_H__
-
-
-#include <qhbox.h>
-
-class AppLnk;
-
-
-class QuickLauncher : public QHBox {
-    Q_OBJECT
-public:
-    QuickLauncher( QWidget *parent );
-    void addLauncherButton( AppLnk * );
-};
-
-
-#endif // __QUICK_LAUNCHER_H__
-
-
diff --git a/core/launcher/sidething.cpp b/core/launcher/sidething.cpp
deleted file mode 100644
index 821c9d5..0000000
--- a/core/launcher/sidething.cpp
+++ b/dev/null
@@ -1,75 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of 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 "sidething.h"
-
-#include <qpe/resource.h>
-
-#include <qrect.h>
-#include <qpopupmenu.h>
-#include <qpainter.h>
-
-
-void PopupWithLaunchSideThing::setFrameRect( const QRect &r )
-{
-    fr = r;
-    QPopupMenu::setFrameRect( r );
-}
-
-
-void PopupWithLaunchSideThing::paintEvent( QPaintEvent *event )
-{
-    QPainter paint( this );
-
-    if ( !contentsRect().contains( event->rect() ) ) {
-
-        QPopupMenu::setFrameRect( fr );
-        int oldLW = lineWidth();
-        setUpdatesEnabled(FALSE);
-        setLineWidth(oldLW);
-        setUpdatesEnabled(TRUE);
-
-	paint.save();
-	paint.setClipRegion( event->region().intersect( frameRect() ) );
-	QPixmap pm( Resource::loadPixmap( sidePixmap ) );
-	paint.drawPixmap( 2, fr.height() - pm.height() - 2, pm );
-//	Need to draw a filled rectangle that extends the colour from the
-//	end of the pixmap up to the top of the popupmenu
-//	paint.fillRect();
-	drawFrame( &paint );
-	paint.restore();
-	
-    }
-    if ( event->rect().intersects( contentsRect() ) /* &&
-	 (fstyle & MShape) != HLine && (fstyle & MShape) != VLine */ ) {
-        
-	QPopupMenu::setFrameRect( QRect(fr.left() + 21, fr.top(), fr.width() - 21, fr.height()) );
-        int oldLW = lineWidth();
-        setUpdatesEnabled(FALSE);
-        setLineWidth(oldLW);
-        setUpdatesEnabled(TRUE);
-	
-	paint.setClipRegion( event->region().intersect( contentsRect() ) );
-	drawContents( &paint );
-    }
-    
-}
-
-
diff --git a/core/launcher/sidething.h b/core/launcher/sidething.h
deleted file mode 100644
index 666a59d..0000000
--- a/core/launcher/sidething.h
+++ b/dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of 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.
-**
-**********************************************************************/
-
-#ifndef __SIDE_THING_H__
-#define __SIDE_THING_H__
-
-
-#include "startmenu.h"
-
-
-class PopupWithLaunchSideThing : public StartPopupMenu
-{
-Q_OBJECT
-public:
-    PopupWithLaunchSideThing( QWidget *parent, QString *pixmap ) : StartPopupMenu( parent ), sidePixmap(*pixmap) { }
-
-protected:
-    void setFrameRect( const QRect & );
-    void paintEvent( QPaintEvent *event );
-    QRect fr;
-    QString sidePixmap;
-};
-
-
-#endif // __SIDE_THING_H__
-
diff --git a/core/launcher/syncdialog.ui b/core/launcher/syncdialog.ui
deleted file mode 100644
index 141f123..0000000
--- a/core/launcher/syncdialog.ui
+++ b/dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>SyncDialog</class>
-<widget>
-    <class>QDialog</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>SyncDialog</cstring>
-    </property>
-    <property stdset="1">
-        <name>geometry</name>
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>210</width>
-            <height>244</height>
-        </rect>
-    </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>Syncing</string>
-    </property>
-    <property stdset="1">
-        <name>sizeGripEnabled</name>
-        <bool>true</bool>
-    </property>
-    <vbox>
-        <property stdset="1">
-            <name>margin</name>
-            <number>11</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>6</number>
-        </property>
-        <spacer>
-            <property>
-                <name>name</name>
-                <cstring>Spacer10</cstring>
-            </property>
-            <property stdset="1">
-                <name>orientation</name>
-                <enum>Vertical</enum>
-            </property>
-            <property stdset="1">
-                <name>sizeType</name>
-                <enum>Expanding</enum>
-            </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
-        <widget>
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout3</cstring>
-            </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget>
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>TextLabel1</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Syncing</string>
-                    </property>
-                    <property stdset="1">
-                        <name>alignment</name>
-                        <set>AlignCenter</set>
-                    </property>
-                    <property>
-                        <name>hAlign</name>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>whatLabel</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>&lt;b&gt;Contacts&lt;/b&gt;</string>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
-        <spacer>
-            <property>
-                <name>name</name>
-                <cstring>Spacer11</cstring>
-            </property>
-            <property stdset="1">
-                <name>orientation</name>
-                <enum>Vertical</enum>
-            </property>
-            <property stdset="1">
-                <name>sizeType</name>
-                <enum>Expanding</enum>
-            </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
-        <widget>
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout4</cstring>
-            </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer4</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>buttonCancel</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>&amp;Cancel</string>
-                    </property>
-                    <property stdset="1">
-                        <name>autoDefault</name>
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer5</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-            </hbox>
-        </widget>
-        <spacer>
-            <property>
-                <name>name</name>
-                <cstring>Spacer12</cstring>
-            </property>
-            <property stdset="1">
-                <name>orientation</name>
-                <enum>Vertical</enum>
-            </property>
-            <property stdset="1">
-                <name>sizeType</name>
-                <enum>Expanding</enum>
-            </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
-    </vbox>
-</widget>
-<connections>
-    <connection>
-        <sender>buttonCancel</sender>
-        <signal>clicked()</signal>
-        <receiver>SyncDialog</receiver>
-        <slot>reject()</slot>
-    </connection>
-</connections>
-</UI>