6 files changed, 16 insertions, 16 deletions
diff --git a/parts/documentation/interfaces/Makefile.am b/parts/documentation/interfaces/Makefile.am
index 6e66b46c..cd68e6f3 100644
--- a/parts/documentation/interfaces/Makefile.am
+++ b/parts/documentation/interfaces/Makefile.am
@@ -10,7 +10,7 @@ partincludedir_HEADERS = kdevdocumentationplugin.h
 servicetypedir = $(kde_servicetypesdir)
 servicetype_DATA = tdevelopdocumentationplugins.desktop
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces
 DOXYGEN_PROJECTNAME = KDevelop Documentation Part Interfaces Library
 DOXYGEN_DOCDIRPREFIX = kdevdoc
 include ../../../Doxyfile.am
diff --git a/parts/documentation/protocols/chm/CMakeLists.txt b/parts/documentation/protocols/chm/CMakeLists.txt
index 3a7ae935..c444c226 100644
--- a/parts/documentation/protocols/chm/CMakeLists.txt
+++ b/parts/documentation/protocols/chm/CMakeLists.txt
@@ -30,9 +30,9 @@ install( FILES
   DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kio_chm (module) ##########################
+##### tdeio_chm (module) ##########################
 
-tde_add_kpart( kio_chm
+tde_add_kpart( tdeio_chm
   SOURCES decompress.cpp chmfile.cpp chm.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/documentation/protocols/chm/Makefile.am b/parts/documentation/protocols/chm/Makefile.am
index 933f4685..ba5601d3 100644
--- a/parts/documentation/protocols/chm/Makefile.am
+++ b/parts/documentation/protocols/chm/Makefile.am
@@ -2,11 +2,11 @@
 
 INCLUDES = -I$(top_srcdir)/lib/widgets $(all_includes) 
 
-kde_module_LTLIBRARIES = kio_chm.la libkchmpart.la
+kde_module_LTLIBRARIES = tdeio_chm.la libkchmpart.la
 
-kio_chm_la_SOURCES = decompress.cpp chmfile.cpp chm.cpp
-kio_chm_la_LIBADD = $(LIB_KIO)
-kio_chm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_chm_la_SOURCES = decompress.cpp chmfile.cpp chm.cpp
+tdeio_chm_la_LIBADD = $(LIB_KIO)
+tdeio_chm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 libkchmpart_la_SOURCES = kchmpart.cpp
 libkchmpart_la_LIBADD = -ltdehtml $(LIB_KPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la
diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp
index 7c8421a8..08a46136 100644
--- a/parts/documentation/protocols/chm/chm.cpp
+++ b/parts/documentation/protocols/chm/chm.cpp
@@ -41,25 +41,25 @@ extern "C"
 {
     int kdemain( int argc, char **argv )
     {
-        TDEInstance instance( "kio_chm" );
+        TDEInstance instance( "tdeio_chm" );
 
-        kdDebug() << "*** Starting kio_chm " << endl;
+        kdDebug() << "*** Starting tdeio_chm " << endl;
 
         if (argc != 4) {
-            kdDebug() << "Usage: kio_chm  protocol domain-socket1 domain-socket2" << endl;
+            kdDebug() << "Usage: tdeio_chm  protocol domain-socket1 domain-socket2" << endl;
             exit(-1);
         }
 
         ChmProtocol slave(argv[2], argv[3]);
         slave.dispatchLoop();
 
-        kdDebug() << "*** kio_chm Done" << endl;
+        kdDebug() << "*** tdeio_chm Done" << endl;
         return 0;
     }
 }
 
 ChmProtocol::ChmProtocol(const TQCString &pool_socket, const TQCString &app_socket)
-: SlaveBase("kio_chm", pool_socket, app_socket)
+: SlaveBase("tdeio_chm", pool_socket, app_socket)
 {
     kdDebug() << "ChmProtocol::ChmProtocol()" << endl;
 }
@@ -80,7 +80,7 @@ void ChmProtocol::get( const KURL& url )
       * of the node, an integer representing a node's ID, the Title of the Node, and it's hyperlink.
       * When :contents is appended, all contained htm- and html-files will be printed, each in a line.
       */
-    kdDebug() << "kio_chm::get(const KURL& url) " << url.path() << endl;
+    kdDebug() << "tdeio_chm::get(const KURL& url) " << url.path() << endl;
 
     bool catalog = false;
     bool contents = false;
diff --git a/parts/documentation/protocols/chm/chm.protocol b/parts/documentation/protocols/chm/chm.protocol
index 492524e0..e311c74e 100644
--- a/parts/documentation/protocols/chm/chm.protocol
+++ b/parts/documentation/protocols/chm/chm.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_chm
+exec=tdeio_chm
 protocol=ms-its
 input=none
 output=filesystem
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp
index 1f0d6cd5..e7285c82 100644
--- a/parts/outputviews/makeactionfilter.cpp
+++ b/parts/outputviews/makeactionfilter.cpp
@@ -234,7 +234,7 @@ void MakeActionFilter::test()
 		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libtdefilereplacepart.la.closure libtdefilereplacepart_la_closure.lo "
 		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib  -version-info 1:0:0 tdefilereplacepart.lo tdefilereplacedoc.lo "
 		"tdefilereplaceview.lo kabouttdefilereplace.lo kaddstringdlg.lo tdeconfirmdlg.lo kernel.lo kexpression.lo tdefilereplacepref.lo "
-		"klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml",
+		"klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -ltdeio -ltdeparts -ltdehtml",
 		"linking", "libtool", "libtdefilereplacepart.la.closure")
 	<< TestItem( //libtool, linking 3
 		"/bin/sh ../libtool --silent --mode=link --tag=CXX g++  -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic "
@@ -242,7 +242,7 @@ void MakeActionFilter::test()
 		"-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common    -o libtdefilereplacepart.la -rpath /opt/trinity/lib/trinity "
 		"-module -no-undefined  -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib  -version-info 1:0:0 tdefilereplacepart.lo "
 		"tdefilereplacedoc.lo tdefilereplaceview.lo kabouttdefilereplace.lo kaddstringdlg.lo tdeconfirmdlg.lo kernel.lo kexpression.lo "
-		"tdefilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml",
+		"tdefilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -ltdeio -ltdeparts -ltdehtml",
 		"linking", "libtool", "libtdefilereplacepart.la")
 	<< TestItem( //automake, builddir!=srcdir, libtool=no, compiling
 		" g++ -DHAVE_CONFIG_H -I. -I/home/andris/cvs-developement/head/quanta/quanta/project "