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
@@ -33,3 +33,2 @@ HEADERS =	calendar.h \
                 networkinterface.h \
-                proxies.h \
                 filemanager.h \
@@ -39,2 +38,3 @@ HEADERS =	calendar.h \
                 fileselector.h \
+                fileselector_p.h \
                 imageedit.h \
@@ -80,8 +80,3 @@ HEADERS =	calendar.h \
                 finddialog.h \
-                lnkproperties.h \
-                quuid.h \
-                qcom.h \
-                qlibrary.h \
-                qlibrary_p.h \
-                qprocess.h
+                lnkproperties.h
         SOURCES =calendar.cpp \
@@ -93,3 +88,2 @@ SOURCES =	calendar.cpp \
                 networkinterface.cpp \
-                proxies.cpp \
                 filemanager.cpp \
@@ -141,8 +135,3 @@ SOURCES =	calendar.cpp \
                 finddialog.cpp \
-                lnkproperties.cpp \
-                quuid.cpp \
-                qlibrary.cpp \
-                qlibrary_unix.cpp \
-                qprocess.cpp \
-                qprocess_unix.cpp
+                lnkproperties.cpp
         OBJECTS =calendar.o \
@@ -154,3 +143,2 @@ OBJECTS =	calendar.o \
                 networkinterface.o \
-                proxies.o \
                 filemanager.o \
@@ -203,9 +191,3 @@ OBJECTS =	calendar.o \
                 lnkproperties.o \
-                quuid.o \
-                qlibrary.o \
-                qlibrary_unix.o \
-                qprocess.o \
-                qprocess_unix.o \
                 passwordbase_p.o \
-                proxiesbase_p.o \
                 categoryeditbase_p.o \
@@ -214,3 +196,2 @@ OBJECTS =	calendar.o \
 INTERFACES =    passwordbase_p.ui \
-                proxiesbase_p.ui \
                 categoryeditbase_p.ui \
@@ -219,3 +200,2 @@ INTERFACES =    passwordbase_p.ui \
 UICDECLS =      passwordbase_p.h \
-                proxiesbase_p.h \
                 categoryeditbase_p.h \
@@ -224,3 +204,2 @@ UICDECLS =      passwordbase_p.h \
 UICIMPLS =      passwordbase_p.cpp \
-                proxiesbase_p.cpp \
                 categoryeditbase_p.cpp \
@@ -229,5 +208,5 @@ UICIMPLS =      passwordbase_p.cpp \
         SRCMOC  =moc_menubutton.cpp \
-                moc_proxies.cpp \
                 moc_datebookmonth.cpp \
                 moc_fileselector.cpp \
+                moc_fileselector_p.cpp \
                 moc_imageedit.cpp \
@@ -249,4 +228,2 @@ SRCMOC	=	moc_menubutton.cpp \
                 moc_lnkproperties.cpp \
-                moc_qlibrary_p.cpp \
-                moc_qprocess.cpp \
                 global.moc \
@@ -256,5 +233,3 @@ SRCMOC	=	moc_menubutton.cpp \
                 timestring.moc \
-                qprocess_unix.moc \
                 moc_passwordbase_p.cpp \
-                moc_proxiesbase_p.cpp \
                 moc_categoryeditbase_p.cpp \
@@ -263,5 +238,5 @@ SRCMOC	=	moc_menubutton.cpp \
         OBJMOC  =moc_menubutton.o \
-                moc_proxies.o \
                 moc_datebookmonth.o \
                 moc_fileselector.o \
+                moc_fileselector_p.o \
                 moc_imageedit.o \
@@ -283,6 +258,3 @@ OBJMOC	=	moc_menubutton.o \
                 moc_lnkproperties.o \
-                moc_qlibrary_p.o \
-                moc_qprocess.o \
                 moc_passwordbase_p.o \
-                moc_proxiesbase_p.o \
                 moc_categoryeditbase_p.o \
@@ -321,4 +293,6 @@ moc: $(SRCMOC)
 
-tmake:
-        tmake library.pro
+tmake: Makefile.in
+
+Makefile.in: library.pro
+        tmake library.pro -o Makefile.in
 
@@ -383,7 +357,2 @@ networkinterface.o: networkinterface.cpp \
 
-proxies.o: proxies.cpp \
-                proxies.h \
-                config.h \
-                proxiesbase_p.h
-
 filemanager.o: filemanager.cpp \
