Additional k => tde renaming and fixes

64 files changed, 85 insertions, 85 deletions

diff --git a/kamera/kcontrol/Makefile.am b/kamera/kcontrol/Makefile.am
index 9fd30f46..792c0986 100644
--- a/kamera/kcontrol/Makefile.am
+++ b/kamera/kcontrol/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_kamera.la
 kcm_kamera_la_SOURCES = kamera.cpp kameradevice.cpp kameraconfigdialog.cpp
 
 kcm_kamera_la_LDFLAGS  = $(all_libraries) -module $(KDE_PLUGIN)
-kcm_kamera_la_LIBADD = $(LIB_KIO) $(GPHOTO2_LIBS)
+kcm_kamera_la_LIBADD = $(LIB_TDEIO) $(GPHOTO2_LIBS)
 INCLUDES= $(all_includes) $(GPHOTO2_INCS)
 
 kcm_kamera_la_METASOURCES = AUTO
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index 75db64a8..ef1b0a6f 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -187,7 +187,7 @@ bool KCamera::configure()
 
 bool KCamera::test()
 {
-	// TODO: Make testing non-blocking (maybe via KIO?)
+	// TODO: Make testing non-blocking (maybe via TDEIO?)
 	// Currently, a failed serial test times out at about 30 sec.
 	return camera() != 0;
 }
diff --git a/kamera/tdeioslave/Makefile.am b/kamera/tdeioslave/Makefile.am
index ffc4c855..16f9f97c 100644
--- a/kamera/tdeioslave/Makefile.am
+++ b/kamera/tdeioslave/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes) $(GPHOTO2_INCS)
 kde_module_LTLIBRARIES = tdeio_kamera.la
 
 tdeio_kamera_la_SOURCES = kamera.cpp
-tdeio_kamera_la_LIBADD  = $(LIB_KIO) -lgphoto2
+tdeio_kamera_la_LIBADD  = $(LIB_TDEIO) -lgphoto2
 tdeio_kamera_la_LDFLAGS = $(all_libraries) $(GPHOTO2_LIBS) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = kamera.h
diff --git a/kamera/tdeioslave/kamera.cpp b/kamera/tdeioslave/kamera.cpp
index 88228418..96d65e9a 100644
--- a/kamera/tdeioslave/kamera.cpp
+++ b/kamera/tdeioslave/kamera.cpp
@@ -212,7 +212,7 @@ static TQString fix_foldername(TQString ofolder) {
 	return folder;
 }
 
-// The KIO slave "get" function (starts a download from the camera)
+// The TDEIO slave "get" function (starts a download from the camera)
 // The actual returning of the data is done in the frontend callback functions.
 void KameraProtocol::get(const KURL &url)
 {
@@ -368,7 +368,7 @@ void KameraProtocol::get(const KURL &url)
 	m_file = NULL;
 }
 
-// The KIO slave "stat" function.
+// The TDEIO slave "stat" function.
 void KameraProtocol::stat(const KURL &url)
 {
 	kdDebug(7123) << "stat(\"" << url.path() << "\")" << endl;
@@ -495,7 +495,7 @@ void KameraProtocol::statRegular(const KURL &url)
 	finished();
 }
 
-// The KIO slave "del" function.
+// The TDEIO slave "del" function.
 void KameraProtocol::del(const KURL &url, bool isFile)
 {
 	kdDebug(7123) << "KameraProtocol::del(" << url.path() << ")" << endl;
@@ -523,7 +523,7 @@ void KameraProtocol::del(const KURL &url, bool isFile)
 	}
 }
 
