*** empty log message ***

3 files changed, 25 insertions, 112 deletions

diff --git a/library/Makefile.in b/library/Makefile.in
index b74b818..b8fc1f6 100644
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -1,903 +1,818 @@
 #############################################################################
 
 ####### Compiler, tools and options
 
 CXX	=	$(SYSCONF_CXX) $(QT_CXX_MT)
 CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
 CC	=	$(SYSCONF_CC) $(QT_C_MT)
 CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
 INCPATH =	-I$(OPIEDIR)/include -Ibackend
 LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
 LIBS	=	$(SUBLIBS) -ldl -lcrypt -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
 MOC	=	$(SYSCONF_MOC)
 UIC	=	$(SYSCONF_UIC)
 
 ####### Target
 
 DESTDIR = $(QTDIR)/lib$(PROJMAK)/
 VER_MAJ = 1
 VER_MIN = 5
 VER_PATCH = 0
 TARGET	= qpe
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
 HEADERS =	calendar.h \
 		global.h \
 		resource.h \
 		xmlreader.h \
 		mimetype.h \
 		menubutton.h \
 		network.h \
 		networkinterface.h \
-		proxies.h \
 		filemanager.h \
 		fontmanager.h \
 		qdawg.h \
 		datebookmonth.h \
 		fileselector.h \
+		fileselector_p.h \
 		imageedit.h \
 		qcopenvelope_qws.h \
 		qpedecoration_qws.h \
 		qpeapplication.h \
 		qpestyle.h \
 		qpedialog.h \
 		lightstyle.h \
 		config.h \
 		applnk.h \
 		sound.h \
 		tzselect.h \
 		qmath.h \
 		datebookdb.h \
 		alarmserver.h \
 		process.h \
 		password.h \
 		timestring.h \
 		fontfactoryinterface.h \
 		fontdatabase.h \
 		power.h \
 		storage.h \
 		qpemessagebox.h \
 		backend/timeconversion.h \
 		qpedebug.h \
 		qpemenubar.h \
 		qpetoolbar.h \
 		backend/categories.h \
 		backend/stringutil.h \
 		backend/palmtopuid.h \
 		backend/palmtoprecord.h \
 		backend/task.h \
 		backend/event.h \
 		backend/contact.h \
 		categorymenu.h \
 		categoryedit_p.h \
 		categoryselect.h \
 		categorywidget.h \
 		ir.h \
 		backend/vobject_p.h \
 		findwidget_p.h \
 		finddialog.h \
-		lnkproperties.h \
-		quuid.h \
-		qcom.h \
-		qlibrary.h \
-		qlibrary_p.h \
-		qprocess.h
+		lnkproperties.h
 SOURCES =	calendar.cpp \
 		global.cpp \
 		xmlreader.cpp \
 		mimetype.cpp \
 		menubutton.cpp \
 		network.cpp \
 		networkinterface.cpp \
-		proxies.cpp \
 		filemanager.cpp \
 		fontmanager.cpp \
 		qdawg.cpp \
 		datebookmonth.cpp \
 		fileselector.cpp \
 		imageedit.cpp \
 		resource.cpp \
 		qpedecoration_qws.cpp \
 		qcopenvelope_qws.cpp \
 		qpeapplication.cpp \
 		qpestyle.cpp \
 		qpedialog.cpp \
 		lightstyle.cpp \
 		config.cpp \
 		applnk.cpp \
 		sound.cpp \
 		tzselect.cpp \
 		qmath.c \
 		datebookdb.cpp \
 		alarmserver.cpp \
 		password.cpp \
 		process.cpp \
 		process_unix.cpp \
 		timestring.cpp \
 		fontdatabase.cpp \
 		power.cpp \
 		storage.cpp \
 		qpemessagebox.cpp \
 		backend/timeconversion.cpp \
 		qpedebug.cpp \
 		qpemenubar.cpp \
 		qpetoolbar.cpp \
 		backend/categories.cpp \
 		backend/stringutil.cpp \
 		backend/palmtoprecord.cpp \
 		backend/task.cpp \
 		backend/event.cpp \
 		backend/contact.cpp \
 		categorymenu.cpp \
 		categoryedit_p.cpp \
 		categoryselect.cpp \
 		categorywidget.cpp \
 		ir.cpp \
 		backend/vcc_yacc.cpp \
 		backend/vobject.cpp \
 		findwidget_p.cpp \
 		finddialog.cpp \
-		lnkproperties.cpp \
-		quuid.cpp \
-		qlibrary.cpp \
-		qlibrary_unix.cpp \
-		qprocess.cpp \
-		qprocess_unix.cpp
+		lnkproperties.cpp
 OBJECTS =	calendar.o \
 		global.o \
 		xmlreader.o \
 		mimetype.o \
 		menubutton.o \
 		network.o \
 		networkinterface.o \
