11 files changed, 16 insertions, 16 deletions
diff --git a/tdeioslave/Mainpage.dox b/tdeioslave/Mainpage.dox
index 44979b667..ee3928e84 100644
--- a/tdeioslave/Mainpage.dox
+++ b/tdeioslave/Mainpage.dox
@@ -1,6 +1,6 @@
-/** @mainpage KIO Slaves
+/** @mainpage TDEIO Slaves
 *
-* KIO Slaves are out-of-process worker applications that
+* TDEIO Slaves are out-of-process worker applications that
 * perform protocol-specific communications.
 *
 * - <a href="../http/html/">http</a> ioslave
diff --git a/tdeioslave/Makefile.am b/tdeioslave/Makefile.am
index e6472a9c8..0eacd1a1b 100644
--- a/tdeioslave/Makefile.am
+++ b/tdeioslave/Makefile.am
@@ -22,6 +22,6 @@ endif
 
 SUBDIRS = file http ftp gzip $(BZIP2DIR) metainfo iso
 
-messages: # they get into kio.pot
+messages: # they get into tdeio.pot
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/tdeioslave/bzip2/Makefile.am b/tdeioslave/bzip2/Makefile.am
index 963f27e31..3c7afe69e 100644
--- a/tdeioslave/bzip2/Makefile.am
+++ b/tdeioslave/bzip2/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = kbzip2filter.la
 
 kbzip2filter_la_SOURCES = kbzip2filter.cpp
-kbzip2filter_la_LIBADD = $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
+kbzip2filter_la_LIBADD = $(LIB_TDEIO) $(LIBBZ2) $(LIB_QT) $(LIB_TDECORE)
 kbzip2filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 kde_services_DATA = kbzip2filter.desktop
diff --git a/tdeioslave/file/Makefile.am b/tdeioslave/file/Makefile.am
index 0e34dda74..ac3a2094d 100644
--- a/tdeioslave/file/Makefile.am
+++ b/tdeioslave/file/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = $(all_includes)
 kde_module_LTLIBRARIES = tdeio_file.la
 
 tdeio_file_la_SOURCES = file.cc
-tdeio_file_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(ACL_LIBS)
+tdeio_file_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(ACL_LIBS)
 tdeio_file_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(top_builddir)/dcop/libDCOP.la
 noinst_HEADERS = file.h
 
diff --git a/tdeioslave/ftp/Makefile.am b/tdeioslave/ftp/Makefile.am
index 93ee77a5a..1421b8667 100644
--- a/tdeioslave/ftp/Makefile.am
+++ b/tdeioslave/ftp/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= $(all_includes)
 kde_module_LTLIBRARIES = tdeio_ftp.la
 
 tdeio_ftp_la_SOURCES = ftp.cc
-tdeio_ftp_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
+tdeio_ftp_la_LIBADD  = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE)
 tdeio_ftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
 
 noinst_HEADERS = ftp.h
diff --git a/tdeioslave/gzip/Makefile.am b/tdeioslave/gzip/Makefile.am
index 22918aef2..591ce27d3 100644
--- a/tdeioslave/gzip/Makefile.am
+++ b/tdeioslave/gzip/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES = -I$(top_srcdir)/tdeio $(all_includes)
-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
 METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = kgzipfilter.la
 
 kgzipfilter_la_SOURCES = kgzipfilter.cpp
-kgzipfilter_la_LIBADD = $(LIB_KIO) $(LIBZ) $(LIB_QT) $(LIB_TDECORE)
+kgzipfilter_la_LIBADD = $(LIB_TDEIO) $(LIBZ) $(LIB_QT) $(LIB_TDECORE)
 kgzipfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 kde_services_DATA = kgzipfilter.desktop
diff --git a/tdeioslave/http/Makefile.am b/tdeioslave/http/Makefile.am
index 71b6d0c60..c68f90bea 100644
--- a/tdeioslave/http/Makefile.am
+++ b/tdeioslave/http/Makefile.am
@@ -15,11 +15,11 @@ kde_module_LTLIBRARIES = tdeio_http.la
 
 tdeio_http_la_SOURCES = http.cc
 tdeio_http_la_METASOURCES = AUTO
-tdeio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/tdeio/misc/tdentlm/libtdentlm.la
+tdeio_http_la_LIBADD = $(LIB_TDEIO) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/tdeio/misc/tdentlm/libtdentlm.la
 tdeio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
 
 tdeio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
-tdeio_http_cache_cleaner_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
+tdeio_http_cache_cleaner_la_LIBADD  = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la
 tdeio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
 
 noinst_HEADERS = http.h
diff --git a/tdeioslave/http/kcookiejar/tests/Makefile.am b/tdeioslave/http/kcookiejar/tests/Makefile.am
index 3af4677f1..95a62de4c 100644
--- a/tdeioslave/http/kcookiejar/tests/Makefile.am
+++ b/tdeioslave/http/kcookiejar/tests/Makefile.am
@@ -8,8 +8,8 @@ INCLUDES=	$(all_includes)
 check_PROGRAMS = kcookiejartest
 
 kcookiejartest_SOURCES = kcookiejartest.cpp 
-kcookiejartest_LDADD   = $(LIB_KIO)
-kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kcookiejartest_LDADD   = $(LIB_TDEIO)
+kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 check-local: kcookiejartest
 	./kcookiejartest $(srcdir)/cookie.test
diff --git a/tdeioslave/iso/Makefile.am b/tdeioslave/iso/Makefile.am
index e7eec33f6..b5da2a280 100644
--- a/tdeioslave/iso/Makefile.am
+++ b/tdeioslave/iso/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = $(all_includes)
 tdeio_iso_la_METASOURCES=AUTO
 
 tdeio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp
-tdeio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO)
+tdeio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO)
 
 tdeio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
diff --git a/tdeioslave/iso/libisofs/Makefile.am b/tdeioslave/iso/libisofs/Makefile.am
index a1278ff41..f85958198 100644
--- a/tdeioslave/iso/libisofs/Makefile.am
+++ b/tdeioslave/iso/libisofs/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = $(all_includes)
 libisofs_la_METASOURCES=AUTO
 
 libisofs_la_SOURCES = isofs.c
-#libisofs_la_LIBADD = $(LIB_KIO)
+#libisofs_la_LIBADD = $(LIB_TDEIO)
 
 #libisofs_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
 
diff --git a/tdeioslave/metainfo/Makefile.am b/tdeioslave/metainfo/Makefile.am
index fd089f7a5..73aff5dac 100644
--- a/tdeioslave/metainfo/Makefile.am
+++ b/tdeioslave/metainfo/Makefile.am
@@ -2,13 +2,13 @@
 ## Makefile.am of tdebase/tdeioslave/metainfo
 
 INCLUDES = $(all_includes)
-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
 METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = tdeio_metainfo.la
 
 tdeio_metainfo_la_SOURCES = metainfo.cpp
-tdeio_metainfo_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
+tdeio_metainfo_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE)
 tdeio_metainfo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = metainfo.h