-// The KIO slave "listDir" function.
+// The TDEIO slave "listDir" function.
 void KameraProtocol::listDir(const KURL &url)
 {
 	kdDebug(7123) << "KameraProtocol::listDir(" << url.path() << ")" << endl;
@@ -975,7 +975,7 @@ void frontendProgressUpdate(
 	KameraProtocol *object = (KameraProtocol*)data;
 
 	// This code will get the last chunk of data retrieved from the
-	// camera and pass it to KIO, to allow progressive display
+	// camera and pass it to TDEIO, to allow progressive display
 	// of the downloaded photo.
 
 	const char *fileData = NULL;
diff --git a/kcoloredit/Makefile.am b/kcoloredit/Makefile.am
index 874d2cf1..3279e448 100644
--- a/kcoloredit/Makefile.am
+++ b/kcoloredit/Makefile.am
@@ -7,7 +7,7 @@ kcoloredit_SOURCES = kzcolorselector.cpp imageselection.cpp \
 	kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp
 kcoloredit_METASOURCES = AUTO
 kcoloredit_LDADD = $(LIB_TDEUI) $(LIB_TDEFILE)
-kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 rcdir = $(kde_datadir)/kcoloredit
 rc_DATA = kcoloreditui.rc
@@ -15,7 +15,7 @@ rc_DATA = kcoloreditui.rc
 bin_PROGRAMS = kcoloredit kcolorchooser
 kcolorchooser_SOURCES = kcolorchooser.cpp
 kcolorchooser_LDADD = $(LIB_TDEUI)
-kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 noinst_HEADERS = color.h colorselector.h editablestreamhistory.h \
 	gradientselection.h imageselection.h kcoloredit.h kcoloreditdoc.h \
diff --git a/kdvi/Makefile.am b/kdvi/Makefile.am
index ee2c8bc2..0f95f100 100644
--- a/kdvi/Makefile.am
+++ b/kdvi/Makefile.am
@@ -39,7 +39,7 @@ squeeze_SOURCES	= squeeze.c
 KDE_OPTIONS = nofinal
 
 kdvi_SOURCES = main.cpp 
-kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kdvi_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -ltdeparts
 
 ## this option you can leave out. Just, if you use "make dist", you need it
diff --git a/kfax/Makefile.am b/kfax/Makefile.am
index 9bce4fd4..dd5f683e 100644
--- a/kfax/Makefile.am
+++ b/kfax/Makefile.am
@@ -1,4 +1,4 @@
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 LDADD      = $(LIB_TDEFILE) $(LIB_TDEPRINT) -lm
 INCLUDES   = $(all_includes)
 
diff --git a/kfaxview/Makefile.am b/kfaxview/Makefile.am
index d42c6ed9..03073909 100644
--- a/kfaxview/Makefile.am
+++ b/kfaxview/Makefile.am
@@ -12,7 +12,7 @@ METASOURCES = AUTO
 
 bin_PROGRAMS = kfaxview
 kfaxview_SOURCES = main.cpp
-kfaxview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kfaxview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kfaxview_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -ltdeparts
 
 # this is where the desktop file will go
diff --git a/kghostview/Makefile.am b/kghostview/Makefile.am
index eae2dee0..f96f9850 100644
--- a/kghostview/Makefile.am
+++ b/kghostview/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = libkghostviewpart.la
 noinst_LTLIBRARIES = libdscparse.la
 
 libkghostviewlib_la_LDFLAGS = $(all_libraries)
-libkghostviewlib_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint libdscparse.la
+libkghostviewlib_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) -ltdeprint libdscparse.la
 
 libkghostviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 libkghostviewpart_la_LIBADD = libkghostviewlib.la
@@ -28,7 +28,7 @@ libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
 libkghostviewpart_la_SOURCES = part_init.cpp
 
 kghostview_SOURCES = main.cpp
-kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kghostview_LDADD = libkghostviewlib.la
 
 libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined
diff --git a/kiconedit/Makefile.am b/kiconedit/Makefile.am
index 4b58c40c..2ba3505b 100644
--- a/kiconedit/Makefile.am
+++ b/kiconedit/Makefile.am
@@ -11,7 +11,7 @@ kiconedit_SOURCES = utils.cpp main.cpp kiconedit.cpp kicongrid.cpp \
 kiconedit_METASOURCES = AUTO
 
 # the library search path. 
-kiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kiconedit_LDADD = $(LIB_TDEFILE) -ltdeprint
 
 DISTCLEANFILES = *~ .deps/* .libs/*
diff --git a/kmrml/kmrml/Makefile.am b/kmrml/kmrml/Makefile.am
index d1e2d8a2..58af2513 100644
--- a/kmrml/kmrml/Makefile.am
+++ b/kmrml/kmrml/Makefile.am
@@ -9,13 +9,13 @@ LIB_KMRMLSTUFF = $(top_builddir)/kmrml/kmrml/lib/libkmrmlstuff.la
 kde_module_LTLIBRARIES = tdeio_mrml.la libkmrmlpart.la
 
 tdeio_mrml_la_SOURCES = mrml.cpp
-tdeio_mrml_la_LIBADD  = $(LIB_KMRMLSTUFF) $(LIB_KIO)
+tdeio_mrml_la_LIBADD  = $(LIB_KMRMLSTUFF) $(LIB_TDEIO)
 tdeio_mrml_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 libkmrmlpart_la_SOURCES = mrml_part.cpp mrml_view.cpp loader.cpp \
 	mrml_elements.cpp mrml_creator.cpp browser.cpp algorithmdialog.cpp \
 	collectioncombo.cpp algorithmcombo.cpp propertysheet.cpp
-libkmrmlpart_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KPARTS)
+libkmrmlpart_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_TDEPARTS)
 libkmrmlpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
 services_DATA = mrml.protocol mrml_part.desktop
diff --git a/kmrml/kmrml/kcontrol/Makefile.am b/kmrml/kmrml/kcontrol/Makefile.am
index 68a44912..60637449 100644
--- a/kmrml/kmrml/kcontrol/Makefile.am
+++ b/kmrml/kmrml/kcontrol/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_kmrml.la
 
 kcm_kmrml_la_SOURCES = kcmkmrml.cpp mainpage.cpp indexer.cpp serverconfigwidget.ui indexcleaner.cpp
 kcm_kmrml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_kmrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KIO)
+kcm_kmrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_TDEIO)
 INCLUDES= -I$(top_srcdir)/kmrml/kmrml/lib $(all_includes)
  
 kcm_kmrml_la_METASOURCES = AUTO
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index 912658fd..9f5872b9 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -94,7 +94,7 @@ bool Config::sync()
     return notifySlaves;
 
     // This moved to kcontrol/MainPage::save() so we don't have to link against
-    // KIO and need a full TDEApplication instance to work (so that the tiny
+    // TDEIO and need a full TDEApplication instance to work (so that the tiny
     // mrmlsearch binary can also use this class)
     // tell the ioslaves about the new configuration
 //     if ( notifySlaves )
diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp
index 07c4ac46..0f55670f 100644
--- a/kmrml/kmrml/mrml_view.cpp
+++ b/kmrml/kmrml/mrml_view.cpp
@@ -132,7 +132,7 @@ TQPixmap * MrmlView::getPixmap( const KURL& url )
         m_pixmapCache.insert( u, p );
         return m_pixmapCache.find( u );
     }
-    else { // remote url, download with KIO
+    else { // remote url, download with TDEIO
         Loader::self()->requestDownload( url );
     }
 
diff --git a/kmrml/kmrml/server/Makefile.am b/kmrml/kmrml/server/Makefile.am
index 4336a32a..318e8e7f 100644
--- a/kmrml/kmrml/server/Makefile.am
+++ b/kmrml/kmrml/server/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = $(all_includes)
 kded_daemonwatcher_la_SOURCES = watcher.cpp watcher.skel
 # watcher.stub
 kded_daemonwatcher_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_daemonwatcher_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
+kded_daemonwatcher_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)
 
 METASOURCES = AUTO
 
diff --git a/kolourpaint/Makefile.am b/kolourpaint/Makefile.am
index 7cef8ebb..8db35fb2 100644
--- a/kolourpaint/Makefile.am
+++ b/kolourpaint/Makefile.am
@@ -39,7 +39,7 @@ kolourpaint_SOURCES = kolourpaint.cpp \
     kpviewmanager.cpp \
     kpviewscrollablecontainer.cpp \
     kpwidgetmapper.cpp
-kolourpaint_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kolourpaint_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kolourpaint_LDADD = $(LIB_TDEPRINT) \
     cursors/libkolourpaintcursors.la \
     pixmapfx/libkolourpaintpixmapfx.la \
diff --git a/kooka/Makefile.am b/kooka/Makefile.am
index ed0932c1..0a4d2bcf 100644
--- a/kooka/Makefile.am
+++ b/kooka/Makefile.am
@@ -16,8 +16,8 @@ kooka_SOURCES =	main.cpp kooka.cpp kookaview.cpp kookapref.cpp 		\
 		kocrocrad.cpp
 # 		pagesetup.cpp 
 
-kooka_LDADD   = $(LIB_TDEFILE) -ltdeprint -ltdetexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL)
-kooka_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kooka_LDADD   = $(LIB_TDEFILE) -ltdeprint -ltdetexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_TDESPELL)
+kooka_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 INCLUDES         = -I$(top_srcdir)/libkscan $(all_includes) $(LIBSANE_INCLUDES) $(KADMOS_INC)
 
diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp
index 6cc012b3..dc13655f 100644
--- a/kooka/kocrbase.cpp
+++ b/kooka/kocrbase.cpp
@@ -82,8 +82,8 @@ KOCRBase::KOCRBase( TQWidget *parent, KSpellConfig *spellConfig,
     // Layout-Boxes
 
     TDEConfig *konf = TDEGlobal::config ();
-    TDEConfigGroupSaver gs( konf, CFG_OCR_KSPELL );
-    m_userWantsSpellCheck = konf->readBoolEntry(CFG_WANT_KSPELL, true);
+    TDEConfigGroupSaver gs( konf, CFG_OCR_TDESPELL );
+    m_userWantsSpellCheck = konf->readBoolEntry(CFG_WANT_TDESPELL, true);
 
     /* Connect signals which disable the fields and store the configuration */
     connect( this, TQT_SIGNAL( user1Clicked()), this, TQT_SLOT( writeConfig()));
@@ -360,8 +360,8 @@ void KOCRBase::slWantSpellcheck( bool wantIt )
     m_userWantsSpellCheck = wantIt;
 
     TDEConfig *konf = TDEGlobal::config ();
-    TDEConfigGroupSaver gs( konf, CFG_OCR_KSPELL );
-    konf->writeEntry( CFG_WANT_KSPELL, wantIt );
+    TDEConfigGroupSaver gs( konf, CFG_OCR_TDESPELL );
+    konf->writeEntry( CFG_WANT_TDESPELL, wantIt );
 }
 
 /* The End ;) */