-		proxies.o \
 		filemanager.o \
 		fontmanager.o \
 		qdawg.o \
 		datebookmonth.o \
 		fileselector.o \
 		imageedit.o \
 		resource.o \
 		qpedecoration_qws.o \
 		qcopenvelope_qws.o \
 		qpeapplication.o \
 		qpestyle.o \
 		qpedialog.o \
 		lightstyle.o \
 		config.o \
 		applnk.o \
 		sound.o \
 		tzselect.o \
 		qmath.o \
 		datebookdb.o \
 		alarmserver.o \
 		password.o \
 		process.o \
 		process_unix.o \
 		timestring.o \
 		fontdatabase.o \
 		power.o \
 		storage.o \
 		qpemessagebox.o \
 		backend/timeconversion.o \
 		qpedebug.o \
 		qpemenubar.o \
 		qpetoolbar.o \
 		backend/categories.o \
 		backend/stringutil.o \
 		backend/palmtoprecord.o \
 		backend/task.o \
 		backend/event.o \
 		backend/contact.o \
 		categorymenu.o \
 		categoryedit_p.o \
 		categoryselect.o \
 		categorywidget.o \
 		ir.o \
 		backend/vcc_yacc.o \
 		backend/vobject.o \
 		findwidget_p.o \
 		finddialog.o \
 		lnkproperties.o \
-		quuid.o \
-		qlibrary.o \
-		qlibrary_unix.o \
-		qprocess.o \
-		qprocess_unix.o \
 		passwordbase_p.o \
-		proxiesbase_p.o \
 		categoryeditbase_p.o \
 		findwidgetbase_p.o \
 		lnkpropertiesbase_p.o
 INTERFACES =    passwordbase_p.ui \
-		proxiesbase_p.ui \
 		categoryeditbase_p.ui \
 		findwidgetbase_p.ui \
 		lnkpropertiesbase_p.ui
 UICDECLS =      passwordbase_p.h \
-		proxiesbase_p.h \
 		categoryeditbase_p.h \
 		findwidgetbase_p.h \
 		lnkpropertiesbase_p.h
 UICIMPLS =      passwordbase_p.cpp \
-		proxiesbase_p.cpp \
 		categoryeditbase_p.cpp \
 		findwidgetbase_p.cpp \
 		lnkpropertiesbase_p.cpp
 SRCMOC	=	moc_menubutton.cpp \
-		moc_proxies.cpp \
 		moc_datebookmonth.cpp \
 		moc_fileselector.cpp \
+		moc_fileselector_p.cpp \
 		moc_imageedit.cpp \
 		moc_qpedecoration_qws.cpp \
 		moc_qpeapplication.cpp \
 		moc_qpedialog.cpp \
 		moc_tzselect.cpp \
 		moc_process.cpp \
 		moc_storage.cpp \
 		moc_qpemenubar.cpp \
 		moc_qpetoolbar.cpp \
 		backend/moc_categories.cpp \
 		moc_categorymenu.cpp \
 		moc_categoryedit_p.cpp \
 		moc_categoryselect.cpp \
 		moc_ir.cpp \
 		moc_findwidget_p.cpp \
 		moc_finddialog.cpp \
 		moc_lnkproperties.cpp \
-		moc_qlibrary_p.cpp \
-		moc_qprocess.cpp \
 		global.moc \
 		network.moc \
 		password.moc \
 		process_unix.moc \
 		timestring.moc \
-		qprocess_unix.moc \
 		moc_passwordbase_p.cpp \
-		moc_proxiesbase_p.cpp \
 		moc_categoryeditbase_p.cpp \
 		moc_findwidgetbase_p.cpp \
 		moc_lnkpropertiesbase_p.cpp
 OBJMOC	=	moc_menubutton.o \
-		moc_proxies.o \
 		moc_datebookmonth.o \
 		moc_fileselector.o \
+		moc_fileselector_p.o \
 		moc_imageedit.o \
 		moc_qpedecoration_qws.o \
 		moc_qpeapplication.o \
 		moc_qpedialog.o \
 		moc_tzselect.o \
 		moc_process.o \
 		moc_storage.o \
 		moc_qpemenubar.o \
 		moc_qpetoolbar.o \
 		backend/moc_categories.o \
 		moc_categorymenu.o \
 		moc_categoryedit_p.o \
 		moc_categoryselect.o \
 		moc_ir.o \
 		moc_findwidget_p.o \
 		moc_finddialog.o \
 		moc_lnkproperties.o \
-		moc_qlibrary_p.o \
-		moc_qprocess.o \
 		moc_passwordbase_p.o \
-		moc_proxiesbase_p.o \
 		moc_categoryeditbase_p.o \
 		moc_findwidgetbase_p.o \
 		moc_lnkpropertiesbase_p.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)$(SYSCONF_LINK_TARGET)
 
 $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
 	$(SYSCONF_LINK_LIB)
 
 moc: $(SRCMOC)
 
-tmake:
-	tmake library.pro
+tmake: Makefile.in
+
+Makefile.in: library.pro
+	tmake library.pro -o Makefile.in
 
 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
 
 calendar.o: calendar.cpp \
 		calendar.h
 
 global.o: global.cpp \
 		global.moc
 
 xmlreader.o: xmlreader.cpp \
 		xmlreader.h
 
 mimetype.o: mimetype.cpp \
 		mimetype.h \
 		applnk.h \
 		resource.h \
 		qpeapplication.h \
 		qpedecoration_qws.h \
 		timestring.h
 
 menubutton.o: menubutton.cpp \
 		menubutton.h
 
 network.o: network.cpp \
 		network.moc
 
 networkinterface.o: networkinterface.cpp \
 		networkinterface.h \
 		network.h \
 		config.h
 