@@ -412,2 +381,3 @@ fileselector.o: fileselector.cpp \
                 applnk.h \
+                fileselector_p.h \
                 global.h \
@@ -536,4 +506,3 @@ fontdatabase.o: fontdatabase.cpp \
 power.o: power.cpp \
-                power.h \
-                custom.h
+                power.h
 
@@ -635,21 +604,2 @@ lnkproperties.o: lnkproperties.cpp \
 
-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
@@ -660,8 +610,2 @@ passwordbase_p.cpp: passwordbase_p.ui
 
-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
@@ -686,4 +630,2 @@ passwordbase_p.o: passwordbase_p.cpp
 
-proxiesbase_p.o: proxiesbase_p.cpp
-
 categoryeditbase_p.o: categoryeditbase_p.cpp
@@ -697,6 +639,2 @@ moc_menubutton.o: moc_menubutton.cpp \
 
-moc_proxies.o: moc_proxies.cpp \
-                proxies.h \
-                config.h
-
 moc_datebookmonth.o: moc_datebookmonth.cpp \
@@ -711,2 +649,5 @@ moc_fileselector.o: moc_fileselector.cpp \
 
+moc_fileselector_p.o: moc_fileselector_p.cpp \
+                fileselector_p.h
+
 moc_imageedit.o: moc_imageedit.cpp \
@@ -768,9 +709,2 @@ moc_lnkproperties.o: moc_lnkproperties.cpp \
 
-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 \
@@ -778,6 +712,6 @@ moc_passwordbase_p.o: global.moc \
 
-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 \
@@ -789,3 +723,3 @@ moc_categoryeditbase_p.o: password.moc \
 
-moc_findwidgetbase_p.o: process_unix.moc \
+moc_lnkpropertiesbase_p.o: process_unix.moc \
                 process_unix.cpp \
@@ -793,9 +727,2 @@ moc_findwidgetbase_p.o: process_unix.moc \
 
-moc_lnkpropertiesbase_p.o: timestring.moc \
-                timestring.cpp \
-                timestring.h \
-                qpeapplication.h \
-                qpedecoration_qws.h \
-                config.h
-
 moc_menubutton.cpp: menubutton.h
@@ -803,5 +730,2 @@ moc_menubutton.cpp: menubutton.h
 
-moc_proxies.cpp: proxies.h
-        $(MOC) proxies.h -o moc_proxies.cpp
-
 moc_datebookmonth.cpp: datebookmonth.h
@@ -812,2 +736,5 @@ moc_fileselector.cpp: fileselector.h
 
+moc_fileselector_p.cpp: fileselector_p.h
+        $(MOC) fileselector_p.h -o moc_fileselector_p.cpp
+
 moc_imageedit.cpp: imageedit.h
@@ -863,8 +790,2 @@ moc_lnkproperties.cpp: lnkproperties.h
 
-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
@@ -884,5 +805,2 @@ timestring.moc: timestring.cpp
 
-qprocess_unix.moc: qprocess_unix.cpp
-        $(MOC) qprocess_unix.cpp -o qprocess_unix.moc
-
 moc_passwordbase_p.cpp: passwordbase_p.h
@@ -890,5 +808,2 @@ moc_passwordbase_p.cpp: passwordbase_p.h
 
-moc_proxiesbase_p.cpp: proxiesbase_p.h
-        $(MOC) proxiesbase_p.h -o moc_proxiesbase_p.cpp
-
 moc_categoryeditbase_p.cpp: categoryeditbase_p.h
diff --git a/library/global.cpp b/library/global.cpp
index e5fc2b3..fd7579a 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -507,3 +507,3 @@ void Global::invoke(const QString &c)
             ::execvp( args[0], (char * const *)args );
-            exit( -1 );
+            _exit( -1 );
         }
diff --git a/library/library.pro b/library/library.pro
index 058d216..e71e5a0 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -10,3 +10,2 @@ HEADERS	=   calendar.h \
             networkinterface.h \
-            proxies.h \
             filemanager.h \
@@ -16,2 +15,3 @@ HEADERS	=   calendar.h \
             fileselector.h \
+            fileselector_p.h \
             imageedit.h \
@@ -66,3 +66,2 @@ SOURCES	=   calendar.cpp \
             networkinterface.cpp \
-            proxies.cpp \
             filemanager.cpp \
@@ -117,5 +116,4 @@ SOURCES	=   calendar.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
 
@@ -124,3 +122,3 @@ 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