diff --git a/kooka/ksaneocr.h b/kooka/ksaneocr.h
index bc6b610e..6b995ad4 100644
--- a/kooka/ksaneocr.h
+++ b/kooka/ksaneocr.h
@@ -34,8 +34,8 @@
 #define CFG_OCR_ENGINE    "ocrEngine"
 #define CFG_OCR_CLEANUP   "unlinkORF"  /* delete orf file? */
 
-#define CFG_OCR_KSPELL    "ocrSpellSettings"
-#define CFG_WANT_KSPELL   "ocrKSpellEnabled"
+#define CFG_OCR_TDESPELL    "ocrSpellSettings"
+#define CFG_WANT_TDESPELL   "ocrKSpellEnabled"
 #define CFG_KS_NOROOTAFFIX  "KSpell_NoRootAffix"
 #define CFG_KS_RUNTOGETHER  "KSpell_RunTogether"
 #define CFG_KS_DICTIONARY   "KSpell_Dictionary"
diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp
index 22f9b06a..9f4ccd89 100644
--- a/kooka/scanpackager.cpp
+++ b/kooka/scanpackager.cpp
@@ -1173,7 +1173,7 @@ void ScanPackager::slotCreateFolder( )
 
    if( ok )
    {
-	 /* KIO create folder goes here */
+	 /* TDEIO create folder goes here */
 
 	 KFileTreeViewItem *it = currentKFileTreeViewItem();
 	 if( it )
diff --git a/kpdf/Makefile.am b/kpdf/Makefile.am
index 73506b4f..187989f7 100644
--- a/kpdf/Makefile.am
+++ b/kpdf/Makefile.am
@@ -18,8 +18,8 @@ kde_module_LTLIBRARIES = libkpdfpart.la
 libkpdfpart_la_SOURCES = dcop.skel error.cpp part.cpp
 libkpdfpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 libkpdfpart_la_LIBADD  = xpdf/xpdf/libxpdf.la conf/libkpdfconf.la \
-                         core/libkpdfcore.la ui/libkpdfui.la $(LIB_KPARTS) \
-                         $(LIB_TDEFILE) $(LIB_TDEPRINT) $(LIB_KUTILS) -lm
+                         core/libkpdfcore.la ui/libkpdfui.la $(LIB_TDEPARTS) \
+                         $(LIB_TDEFILE) $(LIB_TDEPRINT) $(LIB_TDEUTILS) -lm
 
 partdesktopdir   = $(kde_servicesdir)
 partdesktop_DATA = kpdf_part.desktop
diff --git a/kpdf/shell/Makefile.am b/kpdf/shell/Makefile.am
index 8ee058b4..951abe65 100644
--- a/kpdf/shell/Makefile.am
+++ b/kpdf/shell/Makefile.am
@@ -5,8 +5,8 @@ METASOURCES = AUTO
 bin_PROGRAMS = kpdf
 
 kpdf_SOURCES = main.cpp shell.cpp
-kpdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kpdf_LDADD   = $(LIB_KPARTS)
+kpdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kpdf_LDADD   = $(LIB_TDEPARTS)
 
 EXTRA_DIST = kpdf.desktop
 xdg_apps_DATA = kpdf.desktop
diff --git a/kpovmodeler/Makefile.am b/kpovmodeler/Makefile.am
index 18f0e782..82954261 100644
--- a/kpovmodeler/Makefile.am
+++ b/kpovmodeler/Makefile.am
@@ -110,7 +110,7 @@ libkpovmodeler_la_SOURCES = pmpart.cpp pmfactory.cpp \
 	pmpartiface.skel
 
 libkpovmodeler_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined $(LIBFREETYPE_RPATH)
-libkpovmodeler_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KPARTS) $(GLLIB) -lXmu -lXi
+libkpovmodeler_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDEPARTS) $(GLLIB) -lXmu -lXi
 METASOURCES = AUTO
 
 noinst_HEADERS = pmpart.h pmfactory.h pmview.h pmshell.h pmobjectdrag.h \