-proxies.o: proxies.cpp \
-		proxies.h \
-		config.h \
-		proxiesbase_p.h
-
 filemanager.o: filemanager.cpp \
 		filemanager.h \
 		applnk.h
 
 fontmanager.o: fontmanager.cpp \
 		fontmanager.h
 
 qdawg.o: qdawg.cpp \
 		qdawg.h
 
 datebookmonth.o: datebookmonth.cpp \
 		config.h \
 		datebookmonth.h \
 		calendar.h \
 		timestring.h \
 		datebookdb.h \
 		resource.h \
 		qpeapplication.h \
 		qpedecoration_qws.h
 
 fileselector.o: fileselector.cpp \
 		fileselector.h \
 		filemanager.h \
 		applnk.h \
+		fileselector_p.h \
 		global.h \
 		resource.h \
 		config.h \
 		storage.h \
 		qpemenubar.h \
 		lnkproperties.h \
 		qpeapplication.h \
 		qpedecoration_qws.h \
 		timestring.h \
 		categorymenu.h
 
 imageedit.o: imageedit.cpp \
 		imageedit.h
 
 resource.o: resource.cpp \
 		qpeapplication.h \
 		qpedecoration_qws.h \
 		timestring.h \
 		resource.h \
 		inlinepics_p.h
 
 qpedecoration_qws.o: qpedecoration_qws.cpp \
 		qcopenvelope_qws.h \
 		qpedecoration_qws.h \
 		qpeapplication.h \
 		timestring.h \
 		resource.h \
 		global.h
 
 qcopenvelope_qws.o: qcopenvelope_qws.cpp \
 		qcopenvelope_qws.h \
 		global.h
 
 qpeapplication.o: qpeapplication.cpp \
 		qcopenvelope_qws.h \
 		qpeapplication.h \
 		qpedecoration_qws.h \
 		timestring.h \
 		qpestyle.h \
 		lightstyle.h \
 		global.h \
 		resource.h \
 		config.h \
 		network.h \
 		fontmanager.h \
 		power.h \
 		alarmserver.h \
 		applnk.h \
 		qpemenubar.h
 
 qpestyle.o: qpestyle.cpp \
 		qpestyle.h \
 		qpeapplication.h \
 		qpedecoration_qws.h \
 		timestring.h
 
 qpedialog.o: qpedialog.cpp \
 		qpedialog.h \
 		qpeapplication.h \
 		qpedecoration_qws.h \
 		timestring.h
 
 lightstyle.o: lightstyle.cpp \
 		lightstyle.h
 
 config.o: config.cpp \
 		config.h
 
 applnk.o: applnk.cpp \
 		applnk.h
 
 sound.o: sound.cpp
 
 tzselect.o: tzselect.cpp \
 		tzselect.h \
 		resource.h \
 		global.h \
 		config.h
 
 qmath.o: qmath.c \
 		qmath.h
 
 datebookdb.o: datebookdb.cpp \
 		datebookdb.h
 
 alarmserver.o: alarmserver.cpp \
 		qpeapplication.h \
 		qpedecoration_qws.h \
 		timestring.h \
 		global.h \
 		resource.h \
 		qcopenvelope_qws.h \
 		alarmserver.h
 
 password.o: password.cpp \
 		password.moc \
 		password.h \
 		config.h \
 		global.h \
 		backend/contact.h \
 		passwordbase_p.h
 
 process.o: process.cpp \
 		process.h
 
 process_unix.o: process_unix.cpp \
 		process_unix.moc \
 		process.h
 
 timestring.o: timestring.cpp \
 		timestring.moc \
 		timestring.h \
 		qpeapplication.h \
 		qpedecoration_qws.h \
 		config.h
 
 fontdatabase.o: fontdatabase.cpp \
 		qpeapplication.h \
 		qpedecoration_qws.h \
 		timestring.h \
 		fontfactoryinterface.h \
 		fontdatabase.h
 
 power.o: power.cpp \
