Additional k => tde renaming and fixes

12 files changed, 16 insertions, 16 deletions

diff --git a/kmag/Makefile.am b/kmag/Makefile.am
index a4387d2..0aeade7 100644
--- a/kmag/Makefile.am
+++ b/kmag/Makefile.am
@@ -27,7 +27,7 @@ METASOURCES = AUTO
 KDE_OPTIONS = nofinal
 
 # the library search path. 
-kmag_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kmag_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 rcdir = $(kde_datadir)/kmag
 rc_DATA = kmagui.rc
diff --git a/kmag/TODO b/kmag/TODO
index f651880..b58c3fe 100644
--- a/kmag/TODO
+++ b/kmag/TODO
@@ -31,7 +31,7 @@ Version 1.0:
 * Always show selected region
 * Allow setting of refresh rate
 * Copying zoomed image to clipboard on "copy"
-* Saving zoomed image to a remote file (via KIO slaves)
+* Saving zoomed image to a remote file (via TDEIO slaves)
 * Compilable under KDE 2.x
 
 Bug Fixing for 1.0:
diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp
index 7961ee6..1c413c0 100644
--- a/kmag/kmag.cpp
+++ b/kmag/kmag.cpp
@@ -109,7 +109,7 @@ KmagApp::KmagApp(TQWidget* , const char* name)
   initActions();
   initConnections();
 
-  // Register all KIO image formats - to be used when saving image.
+  // Register all TDEIO image formats - to be used when saving image.
   KImageIO::registerFormats();
 
   // read options from config file
diff --git a/kmousetool/kmousetool/Makefile.am b/kmousetool/kmousetool/Makefile.am
index 7418514..f078ad6 100644
--- a/kmousetool/kmousetool/Makefile.am
+++ b/kmousetool/kmousetool/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES= $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-kmousetool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kmousetool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 messages: rc.cpp
 	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
diff --git a/kmouth/Makefile.am b/kmouth/Makefile.am
index 879cae9..c661e69 100644
--- a/kmouth/Makefile.am
+++ b/kmouth/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES= -Iphrasebook -Iwordcompletion $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-kmouth_LDFLAGS = $(all_libraries) -ltdespell $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kmouth_LDFLAGS = $(all_libraries) -ltdespell $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 rcdir = $(kde_datadir)/kmouth
 rc_DATA = kmouthui.rc
diff --git a/ksayit/src/Makefile.am b/ksayit/src/Makefile.am
index ff0e43e..afadd22 100644
--- a/ksayit/src/Makefile.am
+++ b/ksayit/src/Makefile.am
@@ -31,8 +31,8 @@ ksayit_SOURCES = doctreeviewimpl.cpp effectstack.cpp fxpluginhandler.cpp \
 		parasaxparser.cpp saxhandler.cpp ksayitbookmarkhandler.cpp contextmenuhandler.cpp docbookclasses.cpp \
 		docbookgenerator.cpp docbookparser.cpp
 
-ksayit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lartsflow -lartsflow_idl
-ksayit_LDADD = $(top_builddir)/ksayit/KTTSD_Lib/libKTTSD_Lib.la $(LIB_KIO) \
+ksayit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lartsflow -lartsflow_idl
+ksayit_LDADD = $(top_builddir)/ksayit/KTTSD_Lib/libKTTSD_Lib.la $(LIB_TDEIO) \
 	-lartskde -lsoundserver_idl -lartsflow -lartsflow_idl
 
 
diff --git a/kttsd/filters/Makefile.am b/kttsd/filters/Makefile.am
index 2db77e5..a5bdff9 100644
--- a/kttsd/filters/Makefile.am
+++ b/kttsd/filters/Makefile.am
@@ -17,7 +17,7 @@ check_PROGRAMS = testfilter
 
 testfilter_SOURCES = main.cpp
 
-testfilter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testfilter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 testfilter_LDADD = \
 	$(top_builddir)/kttsd/libkttsd/libkttsd.la \
 	$(LIB_TDECORE)
diff --git a/kttsd/kcmkttsmgr/Makefile.am b/kttsd/kcmkttsmgr/Makefile.am
index 6aba44c..6b08685 100644
--- a/kttsd/kcmkttsmgr/Makefile.am
+++ b/kttsd/kcmkttsmgr/Makefile.am
@@ -33,7 +33,7 @@ kcm_kttsd_la_SOURCES = \
 kcm_kttsd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
 kcm_kttsd_la_LIBADD = \
 	$(top_builddir)/kttsd/libkttsd/libkttsd.la \
-	$(LIB_KIO) 
+	$(LIB_TDEIO) 
 
 # Header files that should not be installed.
 noinst_HEADERS = \
diff --git a/kttsd/kttsd/Makefile.am b/kttsd/kttsd/Makefile.am
index 32ef645..3dd03ba 100644
--- a/kttsd/kttsd/Makefile.am
+++ b/kttsd/kttsd/Makefile.am
@@ -33,12 +33,12 @@ kttsd_SOURCES = \
 	filtermgr.cpp \
 	talkermgr.cpp
 
-kttsd_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kttsd_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kttsd_LDADD = \
 	$(top_builddir)/kttsd/libkttsd/libkttsd.la \
 	$(LIB_TDECORE) \
-	$(LIB_KIO) \
-	$(LIB_KUTILS)
+	$(LIB_TDEIO) \
+	$(LIB_TDEUTILS)
 
 # Install desktop file to standard services directory.
 kde_services_DATA = kttsd.desktop
diff --git a/kttsd/kttsjobmgr/Makefile.am b/kttsd/kttsjobmgr/Makefile.am
index 49e7b0a..240e7d7 100644
--- a/kttsd/kttsjobmgr/Makefile.am
+++ b/kttsd/kttsjobmgr/Makefile.am
@@ -26,7 +26,7 @@ libkttsjobmgrpart_la_SOURCES = \
 libkttsjobmgrpart_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) $(KDE_PLUGIN)
 libkttsjobmgrpart_la_LIBADD = \
 	$(top_builddir)/kttsd/libkttsd/libkttsd.la \
-	$(LIB_TDEFILE) $(LIBVM) $(LIB_KPARTS)
+	$(LIB_TDEFILE) $(LIBVM) $(LIB_TDEPARTS)
 
 # Header files not to be installed.
 noinst_HEADERS = 
diff --git a/kttsd/kttsmgr/Makefile.am b/kttsd/kttsmgr/Makefile.am
index 1fa099c..441b38d 100644
--- a/kttsd/kttsmgr/Makefile.am
+++ b/kttsd/kttsmgr/Makefile.am
@@ -22,9 +22,9 @@ kttsmgr_SOURCES =  \
 	kspeechsink.skel \
 	kttsmgr.cpp
 
-kttsmgr_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kttsmgr_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kttsmgr_LDADD = \
-	$(LIB_KUTILS) \
+	$(LIB_TDEUTILS) \
 	$(LIB_TDEUI)
 
 # Header files that should not be installed.
diff --git a/kttsd/libkttsd/Makefile.am b/kttsd/libkttsd/Makefile.am
index 9b0b49c..f158297 100644
--- a/kttsd/libkttsd/Makefile.am
+++ b/kttsd/libkttsd/Makefile.am
@@ -26,7 +26,7 @@ libkttsd_la_SOURCES = \
 	notify.cpp
 
 libkttsd_la_LDFLAGS = -version-info 1:0:0 $(all_libraries) -no-undefined
-libkttsd_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
+libkttsd_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
 
 # Header files that should not be installed.
 noinst_HEADERS = \