@@ -227,7 +227,7 @@ libkpovmodelerpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 bin_PROGRAMS = kpovmodeler
 
 kpovmodeler_SOURCES = main.cpp
-kpovmodeler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kpovmodeler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kpovmodeler_LDADD = libkpovmodeler.la
 
 dummy.cpp:
diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h
index d4a66f4a..cd7fa725 100644
--- a/kpovmodeler/pmdockwidget.h
+++ b/kpovmodeler/pmdockwidget.h
@@ -1,6 +1,6 @@
 /* This file is part of the KDE libraries
    Copyright (C) 2000 Max Judin <novaprint@mtu-net.ru>
-   Copyright (C) 2000 Falk Brettschneider <falk@tdevelop.org>
+   Copyright (C) 2000 Falk Brettschneider <falk@kdevelop.org>
    Modified 2002 Andreas Zehender <zehender@kde.org>
 
    This library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
                            ; behavior by Andreas Zehender <zehender@kde.org>
    05/2001 -               : useful patches, bugfixes by Christoph Cullmann <crossfire@babylon2k.de>,
                              Joseph Wenninger <jowenn@bigfoot.com> and  Falk Brettschneider
-   03/2001 - 05/2001       : maintained and enhanced by Falk Brettschneider <falk@tdevelop.org>
+   03/2001 - 05/2001       : maintained and enhanced by Falk Brettschneider <falk@kdevelop.org>
    03/2000                 : class documentation added by Falk Brettschneider <gigafalk@yahoo.com>
    10/1999 - 03/2000       : programmed by Max Judin <novaprint@mtu-net.ru>
 
diff --git a/kruler/Makefile.am b/kruler/Makefile.am
index 72955deb..2a061f3c 100644
--- a/kruler/Makefile.am
+++ b/kruler/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= $(all_includes)
 
 bin_PROGRAMS = kruler
 kruler_METASOURCES = AUTO
-kruler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kruler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kruler_LDADD   = $(LIB_TDEUI)
 kruler_SOURCES = klineal.cpp main.cpp 
 
diff --git a/ksnapshot/Makefile.am b/ksnapshot/Makefile.am
index 50e9b672..5b05ec80 100644
--- a/ksnapshot/Makefile.am
+++ b/ksnapshot/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS= ksnapshot
 
 INCLUDES = -DKSNAPVERSION="\"0.7\"" $(all_includes)
 
-ksnapshot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+ksnapshot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 ksnapshot_LDADD = $(LIB_TDEPRINT)
 
 ksnapshot_SOURCES = ksnapshotiface.skel main.cpp ksnapshot.cpp \
diff --git a/ksvg/test/external/Makefile.am b/ksvg/test/external/Makefile.am
index 49648281..8d9f817b 100644
--- a/ksvg/test/external/Makefile.am
+++ b/ksvg/test/external/Makefile.am
@@ -6,8 +6,8 @@ bin_PROGRAMS = svgdisplay printnodetest
 
 svgdisplay_SOURCES = SVGTestWidget.cc svgdisplay.cc
 svgdisplay_LDADD =  $(LIB_TDECORE) ../../libksvg.la
-svgdisplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+svgdisplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 printnodetest_SOURCES = printnodetest.cpp
 printnodetest_LDADD =  $(LIB_TDECORE) ../../libksvg.la
-printnodetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+printnodetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
diff --git a/kuickshow/src/Makefile.am b/kuickshow/src/Makefile.am
index 4d079960..82207816 100644
--- a/kuickshow/src/Makefile.am
+++ b/kuickshow/src/Makefile.am
@@ -10,7 +10,7 @@ KDE_CXXFLAGS = $(IMLIB_CFLAGS)
 METASOURCES = AUTO
 
 kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kuickshow_la_LIBADD  = $(LIB_TDEPRINT) $(LIB_IMLIB) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+kuickshow_la_LIBADD  = $(LIB_TDEPRINT) $(LIB_IMLIB) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 kuickshow_la_SOURCES =	kuickshow.cpp \
 	aboutwidget.cpp     generalwidget.cpp  kuickconfigdlg.cpp  main.cpp \
 	defaultswidget.cpp  imagewindow.cpp    kuickdata.cpp  \
diff --git a/kview/Makefile.am b/kview/Makefile.am
index 590a0c7b..6eaa0289 100644
--- a/kview/Makefile.am
+++ b/kview/Makefile.am
@@ -12,7 +12,7 @@ noinst_HEADERS = kview.h
 
 kview_la_SOURCES = kview.cpp main.cpp
 kview_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
-kview_la_LIBADD = $(LIB_KPARTS) $(LIB_KUTILS)
+kview_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUTILS)
 
 xdg_apps_DATA = kview.desktop
 
diff --git a/kview/config/plugins/Makefile.am b/kview/config/plugins/Makefile.am
index 239504dd..61046180 100644
--- a/kview/config/plugins/Makefile.am
+++ b/kview/config/plugins/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = kviewpluginsconfig.h
 
 kcm_kviewpluginsconfig_la_SOURCES = kviewpluginsconfig.cpp
 kcm_kviewpluginsconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kcm_kviewpluginsconfig_la_LIBADD = $(LIB_KUTILS)
+kcm_kviewpluginsconfig_la_LIBADD = $(LIB_TDEUTILS)
 
 kcm_kviewpluginsconfig_DATA = kviewpluginsconfig.desktop
 kcm_kviewpluginsconfigdir = $(kde_servicesdir)/tdeconfiguredialog
diff --git a/kview/kimageviewer/Makefile.am b/kview/kimageviewer/Makefile.am
index c451ac33..04773787 100644
--- a/kview/kimageviewer/Makefile.am
+++ b/kview/kimageviewer/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = canvas.h viewer.h
 
 libkimageviewer_la_SOURCES = canvas.cpp viewer.cpp
 libkimageviewer_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:0
-libkimageviewer_la_LIBADD  = $(LIB_KPARTS)
+libkimageviewer_la_LIBADD  = $(LIB_TDEPARTS)
 
 INCLUDES = $(all_includes)
 
diff --git a/kview/kviewcanvas/Makefile.am b/kview/kviewcanvas/Makefile.am
index 8b6da0cc..0956d50a 100644
--- a/kview/kviewcanvas/Makefile.am
+++ b/kview/kviewcanvas/Makefile.am
@@ -7,7 +7,7 @@ noinst_HEADERS = kimageholder.h kimagecanvas.h
 
 libkviewcanvas_la_SOURCES = kimageholder.cpp kimagecanvas.cpp
 libkviewcanvas_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version
-libkviewcanvas_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEPRINT) $(LIB_KUTILS) \
+libkviewcanvas_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEPRINT) $(LIB_TDEUTILS) \
                            $(top_builddir)/kview/kimageviewer/libkimageviewer.la
 
 METASOURCES = AUTO
diff --git a/kview/kviewcanvas/test/Makefile.am b/kview/kviewcanvas/test/Makefile.am
index 277bfd48..29ddd36b 100644
--- a/kview/kviewcanvas/test/Makefile.am
+++ b/kview/kviewcanvas/test/Makefile.am
@@ -5,5 +5,5 @@ METASOURCES = AUTO
 check_PROGRAMS = test
 
 test_SOURCES = main.cpp test.cpp
-test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-test_LDADD   = $(LIB_KPARTS) $(top_builddir)/kview/kimageviewer/libkimageviewer.la
+test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test_LDADD   = $(LIB_TDEPARTS) $(top_builddir)/kview/kimageviewer/libkimageviewer.la
diff --git a/kview/kviewviewer/Makefile.am b/kview/kviewviewer/Makefile.am
index 363bac5c..e647e3ce 100644
--- a/kview/kviewviewer/Makefile.am
+++ b/kview/kviewviewer/Makefile.am
@@ -7,7 +7,7 @@ noinst_HEADERS = kviewkonqextension.h kviewviewer.h
 
 libkviewviewer_la_SOURCES = printimagesettings.ui imagesettings.cpp kviewkonqextension.cpp kviewviewer.cpp
 libkviewviewer_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
-libkviewviewer_la_LIBADD = $(LIB_TDEPRINT) $(LIB_KUTILS) \
+libkviewviewer_la_LIBADD = $(LIB_TDEPRINT) $(LIB_TDEUTILS) \
                            $(top_builddir)/kview/kimageviewer/libkimageviewer.la
 
 METASOURCES = AUTO
diff --git a/kview/kviewviewer/config/Makefile.am b/kview/kviewviewer/config/Makefile.am
index dfa55d4c..b8e5b491 100644
--- a/kview/kviewviewer/config/Makefile.am
+++ b/kview/kviewviewer/config/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = kviewviewerpluginsconfig.h
 
 kcm_kviewviewerpluginsconfig_la_SOURCES = kviewviewerpluginsconfig.cpp
 kcm_kviewviewerpluginsconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kcm_kviewviewerpluginsconfig_la_LIBADD = $(LIB_KUTILS)
+kcm_kviewviewerpluginsconfig_la_LIBADD = $(LIB_TDEUTILS)
 
 kcm_kviewviewerpluginsconfig_DATA = kviewviewerpluginsconfig.desktop
 kcm_kviewviewerpluginsconfigdir = $(kde_servicesdir)/tdeconfiguredialog
diff --git a/kview/kviewviewer/test/Makefile.am b/kview/kviewviewer/test/Makefile.am
index 197e9cea..166ce9ee 100644
--- a/kview/kviewviewer/test/Makefile.am
+++ b/kview/kviewviewer/test/Makefile.am
@@ -5,5 +5,5 @@ METASOURCES = AUTO
 check_PROGRAMS = test
 
 test_SOURCES = main.cpp test.cpp
-test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-test_LDADD   = $(LIB_KPARTS)
+test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+test_LDADD   = $(LIB_TDEPARTS)
diff --git a/kview/modules/browser/Makefile.am b/kview/modules/browser/Makefile.am
index e62d866c..d4734e2b 100644
--- a/kview/modules/browser/Makefile.am
+++ b/kview/modules/browser/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes)
 kde_module_LTLIBRARIES = kview_browserplugin.la
 
 kview_browserplugin_la_SOURCES = kmyfileitemlist.cpp kviewbrowser.cpp
-kview_browserplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint
+kview_browserplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) -ltdeprint
 kview_browserplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 plugdir   = $(kde_datadir)/kviewviewer/kpartplugins
diff --git a/kview/modules/effects/Makefile.am b/kview/modules/effects/Makefile.am
index 2d6052f8..99d60771 100644
--- a/kview/modules/effects/Makefile.am
+++ b/kview/modules/effects/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes)
 kde_module_LTLIBRARIES = kview_effectsplugin.la
 
 kview_effectsplugin_la_SOURCES = kvieweffects.cpp
-kview_effectsplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint
+kview_effectsplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) -ltdeprint
 kview_effectsplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 plugdir   = $(kde_datadir)/kview/kpartplugins
diff --git a/kview/modules/presenter/Makefile.am b/kview/modules/presenter/Makefile.am
index 905bd1fc..f9393164 100644
--- a/kview/modules/presenter/Makefile.am
+++ b/kview/modules/presenter/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes)
 kde_module_LTLIBRARIES = kview_presenterplugin.la
 
 kview_presenterplugin_la_SOURCES = imagelistitem.cpp imagelistdialog.ui kviewpresenter.cpp
-kview_presenterplugin_la_LIBADD = $(LIB_KIO) $(LIB_KPARTS)
+kview_presenterplugin_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEPARTS)
 kview_presenterplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 plugdir   = $(kde_datadir)/kview/kpartplugins
diff --git a/kview/modules/presenter/config/Makefile.am b/kview/modules/presenter/config/Makefile.am
index 88d3d479..a478b393 100644
--- a/kview/modules/presenter/config/Makefile.am
+++ b/kview/modules/presenter/config/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = kviewpresenterconfig.h
 
 kcm_kviewpresenterconfig_la_SOURCES = kviewpresenterconfig.cpp
 kcm_kviewpresenterconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kcm_kviewpresenterconfig_la_LIBADD = $(LIB_KUTILS)
+kcm_kviewpresenterconfig_la_LIBADD = $(LIB_TDEUTILS)
 
 kcm_kviewpresenterconfig_DATA = kviewpresenterconfig.desktop
 kcm_kviewpresenterconfigdir = $(kde_servicesdir)/tdeconfiguredialog
diff --git a/kview/modules/scale/Makefile.am b/kview/modules/scale/Makefile.am
index e64c30d3..1a14c8e7 100644
--- a/kview/modules/scale/Makefile.am
+++ b/kview/modules/scale/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes)
 kde_module_LTLIBRARIES = kview_scale.la
 
 kview_scale_la_SOURCES = kfloatspinbox.cpp scaledlg.cpp kview_scale.cpp
-kview_scale_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint
+kview_scale_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) -ltdeprint
 kview_scale_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 plugdir   = $(kde_datadir)/kviewviewer/kpartplugins
diff --git a/kview/modules/scanner/Makefile.am b/kview/modules/scanner/Makefile.am
index ec7a9eb9..f32eb057 100644
--- a/kview/modules/scanner/Makefile.am
+++ b/kview/modules/scanner/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes)
 kde_module_LTLIBRARIES = kview_scannerplugin.la
 
 kview_scannerplugin_la_SOURCES = kviewscanner.cpp
-kview_scannerplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint
+kview_scannerplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) -ltdeprint
 kview_scannerplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 plugdir   = $(kde_datadir)/kview/kpartplugins
diff --git a/kview/modules/template/Makefile.am b/kview/modules/template/Makefile.am
index fa68246e..8815250f 100644
--- a/kview/modules/template/Makefile.am
+++ b/kview/modules/template/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes)
 kde_module_LTLIBRARIES = kview_templateplugin.la
 
 kview_templateplugin_la_SOURCES = kviewtemplate.cpp
-kview_templateplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) -ltdeprint
+kview_templateplugin_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) -ltdeprint
 kview_templateplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 plugdir   = $(kde_datadir)/kview/kpartplugins
diff --git a/kview/photobook/Makefile.am b/kview/photobook/Makefile.am
index 585c4a01..d3689704 100644
--- a/kview/photobook/Makefile.am
+++ b/kview/photobook/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libphotobook.la
 libphotobook_la_SOURCES = photobook.cpp
 
 libphotobook_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libphotobook_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS)
+libphotobook_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEPARTS)
 
 partrcdir = $(kde_servicesdir)
 partrc_DATA = photobook.desktop
diff --git a/kviewshell/Makefile.am b/kviewshell/Makefile.am
index 136a4177..cc24ee95 100644
--- a/kviewshell/Makefile.am
+++ b/kviewshell/Makefile.am
@@ -39,7 +39,7 @@ emptymultipagepart_la_LIBADD = -ltdeparts libtdemultipage.la
 libkviewshell_la_SOURCES = kviewshell.cpp
 
 kviewshell_SOURCES = main.cpp
-kviewshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kviewshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kviewshell_LDADD = libkviewshell.la ./libifaces.la -ltdeparts
 
 kviewshellinclude_HEADERS = anchor.h bookmark.h pageView.h documentPageCache.h documentRenderer.h documentWidget.h \
diff --git a/kviewshell/tdemultipage.h b/kviewshell/tdemultipage.h
index 1e0910ee..c1402809 100644
--- a/kviewshell/tdemultipage.h
+++ b/kviewshell/tdemultipage.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
-#ifndef _KMULTIPAGE_H
-#define _KMULTIPAGE_H
+#ifndef _TDEMULTIPAGE_H
+#define _TDEMULTIPAGE_H
 
 #include "pageView.h"
 #include "documentPageCache.h"
@@ -405,7 +405,7 @@ public slots:
      currently selected text, if there is any. */
   virtual void findPrevText();
 