-		power.h \
-		custom.h
+		power.h
 
 storage.o: storage.cpp
 
 qpemessagebox.o: qpemessagebox.cpp \
 		qpemessagebox.h
 
 backend/timeconversion.o: backend/timeconversion.cpp \
 		backend/timeconversion.h
 
 qpedebug.o: qpedebug.cpp \
 		qpedebug.h
 
 qpemenubar.o: qpemenubar.cpp \
 		qpemenubar.h
 
 qpetoolbar.o: qpetoolbar.cpp \
 		qpetoolbar.h \
 		qpemenubar.h
 
 backend/categories.o: backend/categories.cpp \
 		backend/categories.h \
 		backend/qpcglobal.h \
 		backend/palmtopuidgen.h \
 		backend/stringutil.h
 
 backend/stringutil.o: backend/stringutil.cpp \
 		backend/stringutil.h \
 		backend/qpcglobal.h
 
 backend/palmtoprecord.o: backend/palmtoprecord.cpp \
 		backend/palmtoprecord.h \
 		backend/qpcglobal.h \
 		backend/palmtopuidgen.h \
 		backend/stringutil.h
 
 backend/task.o: backend/task.cpp \
 		backend/vobject_p.h \
 		backend/timeconversion.h \
 		backend/qfiledirect_p.h
 
 backend/event.o: backend/event.cpp \
 		backend/event.h \
 		backend/qfiledirect_p.h \
 		backend/vobject_p.h
 
 backend/contact.o: backend/contact.cpp \
 		backend/contact.h \
 		backend/vobject_p.h \
 		backend/qfiledirect_p.h
 
 categorymenu.o: categorymenu.cpp \
 		categorymenu.h \
 		backend/categories.h \
 		backend/qpcglobal.h \
 		backend/palmtopuidgen.h \
 		categoryselect.h
 
 categoryedit_p.o: categoryedit_p.cpp \
 		categoryedit_p.h \
 		categoryeditbase_p.h
 
 categoryselect.o: categoryselect.cpp \
 		categorywidget.h \
 		categoryselect.h
 
 categorywidget.o: categorywidget.cpp \
 		categoryedit_p.h \
 		categoryeditbase_p.h \
 		categorywidget.h
 
 ir.o: ir.cpp \
 		ir.h \
 		qcopenvelope_qws.h \
 		applnk.h
 
 backend/vcc_yacc.o: backend/vcc_yacc.cpp \
 		backend/vobject_p.h \
 		backend/qfiledirect_p.h
 
 backend/vobject.o: backend/vobject.cpp \
 		backend/vobject_p.h \
 		backend/qfiledirect_p.h
 
 findwidget_p.o: findwidget_p.cpp \
 		findwidget_p.h \
 		findwidgetbase_p.h
 
 finddialog.o: finddialog.cpp \
 		finddialog.h \
 		findwidget_p.h \
 		findwidgetbase_p.h
 
 lnkproperties.o: lnkproperties.cpp \
 		lnkproperties.h \
 		lnkpropertiesbase_p.h \
 		ir.h
 
-quuid.o: quuid.cpp \
-		quuid.h
-
-qlibrary.o: qlibrary.cpp \
-		qlibrary_p.h \
-		qlibrary.h
-
-qlibrary_unix.o: qlibrary_unix.cpp \
-		qlibrary_p.h \
-		qlibrary.h
-
-qprocess.o: qprocess.cpp \
-		qprocess.h
-
-qprocess_unix.o: qprocess_unix.cpp \
-		qprocess_unix.moc \
-		qprocess.h \
-		qcleanuphandler_p.h
-
 passwordbase_p.h: passwordbase_p.ui
 	$(UIC) passwordbase_p.ui -o $(INTERFACE_DECL_PATH)/passwordbase_p.h
 
 passwordbase_p.cpp: passwordbase_p.ui
 	$(UIC) passwordbase_p.ui -i passwordbase_p.h -o passwordbase_p.cpp
 
-proxiesbase_p.h: proxiesbase_p.ui
-	$(UIC) proxiesbase_p.ui -o $(INTERFACE_DECL_PATH)/proxiesbase_p.h
-
-proxiesbase_p.cpp: proxiesbase_p.ui
-	$(UIC) proxiesbase_p.ui -i proxiesbase_p.h -o proxiesbase_p.cpp
-
 categoryeditbase_p.h: categoryeditbase_p.ui
 	$(UIC) categoryeditbase_p.ui -o $(INTERFACE_DECL_PATH)/categoryeditbase_p.h
 
 categoryeditbase_p.cpp: categoryeditbase_p.ui
 	$(UIC) categoryeditbase_p.ui -i categoryeditbase_p.h -o categoryeditbase_p.cpp
 
 findwidgetbase_p.h: findwidgetbase_p.ui
 	$(UIC) findwidgetbase_p.ui -o $(INTERFACE_DECL_PATH)/findwidgetbase_p.h
 
 findwidgetbase_p.cpp: findwidgetbase_p.ui
 	$(UIC) findwidgetbase_p.ui -i findwidgetbase_p.h -o findwidgetbase_p.cpp
 
 lnkpropertiesbase_p.h: lnkpropertiesbase_p.ui
 	$(UIC) lnkpropertiesbase_p.ui -o $(INTERFACE_DECL_PATH)/lnkpropertiesbase_p.h
 
 lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.ui
 	$(UIC) lnkpropertiesbase_p.ui -i lnkpropertiesbase_p.h -o lnkpropertiesbase_p.cpp
 
 passwordbase_p.o: passwordbase_p.cpp
 
-proxiesbase_p.o: proxiesbase_p.cpp
-
 categoryeditbase_p.o: categoryeditbase_p.cpp
 
 findwidgetbase_p.o: findwidgetbase_p.cpp
 
 lnkpropertiesbase_p.o: lnkpropertiesbase_p.cpp
 
 moc_menubutton.o: moc_menubutton.cpp \
 		menubutton.h
 
-moc_proxies.o: moc_proxies.cpp \
-		proxies.h \
-		config.h
-
 moc_datebookmonth.o: moc_datebookmonth.cpp \
 		datebookmonth.h \
 		calendar.h \
 		timestring.h
 
 moc_fileselector.o: moc_fileselector.cpp \
 		fileselector.h \
 		filemanager.h \
 		applnk.h
 
