Additional k => tde renaming and fixes

7 files changed, 12 insertions, 12 deletions

diff --git a/tdeio/misc/Makefile.am b/tdeio/misc/Makefile.am
index 6a250cf8a..aedefc37e 100644
--- a/tdeio/misc/Makefile.am
+++ b/tdeio/misc/Makefile.am
@@ -29,7 +29,7 @@ bin_PROGRAMS = tdemailservice tdetelnetservice
 observer_DIR = $(top_srcdir)/tdeio/tdeio
 
 tdeio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub
-tdeio_uiserver_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+tdeio_uiserver_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
 tdeio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 METASOURCES = AUTO
@@ -38,11 +38,11 @@ kde_services_DATA = tdeio_uiserver.desktop
 
 tdemailservice_SOURCES = tdemailservice.cpp
 tdemailservice_LDADD = $(LIB_TDECORE)
-tdemailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdemailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 tdetelnetservice_SOURCES = tdetelnetservice.cpp
 tdetelnetservice_LDADD = $(LIB_TDEUI)
-tdetelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdetelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 protocol_DATA = tdemailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \
 		mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol
diff --git a/tdeio/misc/kpac/Makefile.am b/tdeio/misc/kpac/Makefile.am
index beb6a4b86..15e84ec50 100644
--- a/tdeio/misc/kpac/Makefile.am
+++ b/tdeio/misc/kpac/Makefile.am
@@ -10,7 +10,7 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
                              downloader.cpp discovery.cpp
 kded_proxyscout_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_proxyscout_la_LIBADD = $(LIB_KIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED) $(LIB_QT) \
+kded_proxyscout_la_LIBADD = $(LIB_TDEIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED) $(LIB_QT) \
 	$(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIBRESOLV)
 
 kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
diff --git a/tdeio/misc/kssld/Makefile.am b/tdeio/misc/kssld/Makefile.am
index 09ddfe440..e17b1331e 100644
--- a/tdeio/misc/kssld/Makefile.am
+++ b/tdeio/misc/kssld/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(SSL_INCLUDES) -I$(top_srcdir)/tdeio/k
 kde_module_LTLIBRARIES = kded_kssld.la
 
 kded_kssld_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kssld_la_LIBADD = $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
+kded_kssld_la_LIBADD = $(LIB_TDEIO) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE)
 kded_kssld_la_SOURCES = kssld.cpp kssld.skel
 
 METASOURCES = AUTO
diff --git a/tdeio/misc/tdefile/Makefile.am b/tdeio/misc/tdefile/Makefile.am
index 21cdb0627..bd6831f5e 100644
--- a/tdeio/misc/tdefile/Makefile.am
+++ b/tdeio/misc/tdefile/Makefile.am
@@ -5,6 +5,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio/tdeio $(all_includes)
 
 bin_PROGRAMS = tdefile
 tdefile_SOURCES = fileprops.cpp
-tdefile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-tdefile_LDADD = $(LIB_KIO)
+tdefile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdefile_LDADD = $(LIB_TDEIO)
 
diff --git a/tdeio/misc/tdentlm/tdentlm.h b/tdeio/misc/tdentlm/tdentlm.h
index 06b8febab..b71cad1bb 100644
--- a/tdeio/misc/tdentlm/tdentlm.h
+++ b/tdeio/misc/tdentlm/tdentlm.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
  */
 
-#ifndef KNTLM_H
-#define KNTLM_H
+#ifndef TDENTLM_H
+#define TDENTLM_H
 
 #include <tqglobal.h>
 #include <tqcstring.h>
@@ -230,4 +230,4 @@ private:
   static void convertKey( unsigned char *key_56, void* ks );
 };
 
-#endif /* KNTLM_H */
+#endif /* TDENTLM_H */
diff --git a/tdeio/misc/tdesendbugmail/Makefile.am b/tdeio/misc/tdesendbugmail/Makefile.am
index f9087a4fe..71e1c2573 100644
--- a/tdeio/misc/tdesendbugmail/Makefile.am
+++ b/tdeio/misc/tdesendbugmail/Makefile.am
@@ -20,7 +20,7 @@ bin_PROGRAMS = tdesendbugmail
 INCLUDES= -I$(srcdir)/.. $(all_includes)
 
 tdesendbugmail_SOURCES = main.cpp smtp.cpp
-tdesendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdesendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 tdesendbugmail_LDADD = ../../libtdeio.la
 
 METASOURCES = AUTO
diff --git a/tdeio/misc/tdewalletd/Makefile.am b/tdeio/misc/tdewalletd/Makefile.am
index 5d52fa810..ed96a35c7 100644
--- a/tdeio/misc/tdewalletd/Makefile.am
+++ b/tdeio/misc/tdewalletd/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/tdewallet/backend -I$(t
 kde_module_LTLIBRARIES = kded_tdewalletd.la
 
 kded_tdewalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_tdewalletd_la_LIBADD = $(LIB_KIO) ../../../tdewallet/backend/libtdewalletbackend.la ../../../tdewallet/client/libtdewalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI)
+kded_tdewalletd_la_LIBADD = $(LIB_TDEIO) ../../../tdewallet/backend/libtdewalletbackend.la ../../../tdewallet/client/libtdewalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI)
 kded_tdewalletd_la_SOURCES = tdewalletd.cpp tdewalletd.skel ktimeout.cpp tdewalletwizard.ui kbetterthankdialogbase.ui
 
 METASOURCES = AUTO