-  /** Opens a file requestor and starts a basic copy KIO-Job. A
+  /** Opens a file requestor and starts a basic copy TDEIO-Job. A
       multipage implementation that wishes to offer saving in various
       formats must re-implement this slot. */
   virtual void slotSave();
diff --git a/tdefile-plugins/bmp/Makefile.am b/tdefile-plugins/bmp/Makefile.am
index f8f70112..e791ffa7 100644
--- a/tdefile-plugins/bmp/Makefile.am
+++ b/tdefile-plugins/bmp/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_bmp.la
 
 tdefile_bmp_la_SOURCES = tdefile_bmp.cpp 
 tdefile_bmp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_bmp_la_LIBADD = $(LIB_KSYCOCA)
+tdefile_bmp_la_LIBADD = $(LIB_TDESYCOCA)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/dds/Makefile.am b/tdefile-plugins/dds/Makefile.am
index ce77c9c3..b0aaac11 100644
--- a/tdefile-plugins/dds/Makefile.am
+++ b/tdefile-plugins/dds/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_dds.la
 
 tdefile_dds_la_SOURCES = tdefile_dds.cpp 
 tdefile_dds_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_dds_la_LIBADD = $(LIB_KSYCOCA)
+tdefile_dds_la_LIBADD = $(LIB_TDESYCOCA)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/dvi/Makefile.am b/tdefile-plugins/dvi/Makefile.am
index 116d7a0d..0b8d40f5 100644
--- a/tdefile-plugins/dvi/Makefile.am
+++ b/tdefile-plugins/dvi/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_dvi.la
 
 tdefile_dvi_la_SOURCES = tdefile_dvi.cpp
 tdefile_dvi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_dvi_la_LIBADD = $(LIB_KIO)