+moc_fileselector_p.o: moc_fileselector_p.cpp \
+		fileselector_p.h
+
 moc_imageedit.o: moc_imageedit.cpp \
 		imageedit.h
 
 moc_qpedecoration_qws.o: moc_qpedecoration_qws.cpp \
 		qpedecoration_qws.h
 
 moc_qpeapplication.o: moc_qpeapplication.cpp \
 		qpeapplication.h \
 		qpedecoration_qws.h \
 		timestring.h
 
 moc_qpedialog.o: moc_qpedialog.cpp \
 		qpedialog.h
 
 moc_tzselect.o: moc_tzselect.cpp \
 		tzselect.h
 
 moc_process.o: moc_process.cpp \
 		process.h
 
 moc_storage.o: moc_storage.cpp \
 		storage.h
 
 moc_qpemenubar.o: moc_qpemenubar.cpp \
 		qpemenubar.h
 
 moc_qpetoolbar.o: moc_qpetoolbar.cpp \
 		qpetoolbar.h
 
 backend/moc_categories.o: backend/moc_categories.cpp \
 		backend/categories.h \
 		backend/qpcglobal.h \
 		backend/palmtopuidgen.h
 
 moc_categorymenu.o: moc_categorymenu.cpp \
 		categorymenu.h
 
 moc_categoryedit_p.o: moc_categoryedit_p.cpp \
 		categoryedit_p.h \
 		categoryeditbase_p.h
 
 moc_categoryselect.o: moc_categoryselect.cpp \
 		categoryselect.h
 
 moc_ir.o: moc_ir.cpp \
 		ir.h
 
 moc_findwidget_p.o: moc_findwidget_p.cpp \
 		findwidget_p.h \
 		findwidgetbase_p.h
 
 moc_finddialog.o: moc_finddialog.cpp \
 		finddialog.h
 
 moc_lnkproperties.o: moc_lnkproperties.cpp \
 		lnkproperties.h
 
-moc_qlibrary_p.o: moc_qlibrary_p.cpp \
-		qlibrary_p.h \
-		qlibrary.h
-
-moc_qprocess.o: moc_qprocess.cpp \
-		qprocess.h
-
 moc_passwordbase_p.o: global.moc \
 		global.cpp
 
-moc_proxiesbase_p.o: network.moc \
+moc_categoryeditbase_p.o: network.moc \
 		network.cpp
 
-moc_categoryeditbase_p.o: password.moc \
+moc_findwidgetbase_p.o: password.moc \
 		password.cpp \
 		password.h \
 		config.h \
 		global.h \
 		backend/contact.h \
 		passwordbase_p.h
 
-moc_findwidgetbase_p.o: process_unix.moc \
+moc_lnkpropertiesbase_p.o: process_unix.moc \
 		process_unix.cpp \
 		process.h
 
-moc_lnkpropertiesbase_p.o: timestring.moc \
-		timestring.cpp \
-		timestring.h \
-		qpeapplication.h \
-		qpedecoration_qws.h \
-		config.h
-
 moc_menubutton.cpp: menubutton.h
 	$(MOC) menubutton.h -o moc_menubutton.cpp
 
-moc_proxies.cpp: proxies.h
-	$(MOC) proxies.h -o moc_proxies.cpp
-
 moc_datebookmonth.cpp: datebookmonth.h
 	$(MOC) datebookmonth.h -o moc_datebookmonth.cpp
 
 moc_fileselector.cpp: fileselector.h
 	$(MOC) fileselector.h -o moc_fileselector.cpp
 
+moc_fileselector_p.cpp: fileselector_p.h
+	$(MOC) fileselector_p.h -o moc_fileselector_p.cpp
+
 moc_imageedit.cpp: imageedit.h
 	$(MOC) imageedit.h -o moc_imageedit.cpp
 
 moc_qpedecoration_qws.cpp: qpedecoration_qws.h
 	$(MOC) qpedecoration_qws.h -o moc_qpedecoration_qws.cpp
 
 moc_qpeapplication.cpp: qpeapplication.h
 	$(MOC) qpeapplication.h -o moc_qpeapplication.cpp
 
 moc_qpedialog.cpp: qpedialog.h
 	$(MOC) qpedialog.h -o moc_qpedialog.cpp
 
 moc_tzselect.cpp: tzselect.h
 	$(MOC) tzselect.h -o moc_tzselect.cpp
 
 moc_process.cpp: process.h
 	$(MOC) process.h -o moc_process.cpp
 
 moc_storage.cpp: storage.h
 	$(MOC) storage.h -o moc_storage.cpp
 
 moc_qpemenubar.cpp: qpemenubar.h
 	$(MOC) qpemenubar.h -o moc_qpemenubar.cpp
 
 moc_qpetoolbar.cpp: qpetoolbar.h
 	$(MOC) qpetoolbar.h -o moc_qpetoolbar.cpp
 
 backend/moc_categories.cpp: backend/categories.h
 	$(MOC) backend/categories.h -o backend/moc_categories.cpp
 
 moc_categorymenu.cpp: categorymenu.h
 	$(MOC) categorymenu.h -o moc_categorymenu.cpp
 
 moc_categoryedit_p.cpp: categoryedit_p.h
 	$(MOC) categoryedit_p.h -o moc_categoryedit_p.cpp
 
 moc_categoryselect.cpp: categoryselect.h
 	$(MOC) categoryselect.h -o moc_categoryselect.cpp
 
 moc_ir.cpp: ir.h
 	$(MOC) ir.h -o moc_ir.cpp
 
 moc_findwidget_p.cpp: findwidget_p.h
 	$(MOC) findwidget_p.h -o moc_findwidget_p.cpp
 
 moc_finddialog.cpp: finddialog.h
 	$(MOC) finddialog.h -o moc_finddialog.cpp
 
 moc_lnkproperties.cpp: lnkproperties.h
 	$(MOC) lnkproperties.h -o moc_lnkproperties.cpp
 