+tdefile_dvi_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/exr/Makefile.am b/tdefile-plugins/exr/Makefile.am
index 8df4ed64..b11ad542 100644
--- a/tdefile-plugins/exr/Makefile.am
+++ b/tdefile-plugins/exr/Makefile.am
@@ -13,7 +13,7 @@ kde_module_LTLIBRARIES = tdefile_exr.la
 
 tdefile_exr_la_SOURCES = tdefile_exr.cpp
 tdefile_exr_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_exr_la_LIBADD = $(LIB_KIO) $(LIB_EXR)
+tdefile_exr_la_LIBADD = $(LIB_TDEIO) $(LIB_EXR)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/gif/Makefile.am b/tdefile-plugins/gif/Makefile.am
index d6f8d82c..321b535e 100644
--- a/tdefile-plugins/gif/Makefile.am
+++ b/tdefile-plugins/gif/Makefile.am
@@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = tdefile_gif.la
 
 tdefile_gif_la_SOURCES = tdefile_gif.cpp
 tdefile_gif_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_gif_la_LIBADD = $(LIB_KIO)
+tdefile_gif_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/ico/Makefile.am b/tdefile-plugins/ico/Makefile.am
index e95cf924..f428c7c4 100644
--- a/tdefile-plugins/ico/Makefile.am
+++ b/tdefile-plugins/ico/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_ico.la
 
 tdefile_ico_la_SOURCES = tdefile_ico.cpp 
 tdefile_ico_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_ico_la_LIBADD = $(LIB_KSYCOCA)
+tdefile_ico_la_LIBADD = $(LIB_TDESYCOCA)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/jpeg/Makefile.am b/tdefile-plugins/jpeg/Makefile.am
index 76e9e32d..842c0d77 100644
--- a/tdefile-plugins/jpeg/Makefile.am
+++ b/tdefile-plugins/jpeg/Makefile.am
@@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = tdefile_jpeg.la
 
 tdefile_jpeg_la_SOURCES = tdefile_jpeg.cpp exif.cpp tdefile_setcomment.cpp
 tdefile_jpeg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_jpeg_la_LIBADD = $(LIB_KIO)
+tdefile_jpeg_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/pcx/Makefile.am b/tdefile-plugins/pcx/Makefile.am
index 18249bc6..29577397 100644
--- a/tdefile-plugins/pcx/Makefile.am
+++ b/tdefile-plugins/pcx/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = tdefile_pcx.la
 
 tdefile_pcx_la_SOURCES = tdefile_pcx.cpp
 tdefile_pcx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_pcx_la_LIBADD = $(LIB_KIO) $(LIBTIFF)
+tdefile_pcx_la_LIBADD = $(LIB_TDEIO) $(LIBTIFF)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/pdf/Makefile.am b/tdefile-plugins/pdf/Makefile.am
index a6f38115..023de064 100644
--- a/tdefile-plugins/pdf/Makefile.am
+++ b/tdefile-plugins/pdf/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_pdf.la
 
 tdefile_pdf_la_SOURCES = tdefile_pdf.cpp
 tdefile_pdf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_pdf_la_LIBADD = $(LIB_KIO) -L$(top_builddir)/tdefile-plugins/dependencies/poppler-tqt/ -lpoppler-tqt