-moc_qlibrary_p.cpp: qlibrary_p.h
-	$(MOC) qlibrary_p.h -o moc_qlibrary_p.cpp
-
-moc_qprocess.cpp: qprocess.h
-	$(MOC) qprocess.h -o moc_qprocess.cpp
-
 global.moc: global.cpp
 	$(MOC) global.cpp -o global.moc
 
 network.moc: network.cpp
 	$(MOC) network.cpp -o network.moc
 
 password.moc: password.cpp
 	$(MOC) password.cpp -o password.moc
 
 process_unix.moc: process_unix.cpp
 	$(MOC) process_unix.cpp -o process_unix.moc
 
 timestring.moc: timestring.cpp
 	$(MOC) timestring.cpp -o timestring.moc
 
-qprocess_unix.moc: qprocess_unix.cpp
-	$(MOC) qprocess_unix.cpp -o qprocess_unix.moc
-
 moc_passwordbase_p.cpp: passwordbase_p.h
 	$(MOC) passwordbase_p.h -o moc_passwordbase_p.cpp
 
-moc_proxiesbase_p.cpp: proxiesbase_p.h
-	$(MOC) proxiesbase_p.h -o moc_proxiesbase_p.cpp
-
 moc_categoryeditbase_p.cpp: categoryeditbase_p.h
 	$(MOC) categoryeditbase_p.h -o moc_categoryeditbase_p.cpp
 
 moc_findwidgetbase_p.cpp: findwidgetbase_p.h
 	$(MOC) findwidgetbase_p.h -o moc_findwidgetbase_p.cpp
 
 moc_lnkpropertiesbase_p.cpp: lnkpropertiesbase_p.h
 	$(MOC) lnkpropertiesbase_p.h -o moc_lnkpropertiesbase_p.cpp
 
 