+tdefile_pdf_la_LIBADD = $(LIB_TDEIO) -L$(top_builddir)/tdefile-plugins/dependencies/poppler-tqt/ -lpoppler-tqt
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/png/Makefile.am b/tdefile-plugins/png/Makefile.am
index 7ce05e86..16e9e7b3 100644
--- a/tdefile-plugins/png/Makefile.am
+++ b/tdefile-plugins/png/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_png.la
 
 tdefile_png_la_SOURCES = tdefile_png.cpp
 tdefile_png_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_png_la_LIBADD = $(LIB_KIO)
+tdefile_png_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/pnm/Makefile.am b/tdefile-plugins/pnm/Makefile.am
index f2d9e75e..0f2ad250 100644
--- a/tdefile-plugins/pnm/Makefile.am
+++ b/tdefile-plugins/pnm/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_pnm.la
 
 tdefile_pnm_la_SOURCES = tdefile_pnm.cpp
 tdefile_pnm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_pnm_la_LIBADD = $(LIB_KIO)
+tdefile_pnm_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/ps/Makefile.am b/tdefile-plugins/ps/Makefile.am
index 7e7943c6..908bc3d1 100644
--- a/tdefile-plugins/ps/Makefile.am
+++ b/tdefile-plugins/ps/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_ps.la gsthumbnail.la
 
 tdefile_ps_la_SOURCES = tdefile_ps.cpp
 tdefile_ps_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_ps_la_LIBADD = $(LIB_KIO) ../../kghostview/libdscparse.la
+tdefile_ps_la_LIBADD = $(LIB_TDEIO) ../../kghostview/libdscparse.la
 
 gsthumbnail_la_SOURCES = gscreator.cpp
 gsthumbnail_la_LIBADD = $(LIB_TDECORE) ../../kghostview/libdscparse.la
diff --git a/tdefile-plugins/raw/Makefile.am b/tdefile-plugins/raw/Makefile.am
index 196aa4bd..7fb828b8 100644
--- a/tdefile-plugins/raw/Makefile.am
+++ b/tdefile-plugins/raw/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = kcamerarawplugin.h
 kde_module_LTLIBRARIES = tdefile_raw.la
 
 tdefile_raw_la_SOURCES = kcamerarawplugin.cpp parse.c
-tdefile_raw_la_LIBADD = $(LIB_KIO) 
+tdefile_raw_la_LIBADD = $(LIB_TDEIO) 
 tdefile_raw_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 # let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/rgb/Makefile.am b/tdefile-plugins/rgb/Makefile.am
index aab98d29..a8f828ba 100644
--- a/tdefile-plugins/rgb/Makefile.am
+++ b/tdefile-plugins/rgb/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_rgb.la
 
 tdefile_rgb_la_SOURCES = tdefile_rgb.cpp
 tdefile_rgb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_rgb_la_LIBADD = $(LIB_KSYCOCA)
+tdefile_rgb_la_LIBADD = $(LIB_TDESYCOCA)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/tga/Makefile.am b/tdefile-plugins/tga/Makefile.am
index 5aad4b7e..63d23235 100644
--- a/tdefile-plugins/tga/Makefile.am
+++ b/tdefile-plugins/tga/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_tga.la
 
 tdefile_tga_la_SOURCES = tdefile_tga.cpp 
 tdefile_tga_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_tga_la_LIBADD = $(LIB_KSYCOCA)
+tdefile_tga_la_LIBADD = $(LIB_TDESYCOCA)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/tiff/Makefile.am b/tdefile-plugins/tiff/Makefile.am
index 9807a66c..4de97159 100644
--- a/tdefile-plugins/tiff/Makefile.am
+++ b/tdefile-plugins/tiff/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = tdefile_tiff.la
 
 tdefile_tiff_la_SOURCES = tdefile_tiff.cpp
 tdefile_tiff_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_tiff_la_LIBADD = $(LIB_KIO) $(LIBTIFF)
+tdefile_tiff_la_LIBADD = $(LIB_TDEIO) $(LIBTIFF)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/xbm/Makefile.am b/tdefile-plugins/xbm/Makefile.am
index 90abdc8e..fc4cf3c3 100644
--- a/tdefile-plugins/xbm/Makefile.am
+++ b/tdefile-plugins/xbm/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_xbm.la
 
 tdefile_xbm_la_SOURCES = tdefile_xbm.cpp 
 tdefile_xbm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_xbm_la_LIBADD = $(LIB_KSYCOCA)
+tdefile_xbm_la_LIBADD = $(LIB_TDESYCOCA)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/xpm/Makefile.am b/tdefile-plugins/xpm/Makefile.am
index 3a32555e..4c8e5fe2 100644
--- a/tdefile-plugins/xpm/Makefile.am
+++ b/tdefile-plugins/xpm/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = tdefile_xpm.la
 
 tdefile_xpm_la_SOURCES = tdefile_xpm.cpp
 tdefile_xpm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_xpm_la_LIBADD = $(LIB_KIO)
+tdefile_xpm_la_LIBADD = $(LIB_TDEIO)
 tdefile_xpm_la_METASOURCES = tdefile_xpm.moc
 
 # let automoc handle all of the meta source files (moc)