diff --git a/library/global.cpp b/library/global.cpp
index e5fc2b3..fd7579a 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -316,329 +316,329 @@ void Global::applyStyle()
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QCopChannel::send( "QPE/System", "applyStyle()" );
 #else
     ((QPEApplication *)qApp)->applyStyle(); // apply without needing QCop for floppy version
 #endif
 }
 
 /*!
   \internal
 */
 QWidget *Global::shutdown( bool )
 {
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QCopChannel::send( "QPE/System", "shutdown()" );
 #endif
     return 0;
 }
 
 /*!
   \internal
 */
 QWidget *Global::restart( bool )
 {
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QCopChannel::send( "QPE/System", "restart()" );
 #endif
     return 0;
 }
 
 /*!
   Explicitly show the current input method.
 */
 void Global::showInputMethod()
 {
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QCopChannel::send( "QPE/TaskBar", "showInputMethod()" );
 #endif
 }
 
 /*!
   Explicitly hide the current input method.
 */
 void Global::hideInputMethod()
 {
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QCopChannel::send( "QPE/TaskBar", "hideInputMethod()" );
 #endif
 }
 
 
 /*!
   \internal
 */
 bool Global::isBuiltinCommand( const QString &name )
 {
     if(!builtin)
 	return FALSE; // yes, it can happen
     for (int i = 0; builtin[i].file; i++) {
 	if ( builtin[i].file == name ) {
 	    return TRUE;
 	}
     }
     return FALSE;
 }
 
 Global::Command* Global::builtin=0;
 QGuardedPtr<QWidget> *Global::running=0;
 
 /*!
   \class Global::Command
   \brief The Global::Command class is internal.
   \internal
 */
 
 /*!
   \internal
 */
 void Global::setBuiltinCommands( Command* list )
 {
     if ( running )
 	delete [] running;
 
     builtin = list;
     int count = 0;
     if (!builtin)
 	return;
     while ( builtin[count].file )
 	count++;
 
     running = new QGuardedPtr<QWidget> [ count ];
 }
 
 /*!
   \internal
 */
 void Global::setDocument( QWidget* receiver, const QString& document )
 {
     Emitter emitter(receiver,document);
 }
 
 /*!
   \internal
 */
 bool Global::terminateBuiltin( const QString& n )
 {
     if (!builtin)
 	return FALSE;
     for (int i = 0; builtin[i].file; i++) {
 	if ( builtin[i].file == n ) {
 	    delete running[i];
 	    return TRUE;
 	}
     }
     return FALSE;
 }
 
 /*!
   \internal
 */
 void Global::terminate( const AppLnk* app )
 {
     //if ( terminateBuiltin(app->exec()) ) return; // maybe? haven't tried this
 
     QCString channel = "QPE/Application/" + app->exec().utf8();
     if ( QCopChannel::isRegistered(channel) ) {
 	QCopEnvelope e(channel, "quit()");
     }
 }
 
 /*!
   Low-level function to run command \a c. Not recommended.
 */
 void Global::invoke(const QString &c) 
 {
     // Convert the command line in to a list of arguments
     QStringList list = QStringList::split(QRegExp("  *"),c);
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QString ap=list[0];
     // see if the application is already running
     // XXX should lock file /tmp/qcop-msg-ap 
     if ( QCopChannel::isRegistered( ("QPE/Application/" + ap).latin1() ) ) {
 	QCopEnvelope e("QPE/System", "notBusy(QString)" );
 	e << ap;
 	return;
     }
     // XXX should unlock file /tmp/qcop-msg-ap 
     //see if it is being started
     if ( StartingAppList::isStarting( ap ) ) {
 	QCopEnvelope e("QPE/System", "notBusy(QString)" );
 	e << ap;
 	return;
     }
 
 #endif
 
 #ifdef QT_NO_QWS_MULTIPROCESS
     QMessageBox::warning( 0, "Error", "Could not find the application " + c, "Ok", 0, 0, 0, 1 );
 #else
 
     QStrList slist;
     unsigned int j;
     for ( j = 0; j < list.count(); j++ )
 	slist.append( list[j].utf8() );
 
     const char **args = new (const char *)[slist.count() + 1];
     for ( j = 0; j < slist.count(); j++ )
 	args[j] = slist.at(j);
     args[j] = NULL;
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     // an attempt to show a wait...
     // more logic should be used, but this will be fine for the moment...
     QCopEnvelope ( "QPE/System", "busy()" );
 #endif
 
 #ifdef HAVE_QUICKEXEC
     QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".so";
     qDebug("libfile = %s", libexe.latin1() );
     if ( QFile::exists( libexe ) ) {
 	qDebug("calling quickexec %s", libexe.latin1() );
 	quickexecv( libexe.utf8().data(), (const char **)args );
     } else 
 #endif
     {
 	if ( !::vfork() ) {
 	    for ( int fd = 3; fd < 100; fd++ )
 		::close( fd );
 	    ::setpgid( ::getpid(), ::getppid() );
 	    // Try bindir first, so that foo/bar works too
 	    ::execv( qpeDir()+"/bin/"+args[0], (char * const *)args );
 	    ::execvp( args[0], (char * const *)args );
-	    exit( -1 );
+	    _exit( -1 );
 	}
     }
     StartingAppList::add( list[0] );
 #endif //QT_NO_QWS_MULTIPROCESS
 }
 
 /*!
   Executes application identfied by \a c, passing \a document.
 
   Note that you might be better off sending a QCop message to
   the application's QPE/Application/<i>appname</i> channel.
 */
 void Global::execute( const QString &c, const QString& document )
 {
     if ( qApp->type() != QApplication::GuiServer ) {
 	// ask the server to do the work
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 	if ( document.isNull() ) {
 	    QCopEnvelope e( "QPE/System", "execute(QString)" );
 	    e << c;
 	} else {
 	    QCopEnvelope e( "QPE/System", "execute(QString,QString)" );
 	    e << c << document;
 	}
 #endif
 	return;
     }
 
     // Attempt to execute the app using a builtin class for the app first
     // else try and find it in the bin directory
     if (builtin) {
 	for (int i = 0; builtin[i].file; i++) {
 	    if ( builtin[i].file == c ) {
 		if ( running[i] ) {
 		    if ( !document.isNull() && builtin[i].documentary )
 			setDocument(running[i], document);
 		    running[i]->raise();
 		    running[i]->show();
 		    running[i]->setActiveWindow();
 		} else {
 		    running[i] = builtin[i].func( builtin[i].maximized );
 		}
 		QCopEnvelope e("QPE/System", "notBusy(QString)" );
 		e << c; // that was quick ;-)
 		return;
 	    }
 	}
     }
 
     //Global::invoke(c, document);
 
     // Convert the command line in to a list of arguments
     QStringList list = QStringList::split(QRegExp("  *"),c);
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QString ap=list[0];
 
     qDebug("executing %s", ap.latin1() );
     if ( ap == "suspend" ) {
 	QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );	
 	return;
     }
 
     /* if need be, sending a qcop message will result in an invoke, see 
        preceeding function */
     { QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); }
     if ( !document.isEmpty() ) {
 	QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "setDocument(QString)" );
 	env << document;
     }
 #endif
 }
 
 /*!
   Returns the string \a s with the characters backslash, ", and $
   quoted by a preceeding backslash.
 */
 QString Global::shellQuote(const QString& s)
 {
     QString r="\"";
     for (int i=0; i<(int)s.length(); i++) {
 	char c = s[i].latin1();
 	switch (c) {
 	    case '\\': case '"': case '$':
 		r+="\\";
 	}
 	r += s[i];
     }
     r += "\"";
     return r;
 }
 
 /*!
   Returns the string \a s with the characters backslash and "
   quoted by a preceeding backslash.
 */
 QString Global::stringQuote(const QString& s)
 {
     QString r="\"";
     for (int i=0; i<(int)s.length(); i++) {
 	char c = s[i].latin1();
 	switch (c) {
 	    case '\\': case '"':
 		r+="\\";
 	}
 	r += s[i];
     }
     r += "\"";
     return r;
 }
 
 /*!
   Finds all documents on the system's document directories which
   match the filter \a mimefilter, and appends the resulting DocLnk
   objects to \a folder.
 */
 void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
 {
     QString homedocs = QString(getenv("HOME")) + "/Documents";
     DocLnkSet d(homedocs,mimefilter);
     folder->appendFrom(d);
     StorageInfo storage;
     const QList<FileSystem> &fs = storage.fileSystems();
     QListIterator<FileSystem> it ( fs );
     for ( ; it.current(); ++it ) {
 	if ( (*it)->isRemovable() ) {
 	    QString path = (*it)->path();
 	    DocLnkSet ide( path, mimefilter );
 	    folder->appendFrom(ide);
 	}
     }
 }
 
 
 
 #include "global.moc"
diff --git a/library/library.pro b/library/library.pro
index 058d216..e71e5a0 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -1,132 +1,130 @@
 TEMPLATE	= lib
 CONFIG		+= qt warn_on release
 HEADERS	=   calendar.h \
 	    global.h \
 	    resource.h \
 	    xmlreader.h \
 	    mimetype.h \
 	    menubutton.h \
 	    network.h \
 	    networkinterface.h \
-	    proxies.h \
 	    filemanager.h \
 	    fontmanager.h \
 	    qdawg.h \
 	    datebookmonth.h \
 	    fileselector.h \
+	    fileselector_p.h \
 	    imageedit.h \
 	    qcopenvelope_qws.h \
 	    qpedecoration_qws.h \
 	    qpeapplication.h \
 	    qpestyle.h \
 	    qpedialog.h \
 	    lightstyle.h \
 	    config.h \
 	    applnk.h \
 	    sound.h \
 	    tzselect.h \
 	    qmath.h \
 	    datebookdb.h \
 	    alarmserver.h \
 	    process.h \
 	    password.h \
 	    timestring.h \
 	    fontfactoryinterface.h \
 	    fontdatabase.h \
 	    power.h \
 	    storage.h \
 	    qpemessagebox.h \
 	backend/timeconversion.h \
 	    qpedebug.h \
 	    qpemenubar.h \
 	    qpetoolbar.h \
 	    backend/categories.h \
 	    backend/stringutil.h \
 	    backend/palmtopuid.h \
 	    backend/palmtoprecord.h \
             backend/task.h \
 	    backend/event.h \
 	    backend/contact.h\
 	    categorymenu.h \
 	    categoryedit_p.h \
 	    categoryselect.h \
 	    categorywidget.h \
 	ir.h \
 	backend/vobject_p.h \
 	findwidget_p.h \
 	finddialog.h \
 	lnkproperties.h
 
 SOURCES	=   calendar.cpp \
 	    global.cpp \
 	    xmlreader.cpp \
 	    mimetype.cpp \
 	    menubutton.cpp \
 	    network.cpp \
 	    networkinterface.cpp \
-	    proxies.cpp \
 	    filemanager.cpp \
 	    fontmanager.cpp \
 	    qdawg.cpp \
 	    datebookmonth.cpp \
 	    fileselector.cpp \
 	    imageedit.cpp \
 	    resource.cpp \
 	    qpedecoration_qws.cpp \
 	    qcopenvelope_qws.cpp \
 	    qpeapplication.cpp \
 	    qpestyle.cpp \
 	    qpedialog.cpp \
 	    lightstyle.cpp \
 	    config.cpp \
 	    applnk.cpp \
 	    sound.cpp \
 	    tzselect.cpp \
 	    qmath.c \
 	    datebookdb.cpp \
 	    alarmserver.cpp \
 	    password.cpp \
 	    process.cpp \
 	    process_unix.cpp \
 	    timestring.cpp \
 	    fontdatabase.cpp \
 	    power.cpp \
 	    storage.cpp \
 	    qpemessagebox.cpp \
             backend/timeconversion.cpp \
 	    qpedebug.cpp \
 	    qpemenubar.cpp \
 	    qpetoolbar.cpp \
 	    backend/categories.cpp \
 	    backend/stringutil.cpp \
 	    backend/palmtoprecord.cpp \
             backend/task.cpp \
 	    backend/event.cpp \
 	    backend/contact.cpp \
 	    categorymenu.cpp \
 	categoryedit_p.cpp \
 	categoryselect.cpp \
 	categorywidget.cpp \
 	ir.cpp \
 	backend/vcc_yacc.cpp \
 	backend/vobject.cpp \
 	findwidget_p.cpp \
 	finddialog.cpp \
 	lnkproperties.cpp
 
 # Qt 3 compatibility
-qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h qprocess.h
-qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp qprocess.cpp \
-	       qprocess_unix.cpp
+qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
+qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include backend
 LIBS		+= -ldl -lcrypt -lm
 
-INTERFACES = passwordbase_p.ui proxiesbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
+INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
 
 TARGET		= qpe
 DESTDIR		= $(QTDIR)/lib$(PROJMAK)
 # This is set by configure$(OPIEDIR).
 VERSION		= 1.5.0
 
 TRANSLATIONS = ../i18n/de/libqpe.ts