Additional k => tde renaming and fixes

57 files changed, 170 insertions, 167 deletions

diff --git a/tdeio/DESIGN b/tdeio/DESIGN
index 22307c5c0..a6f58c838 100644
--- a/tdeio/DESIGN
+++ b/tdeio/DESIGN
@@ -171,7 +171,7 @@ A. progress handling
 ---------------------
 There will be two ways how the application can display progress :
 
-1. regular apps will use NetAccess for all kio operations and will not  care
+1. regular apps will use NetAccess for all tdeio operations and will not  care
     about progress handling :
  - NetAccess creates Job
  - NetAccess creates JobObserver that will connect to the Job's signals and
diff --git a/tdeio/Mainpage.dox b/tdeio/Mainpage.dox
index 7cb127838..057833148 100644
--- a/tdeio/Mainpage.dox
+++ b/tdeio/Mainpage.dox
@@ -82,7 +82,7 @@
  * KDirOperator:
  * The class encapsulating different KFileViews, offering file browsing and
  * file selection. Asynchronous, network transparent reading of directories
- * is performed via the KIO library.
+ * is performed via the TDEIO library.
  *
  * KURLRequester:
  * A widget to be used for asking for a filename/path/URL. It consists of a
diff --git a/tdeio/bookmarks/kbookmarkmanager.h b/tdeio/bookmarks/kbookmarkmanager.h
index 6931e9842..3ce6d572c 100644
--- a/tdeio/bookmarks/kbookmarkmanager.h
+++ b/tdeio/bookmarks/kbookmarkmanager.h
@@ -44,7 +44,7 @@
  *       <title>My own bookmarks</title>
  *       <bookmark href="http://www.koffice.org"><title>KOffice Web Site</title></bookmark>
  *       <separator/>
- *       <bookmark href="http://www.tdevelop.org"><title>KDevelop Web Site</title></bookmark>
+ *       <bookmark href="http://www.kdevelop.org"><title>KDevelop Web Site</title></bookmark>
  *     </folder>
  *   </folder>
  * </xbel>
diff --git a/tdeio/data.protocol b/tdeio/data.protocol
index 1982efe80..13bc0522b 100644
--- a/tdeio/data.protocol
+++ b/tdeio/data.protocol
@@ -36,7 +36,7 @@ Description[kk]=URI деректерді өңдеу tdeioslave модулі (rfc
 Description[km]=tdeioslave មួយ​សម្រាប់​ទិន្នន័យ URIs (rfc2397)
 Description[lb]=E tdeioslave fir Donnéen-URIs (rfc2397)
 Description[lt]=Antrinė KDE programa duomenų URI (rfc2397)
-Description[mk]=kio-служител за податочни URI (rfc2397)
+Description[mk]=tdeio-служител за податочни URI (rfc2397)
 Description[ms]=Kioslave untuk URI data (rfc2397)
 Description[nb]=tdeioslave for data URI-er (rfc2397)
 Description[nds]=In-/Utgaavmoduul för Daten-URIs (rfc2397)
diff --git a/tdeio/kpasswdserver/Makefile.am b/tdeio/kpasswdserver/Makefile.am
index d1a58059b..2581f5aa1 100644
--- a/tdeio/kpasswdserver/Makefile.am
+++ b/tdeio/kpasswdserver/Makefile.am
@@ -10,6 +10,6 @@ kde_module_LTLIBRARIES = kded_kpasswdserver.la
 kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel 
 kded_kpasswdserver_la_METASOURCES = AUTO
 kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kpasswdserver_la_LIBADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+kded_kpasswdserver_la_LIBADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la $(LIB_TDEIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
 include $(top_srcdir)/admin/Doxyfile.am
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
diff --git a/tdeio/tdefile/NOTES b/tdeio/tdefile/NOTES
index e2037e382..c646c13cd 100644
--- a/tdeio/tdefile/NOTES
+++ b/tdeio/tdefile/NOTES
@@ -48,7 +48,7 @@ KFileView's requests to KDirLister's methods.
 
 This class inherits from KFileChooserWidget and adds the file management
 operations. It uses a KFileOperations class (taken from the current
-KonqOperations) for all KIO operations, and it uses KFileUndo, taken from
+KonqOperations) for all TDEIO operations, and it uses KFileUndo, taken from
 the KonqUndo stuff. The popupMenu method is reimplemented to add those
 operations to it.
 
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index f865e2f2d..c0e315359 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -3193,7 +3193,10 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props )
   m_terminalBool = config.readBoolEntry( "Terminal" );
   m_terminalOptionStr = config.readEntry( "TerminalOptions" );
   m_suidBool = config.readBoolEntry( "X-TDE-SubstituteUID" ) || config.readBoolEntry( "X-KDE-SubstituteUID" );
-  m_suidUserStr = config.readEntry( "X-TDE-Username" );
+  if( config.hasKey( "X-TDE-Username" ))
+    m_suidUserStr = config.readEntry( "X-TDE-Username" );
+  else
+    m_suidUserStr = config.readEntry( "X-KDE-Username" );
   if( config.hasKey( "StartupNotify" ))
     m_startupBool = config.readBoolEntry( "StartupNotify", true );
   else
diff --git a/tdeio/tdefile/tdediroperator.h b/tdeio/tdefile/tdediroperator.h
index 95bf5c5ba..6ce658e18 100644
--- a/tdeio/tdefile/tdediroperator.h
+++ b/tdeio/tdefile/tdediroperator.h
@@ -18,8 +18,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef KDIROPERATOR_H_
-#define KDIROPERATOR_H_
+#ifndef TDEDIROPERATOR_H_
+#define TDEDIROPERATOR_H_
 
 #include <tqwidget.h>
 #include <tqptrstack.h>
diff --git a/tdeio/tdefile/tderecentdirs.h b/tdeio/tdefile/tderecentdirs.h
index cc9be16b4..ca1a5bbe2 100644
--- a/tdeio/tdefile/tderecentdirs.h
+++ b/tdeio/tdefile/tderecentdirs.h
@@ -25,8 +25,8 @@
  * SUCH DAMAGE.
  *
  */
-#ifndef __KRECENTDIRS_H
-#define __KRECENTDIRS_H
+#ifndef __TDERECENTDIRS_H
+#define __TDERECENTDIRS_H
 
 #include <tqstringlist.h>
 
diff --git a/tdeio/tdefile/tderecentdocument.h b/tdeio/tdefile/tderecentdocument.h
index b788c0dc2..a3ee1b6b7 100644
--- a/tdeio/tdefile/tderecentdocument.h
+++ b/tdeio/tdefile/tderecentdocument.h
@@ -25,8 +25,8 @@
  * SUCH DAMAGE.
  *
  */
-#ifndef __KRECENTDOCUMENT_H
-#define __KRECENTDOCUMENT_H
+#ifndef __TDERECENTDOCUMENT_H
+#define __TDERECENTDOCUMENT_H
 
 #include <tqstring.h>
 #include <kurl.h>
diff --git a/tdeio/tdefile/tests/Makefile.am b/tdeio/tdefile/tests/Makefile.am
index d869f11f5..8f48db918 100644
--- a/tdeio/tdefile/tests/Makefile.am
+++ b/tdeio/tdefile/tests/Makefile.am
@@ -29,7 +29,7 @@ check_PROGRAMS = kfstest kurlrequestertest tdefiletreeviewtest \
 
 METASOURCES = AUTO
 
-LDADD = $(LIB_KIO)
+LDADD = $(LIB_TDEIO)
 kcustommenueditortest_SOURCES = kcustommenueditortest.cpp
 kurlrequestertest_SOURCES = kurlrequestertest.cpp
 kfstest_SOURCES = kfstest.cpp kfdtest.cpp
diff --git a/tdeio/tdeio/authinfo.h b/tdeio/tdeio/authinfo.h
index 019311ef8..842925b26 100644
--- a/tdeio/tdeio/authinfo.h
+++ b/tdeio/tdeio/authinfo.h
@@ -18,8 +18,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KIO_AUTHINFO_H
-#define __KIO_AUTHINFO_H
+#ifndef __TDEIO_AUTHINFO_H
+#define __TDEIO_AUTHINFO_H
 
 #include <tqmap.h>
 #include <tqvaluelist.h>
diff --git a/tdeio/tdeio/dataslave.cpp b/tdeio/tdeio/dataslave.cpp
index a5b6bdf69..41a76efd1 100644
--- a/tdeio/tdeio/dataslave.cpp
+++ b/tdeio/tdeio/dataslave.cpp
@@ -30,7 +30,7 @@
 
 using namespace TDEIO;
 
-#define KIO_DATA_POLL_INTERVAL 0
+#define TDEIO_DATA_POLL_INTERVAL 0
 
 // don't forget to sync DISPATCH_DECL in dataslave.h
 #define DISPATCH_IMPL(type) \
@@ -38,7 +38,7 @@ using namespace TDEIO;
 	  if (_suspended) { \
 	    QueueStruct q(Queue_##type); \
 	    dispatchQueue.push_back(q); \
-	    if (!timer->isActive()) timer->start(KIO_DATA_POLL_INTERVAL); \
+	    if (!timer->isActive()) timer->start(TDEIO_DATA_POLL_INTERVAL); \
 	  } else \
 	    type(); \
 	}
@@ -50,7 +50,7 @@ using namespace TDEIO;
 	    QueueStruct q(Queue_##type); \
 	    q.paramname = paramname; \
 	    dispatchQueue.push_back(q); \
-	    if (!timer->isActive()) timer->start(KIO_DATA_POLL_INTERVAL); \
+	    if (!timer->isActive()) timer->start(TDEIO_DATA_POLL_INTERVAL); \
 	  } else \
 	    type(paramname); \
 	}
@@ -85,7 +85,7 @@ void DataSlave::resume() {
   // aarrrgh! This makes the once hyper fast and efficient data protocol
   // implementation slow as molasses. But it wouldn't work otherwise,
   // and I don't want to start messing around with threads
-  timer->start(KIO_DATA_POLL_INTERVAL);
+  timer->start(TDEIO_DATA_POLL_INTERVAL);
 }
 
 // finished is a special case. If we emit it right away, then
@@ -93,7 +93,7 @@ void DataSlave::resume() {
 void DataSlave::dispatch_finished() {
     QueueStruct q(Queue_finished);
     dispatchQueue.push_back(q);
-    if (!timer->isActive()) timer->start(KIO_DATA_POLL_INTERVAL);
+    if (!timer->isActive()) timer->start(TDEIO_DATA_POLL_INTERVAL);
 }
 
 void DataSlave::dispatchNext() {
diff --git a/tdeio/tdeio/dataslave.h b/tdeio/tdeio/dataslave.h
index 40cfef126..0c78a308c 100644
--- a/tdeio/tdeio/dataslave.h
+++ b/tdeio/tdeio/dataslave.h
@@ -19,8 +19,8 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef __KIO_DATASLAVE_H__
-#define __KIO_DATASLAVE_H__
+#ifndef __TDEIO_DATASLAVE_H__
+#define __TDEIO_DATASLAVE_H__
 
 #include <tdeio/global.h>
 #include <tdeio/slave.h>
@@ -43,7 +43,7 @@ namespace TDEIO {
      *
      * @internal
      * Do not use this class in external applications. It is an implementation
-     * detail of KIO and subject to change without notice.
+     * detail of TDEIO and subject to change without notice.
      * @author Leo Savernik
      */
     class DataSlave : public TDEIO::Slave {
@@ -123,4 +123,4 @@ namespace TDEIO {
 #undef DISPATCH_DECL
 #undef DISPATCH_DECL1
 
-#endif /*__KIO_DATASLAVE_H__*/
+#endif /*__TDEIO_DATASLAVE_H__*/
diff --git a/tdeio/tdeio/davjob.cpp b/tdeio/tdeio/davjob.cpp
index 986e76342..8106c77ba 100644
--- a/tdeio/tdeio/davjob.cpp
+++ b/tdeio/tdeio/davjob.cpp
@@ -38,7 +38,7 @@
 #include <tdeio/job.h>
 #include <tdeio/slaveinterface.h>
 
-#define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
+#define TDEIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
 
 using namespace TDEIO;
 
diff --git a/tdeio/tdeio/global.h b/tdeio/tdeio/global.h
index e10e5b4a8..c4ba34f95 100644
--- a/tdeio/tdeio/global.h
+++ b/tdeio/tdeio/global.h
@@ -28,7 +28,7 @@
 #include <kurl.h>
 
 /**
- * @short A namespace for KIO globals
+ * @short A namespace for TDEIO globals
  *
  */
 namespace TDEIO
@@ -170,7 +170,7 @@ namespace TDEIO
   };
 
   /**
-   * Error codes that can be emitted by KIO.
+   * Error codes that can be emitted by TDEIO.
    */
   enum Error {
     ERR_CANNOT_OPEN_FOR_READING = 1,
diff --git a/tdeio/tdeio/http_slave_defaults.h b/tdeio/tdeio/http_slave_defaults.h
index e3247e39b..8e41e0a4b 100644
--- a/tdeio/tdeio/http_slave_defaults.h
+++ b/tdeio/tdeio/http_slave_defaults.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KIO_HTTP_SLAVE_DEFAULTS_H
-#define _KIO_HTTP_SLAVE_DEFAULTS_H
+#ifndef _TDEIO_HTTP_SLAVE_DEFAULTS_H
+#define _TDEIO_HTTP_SLAVE_DEFAULTS_H
 
 // CONNECTION
 #define DEFAULT_KEEP_ALIVE_TIMEOUT      60              // 60 seconds
diff --git a/tdeio/tdeio/ioslave_defaults.h b/tdeio/tdeio/ioslave_defaults.h
index ddf5b6af5..9c8c51313 100644
--- a/tdeio/tdeio/ioslave_defaults.h
+++ b/tdeio/tdeio/ioslave_defaults.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KIO_IOSLAVE_DEFAULTS_H
-#define _KIO_IOSLAVE_DEFAULTS_H
+#ifndef _TDEIO_IOSLAVE_DEFAULTS_H
+#define _TDEIO_IOSLAVE_DEFAULTS_H
 
 // TIMEOUT VALUES
 #define DEFAULT_RESPONSE_TIMEOUT           600     // 10 min.
diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp
index 7f8b9bda3..5ea181266 100644
--- a/tdeio/tdeio/job.cpp
+++ b/tdeio/tdeio/job.cpp
@@ -84,7 +84,7 @@ template class TQPtrList<TDEIO::Job>;
 //this will update the report dialog with 5 Hz, I think this is fast enough, aleXXX
 #define REPORT_TIMEOUT 200
 
-#define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
+#define TDEIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
 
 class Job::JobPrivate
 {
@@ -552,13 +552,13 @@ void SimpleJob::start(Slave *slave)
 
     if (!m_outgoingMetaData.isEmpty())
     {
-       KIO_ARGS << m_outgoingMetaData;
+       TDEIO_ARGS << m_outgoingMetaData;
        slave->send( CMD_META_DATA, packedArgs );
     }
 
     if (!m_subUrl.isEmpty())
     {
-       KIO_ARGS << m_subUrl;
+       TDEIO_ARGS << m_subUrl;
        m_slave->send( CMD_SUBURL, packedArgs );
     }
 
@@ -751,35 +751,35 @@ void MkdirJob::slotFinished()
 SimpleJob *TDEIO::mkdir( const KURL& url, int permissions )
 {
     //kdDebug(7007) << "mkdir " << url << endl;
-    KIO_ARGS << url << permissions;
+    TDEIO_ARGS << url << permissions;
     return new MkdirJob(url, CMD_MKDIR, packedArgs, false);
 }
 
 SimpleJob *TDEIO::rmdir( const KURL& url )
 {
     //kdDebug(7007) << "rmdir " << url << endl;
-    KIO_ARGS << url << TQ_INT8(false); // isFile is false
+    TDEIO_ARGS << url << TQ_INT8(false); // isFile is false
     return new SimpleJob(url, CMD_DEL, packedArgs, false);
 }
 
 SimpleJob *TDEIO::chmod( const KURL& url, int permissions )
 {
     //kdDebug(7007) << "chmod " << url << endl;
-    KIO_ARGS << url << permissions;
+    TDEIO_ARGS << url << permissions;
     return new SimpleJob(url, CMD_CHMOD, packedArgs, false);
 }
 
 SimpleJob *TDEIO::rename( const KURL& src, const KURL & dest, bool overwrite )
 {
     //kdDebug(7007) << "rename " << src << " " << dest << endl;
-    KIO_ARGS << src << dest << (TQ_INT8) overwrite;
+    TDEIO_ARGS << src << dest << (TQ_INT8) overwrite;
     return new SimpleJob(src, CMD_RENAME, packedArgs, false);
 }
 
 SimpleJob *TDEIO::symlink( const TQString& target, const KURL & dest, bool overwrite, bool showProgressInfo )
 {
     //kdDebug(7007) << "symlink target=" << target << " " << dest << endl;
-    KIO_ARGS << target << dest << (TQ_INT8) overwrite;
+    TDEIO_ARGS << target << dest << (TQ_INT8) overwrite;
     return new SimpleJob(dest, CMD_SYMLINK, packedArgs, showProgressInfo);
 }
 
@@ -791,7 +791,7 @@ SimpleJob *TDEIO::special(const KURL& url, const TQByteArray & data, bool showPr
 
 SimpleJob *TDEIO::mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo )
 {
-    KIO_ARGS << int(1) << TQ_INT8( ro ? 1 : 0 )
+    TDEIO_ARGS << int(1) << TQ_INT8( ro ? 1 : 0 )
              << TQString::fromLatin1(fstype) << dev << point;
     SimpleJob *job = special( KURL("file:/"), packedArgs, showProgressInfo );
     if ( showProgressInfo )
@@ -801,7 +801,7 @@ SimpleJob *TDEIO::mount( bool ro, const char *fstype, const TQString& dev, const
 
 SimpleJob *TDEIO::unmount( const TQString& point, bool showProgressInfo )
 {
-    KIO_ARGS << int(2) << point;
+    TDEIO_ARGS << int(2) << point;
     SimpleJob *job = special( KURL("file:/"), packedArgs, showProgressInfo );
     if ( showProgressInfo )
          Observer::self()->unmounting( job, point );
@@ -839,7 +839,7 @@ void LocalURLJob::slotFinished()
 
 LocalURLJob *TDEIO::localURL( const KURL& remoteUrl )
 {
-    KIO_ARGS << remoteUrl;
+    TDEIO_ARGS << remoteUrl;
     return new LocalURLJob(remoteUrl, CMD_LOCALURL, packedArgs, false);
 }
 
@@ -926,7 +926,7 @@ StatJob *TDEIO::stat(const KURL& url, bool showProgressInfo)
 StatJob *TDEIO::stat(const KURL& url, bool sideIsSource, short int details, bool showProgressInfo)
 {
     kdDebug(7007) << "stat " << url << endl;
-    KIO_ARGS << url;
+    TDEIO_ARGS << url;
     StatJob * job = new StatJob(url, CMD_STAT, packedArgs, showProgressInfo );
     job->setSide( sideIsSource );
     job->setDetails( details );
@@ -939,7 +939,7 @@ SimpleJob *TDEIO::http_update_cache( const KURL& url, bool no_cache, time_t expi
 {
     assert( (url.protocol() == "http") || (url.protocol() == "https") );
     // Send http update_cache command (2)
-    KIO_ARGS << (int)2 << url << no_cache << expireDate;
+    TDEIO_ARGS << (int)2 << url << no_cache << expireDate;
     SimpleJob * job = new SimpleJob( url, CMD_SPECIAL, packedArgs, false );
     Scheduler::scheduleJob(job);
     return job;
@@ -1254,7 +1254,7 @@ void TransferJob::slotResult( TDEIO::Job *job)
 TransferJob *TDEIO::get( const KURL& url, bool reload, bool showProgressInfo )
 {
     // Send decoded path and encoded query
-    KIO_ARGS << url;
+    TDEIO_ARGS << url;
     TransferJob * job = new TransferJob( url, CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
     if (reload)
        job->addMetaData("cache", "reload");
@@ -1384,13 +1384,13 @@ TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, boo
     // if request is not valid, return an invalid transfer job
     if (_error)
     {
-        KIO_ARGS << (int)1 << url;
+        TDEIO_ARGS << (int)1 << url;
         TransferJob * job = new PostErrorJob(_error, url.prettyURL(), packedArgs, postData, showProgressInfo);
         return job;
     }
 
     // Send http post command (1), decoded path and encoded query
-    KIO_ARGS << (int)1 << _url;
+    TDEIO_ARGS << (int)1 << _url;
     TransferJob * job = new TransferJob( _url, CMD_SPECIAL,
                                          packedArgs, postData, showProgressInfo );
 
@@ -1414,7 +1414,7 @@ void TransferJob::slotPostRedirection()
 TransferJob *TDEIO::put( const KURL& url, int permissions,
                   bool overwrite, bool resume, bool showProgressInfo )
 {
-    KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
+    TDEIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
     TransferJob * job = new TransferJob( url, CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
     return job;
 }
@@ -1475,7 +1475,7 @@ void StoredTransferJob::slotStoredDataReq( TDEIO::Job *, TQByteArray &data )
 StoredTransferJob *TDEIO::storedGet( const KURL& url, bool reload, bool showProgressInfo )
 {
     // Send decoded path and encoded query
-    KIO_ARGS << url;
+    TDEIO_ARGS << url;
     StoredTransferJob * job = new StoredTransferJob( url, CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
     if (reload)
        job->addMetaData("cache", "reload");
@@ -1485,7 +1485,7 @@ StoredTransferJob *TDEIO::storedGet( const KURL& url, bool reload, bool showProg
 StoredTransferJob *TDEIO::storedPut( const TQByteArray& arr, const KURL& url, int permissions,
                                    bool overwrite, bool resume, bool showProgressInfo )
 {
-    KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
+    TDEIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
     StoredTransferJob * job = new StoredTransferJob( url, CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
     job->setData( arr );
     return job;
@@ -1542,7 +1542,7 @@ void MimetypeJob::slotFinished( )
 
 MimetypeJob *TDEIO::mimetype(const KURL& url, bool showProgressInfo )
 {
-    KIO_ARGS << url;
+    TDEIO_ARGS << url;
     MimetypeJob * job = new MimetypeJob(url, CMD_MIMETYPE, packedArgs, showProgressInfo);
     if ( showProgressInfo )
       Observer::self()->stating( job, url );
@@ -1697,7 +1697,7 @@ void FileCopyJob::startCopyJob()
 void FileCopyJob::startCopyJob(const KURL &slave_url)
 {
     //kdDebug(7007) << "FileCopyJob::startCopyJob()" << endl;
-    KIO_ARGS << m_src << m_dest << m_permissions << (TQ_INT8) m_overwrite;
+    TDEIO_ARGS << m_src << m_dest << m_permissions << (TQ_INT8) m_overwrite;
     m_copyJob = new DirectCopyJob(slave_url, CMD_COPY, packedArgs, false);
     addSubjob( m_copyJob );
     connectSubjob( m_copyJob );
@@ -1707,7 +1707,7 @@ void FileCopyJob::startCopyJob(const KURL &slave_url)
 
 void FileCopyJob::startRenameJob(const KURL &slave_url)
 {
-    KIO_ARGS << m_src << m_dest << (TQ_INT8) m_overwrite;
+    TDEIO_ARGS << m_src << m_dest << (TQ_INT8) m_overwrite;
     m_moveJob = new SimpleJob(slave_url, CMD_RENAME, packedArgs, false);
     addSubjob( m_moveJob );
     connectSubjob( m_moveJob );
@@ -2008,7 +2008,7 @@ FileCopyJob *TDEIO::file_move( const KURL& src, const KURL& dest, int permission
 
 SimpleJob *TDEIO::file_delete( const KURL& src, bool showProgressInfo)
 {
-    KIO_ARGS << src << TQ_INT8(true); // isFile
+    TDEIO_ARGS << src << TQ_INT8(true); // isFile
     return new SimpleJob(src, CMD_DEL, packedArgs, showProgressInfo );
 }
 
@@ -2797,7 +2797,7 @@ void CopyJob::startRenameJob( const KURL& slave_url )
     files.append(info);
     emit aboutToCreate( this, files );
 
-    KIO_ARGS << m_currentSrcURL << dest << (TQ_INT8) false /*no overwrite*/;
+    TDEIO_ARGS << m_currentSrcURL << dest << (TQ_INT8) false /*no overwrite*/;
     SimpleJob * newJob = new SimpleJob(slave_url, CMD_RENAME, packedArgs, false);
     Scheduler::scheduleJob(newJob);
     addSubjob( newJob );
@@ -4469,7 +4469,7 @@ void MultiGetJob::flushQueue(TQPtrList<GetRequest> &queue)
       }
    }
    // Send number of URLs, (URL, metadata)*
-   KIO_ARGS << (TQ_INT32) queue.count();
+   TDEIO_ARGS << (TQ_INT32) queue.count();
    for(entry = queue.first(); entry; entry = queue.next())
    {
       stream << entry->url << entry->metaData;
@@ -4490,7 +4490,7 @@ void MultiGetJob::start(Slave *slave)
    if (!entry->url.protocol().startsWith("http"))
    {
       // Use normal get
-      KIO_ARGS << entry->url;
+      TDEIO_ARGS << entry->url;
       m_packedArgs = packedArgs;
       m_outgoingMetaData = entry->metaData;
       m_command = CMD_GET;
diff --git a/tdeio/tdeio/jobclasses.h b/tdeio/tdeio/jobclasses.h
index cae22e8c5..75eb44e39 100644
--- a/tdeio/tdeio/jobclasses.h
+++ b/tdeio/tdeio/jobclasses.h
@@ -37,7 +37,7 @@
 class Observer;
 class TQTimer;
 
-#define KIO_COPYJOB_HAS_SETINTERACTIVE // new in 3.4. Used by tdeio_trash.
+#define TDEIO_COPYJOB_HAS_SETINTERACTIVE // new in 3.4. Used by tdeio_trash.
 
 namespace TDEIO {
 
@@ -682,7 +682,7 @@ namespace TDEIO {
     };
 
     /**
-     * A KIO job that retrieves information about a file or directory.
+     * A TDEIO job that retrieves information about a file or directory.
      * @see TDEIO::stat()
      */
     class TDEIO_EXPORT StatJob : public SimpleJob {
@@ -773,7 +773,7 @@ namespace TDEIO {
     };
 
     /**
-     * A KIO job that creates a directory
+     * A TDEIO job that creates a directory
      * @see TDEIO::mkdir()
      * @since 3.3
      */
@@ -1859,7 +1859,7 @@ namespace TDEIO {
     };
 
     /**
-     * A KIO job that finds a local URL
+     * A TDEIO job that finds a local URL
      * @see TDEIO::localURL()
      * @since R14.0.0
      */
diff --git a/tdeio/tdeio/kmessageboxwrapper.h b/tdeio/tdeio/kmessageboxwrapper.h
index 524eafa74..50bbc6678 100644
--- a/tdeio/tdeio/kmessageboxwrapper.h
+++ b/tdeio/tdeio/kmessageboxwrapper.h
@@ -24,7 +24,7 @@
 
 /**
  * @internal
- * Allows KIO classes to display dialog boxes with the correct
+ * Allows TDEIO classes to display dialog boxes with the correct
  * theme/style even in non-GUI apps like kded and kfmclient
  */
 class TDEIO_EXPORT KMessageBoxWrapper : public KMessageBox
diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index 636c04eea..d1bd940eb 100644
--- a/tdeio/tdeio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -728,7 +728,7 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const
           const TQString u = cfg.readPathEntry( "URL" );
           const KURL url( u );
           if ( url.protocol() == "trash" ) {
-              // We need to find if the trash is empty, preferrably without using a KIO job.
+              // We need to find if the trash is empty, preferrably without using a TDEIO job.
               // So instead tdeio_trash leaves an entry in its config file for us.
               KSimpleConfig trashConfig( "trashrc", true );
               trashConfig.setGroup( "Status" );
diff --git a/tdeio/tdeio/kmimetype.h b/tdeio/tdeio/kmimetype.h
index 894c4556c..b6ec9267e 100644
--- a/tdeio/tdeio/kmimetype.h
+++ b/tdeio/tdeio/kmimetype.h
@@ -544,7 +544,7 @@ public:
 
   /**
    * Returns a list of services for the given .desktop file that are handled
-   * by kio itself. Namely mount/unmount for FSDevice files.
+   * by tdeio itself. Namely mount/unmount for FSDevice files.
    * @return the list of services
    */
   static TQValueList<Service> builtinServices( const KURL& _url );
diff --git a/tdeio/tdeio/kprotocolinfo.h b/tdeio/tdeio/kprotocolinfo.h
index 6de45c1a7..592978e78 100644
--- a/tdeio/tdeio/kprotocolinfo.h
+++ b/tdeio/tdeio/kprotocolinfo.h
@@ -403,7 +403,7 @@ public:
 
   /**
    * Returns whether the protocol can recursively delete directories by itself.
-   * If not (the usual case) then KIO will list the directory and delete files
+   * If not (the usual case) then TDEIO will list the directory and delete files
    * and empty directories one by one.
    *
    * This corresponds to the "deleteRecursive=" field in the protocol description file.
diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp
index d92e3ca11..ccb638288 100644
--- a/tdeio/tdeio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -697,7 +697,7 @@ static pid_t runTempService( const KService& _service, const KURL::List& _urls,
 static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service )
 {
   // Check which protocols the application supports.
-  // This can be a list of actual protocol names, or just KIO for KDE apps.
+  // This can be a list of actual protocol names, or just TDEIO for KDE apps.
   TQStringList supportedProtocols = _service.property("X-TDE-Protocols").toStringList();
   KRunMX1 mx1( _service );
   TQString exec = _service.exec();
@@ -706,10 +706,10 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service
   } else {
     if ( supportedProtocols.isEmpty() )
     {
-      // compat mode: assume KIO if not set and it's a KDE app
+      // compat mode: assume TDEIO if not set and it's a KDE app
       TQStringList categories = _service.property("Categories").toStringList();
       if (( categories.find("TDE") != categories.end() ) && ( categories.find("KDE") != categories.end() ))
-         supportedProtocols.append( "KIO" );
+         supportedProtocols.append( "TDEIO" );
       else { // if no KDE app, be a bit over-generic
          supportedProtocols.append( "http");
          supportedProtocols.append( "ftp");
@@ -719,7 +719,7 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service
   kdDebug(7010) << "supportedProtocols:" << supportedProtocols << endl;
 
   KURL::List urls( _urls );
-  if ( supportedProtocols.find( "KIO" ) == supportedProtocols.end() ) {
+  if ( supportedProtocols.find( "TDEIO" ) == supportedProtocols.end() ) {
     for( KURL::List::Iterator it = urls.begin(); it != urls.end(); ++it ) {
       const KURL url = *it;
       bool supported = url.isLocalFile() || supportedProtocols.find( url.protocol().lower() ) != supportedProtocols.end();
@@ -1155,7 +1155,7 @@ void KRun::scanFile()
   }
 
   // No mimetype found, and the URL is not local  (or fast mode not allowed).
-  // We need to apply the 'KIO' method, i.e. either asking the server or
+  // We need to apply the 'TDEIO' method, i.e. either asking the server or
   // getting some data out of the file, to know what mimetype it is.
 
   if ( !KProtocolInfo::supportsReading( m_strURL ) )
@@ -1311,7 +1311,7 @@ void KRun::foundMimeType( const TQString& type )
 /*
   // Automatically unzip stuff
 
-  // Disabled since the new KIO doesn't have filters yet.
+  // Disabled since the new TDEIO doesn't have filters yet.
 
   if ( type == "application/x-gzip"  ||
        type == "application/x-bzip"  ||
diff --git a/tdeio/tdeio/ktrader.h b/tdeio/tdeio/ktrader.h
index 6b7e804fb..367c37dae 100644
--- a/tdeio/tdeio/ktrader.h
+++ b/tdeio/tdeio/ktrader.h
@@ -288,7 +288,7 @@ protected:
  *   - <tt>('KParts/ReadOnlyPart' in ServiceTypes) and ('text/plain' in ServiceTypes)</tt>@n
  *     All read-only KParts that handle the mime type 'text/plain'.
  *
- * @author Bernd Gehrmann <a href="mailto:bernd@tdevelop.org">bernd@tdevelop.org</a>
+ * @author Bernd Gehrmann <a href="mailto:bernd@kdevelop.org">bernd@kdevelop.org</a>
 */
 
 
diff --git a/tdeio/tdeio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp
index 441d453ac..72f91261d 100644
--- a/tdeio/tdeio/kurlcompletion.cpp
+++ b/tdeio/tdeio/kurlcompletion.cpp
@@ -215,7 +215,7 @@ void DirectoryListThread::run()
 			}
 		}
 
-		// A trick from KIO that helps performance by a little bit:
+		// A trick from TDEIO that helps performance by a little bit:
 		// chdir to the directroy so we won't have to deal with full paths
 		// with stat()
 
@@ -459,12 +459,12 @@ public:
 	bool replace_home;
 	bool complete_url; // if true completing a URL (i.e. 'prepend' is a URL), otherwise a path
 
-	TDEIO::ListJob *list_job; // kio job to list directories
+	TDEIO::ListJob *list_job; // tdeio job to list directories
 
 	TQString prepend; // text to prepend to listed items
 	TQString compl_text; // text to pass on to TDECompletion
 
-	// Filters for files read with  kio
+	// Filters for files read with  tdeio
 	bool list_urls_only_exe; // true = only list executables
 	bool list_urls_no_hidden;
 	TQString list_urls_filter; // filter for listed files
@@ -667,7 +667,7 @@ TQString KURLCompletion::finished()
 /*
  * isRunning
  *
- * Return true if either a KIO job or the DirLister
+ * Return true if either a TDEIO job or the DirLister
  * is running
  */
 bool KURLCompletion::isRunning() const
@@ -678,7 +678,7 @@ bool KURLCompletion::isRunning() const
 /*
  * stop
  *
- * Stop and delete a running KIO job or the DirLister
+ * Stop and delete a running TDEIO job or the DirLister
  */
 void KURLCompletion::stop()
 {
@@ -1129,7 +1129,7 @@ void KURLCompletion::addMatches( const TQStringList &matches )
  * files, and eventually finished() when the listing is done
  *
  * Returns the match if available, or TQString::null if
- * DirLister timed out or using kio
+ * DirLister timed out or using tdeio
  */
 TQString KURLCompletion::listDirectories(
 		const TQStringList &dirList,
@@ -1141,11 +1141,11 @@ TQString KURLCompletion::listDirectories(
 {
 	assert( !isRunning() );
 
-	if ( !::getenv("KURLCOMPLETION_LOCAL_KIO") ) {
+	if ( !::getenv("KURLCOMPLETION_LOCAL_TDEIO") ) {
 
-		//kdDebug() << "Listing (listDirectories): " << dirList << " filter=" << filter << " without KIO" << endl;
+		//kdDebug() << "Listing (listDirectories): " << dirList << " filter=" << filter << " without TDEIO" << endl;
 
-		// Don't use KIO
+		// Don't use TDEIO
 
 		if ( d->dirListThread )
 			d->dirListThread->requestTermination();
@@ -1172,8 +1172,8 @@ TQString KURLCompletion::listDirectories(
 	}
 	else {
 
-		// Use KIO
-		//kdDebug() << "Listing (listDirectories): " << dirList << " with KIO" << endl;
+		// Use TDEIO
+		//kdDebug() << "Listing (listDirectories): " << dirList << " with TDEIO" << endl;
 
 		TQValueList<KURL*> url_list;
 
@@ -1192,7 +1192,7 @@ TQString KURLCompletion::listDirectories(
 /*
  * listURLs
  *
- * Use KIO to list the given urls
+ * Use TDEIO to list the given urls
  *
  * addMatches() is called with the listed files
  * finished() is called when the listing is done
@@ -1224,7 +1224,7 @@ void KURLCompletion::listURLs(
 /*
  * slotEntries
  *
- * Receive files listed by KIO and call addMatches()
+ * Receive files listed by TDEIO and call addMatches()
  */
 void KURLCompletion::slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList& entries)
 {
@@ -1296,7 +1296,7 @@ void KURLCompletion::slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList& entries
 /*
  * slotIOFinished
  *
- * Called when a KIO job is finished.
+ * Called when a TDEIO job is finished.
  *
  * Start a new list job if there are still urls in
  * d->list_urls, otherwise call finished()
@@ -1320,7 +1320,7 @@ void KURLCompletion::slotIOFinished( TDEIO::Job * job )
 
 		d->list_urls.remove( kurl );
 
-//		kdDebug() << "Start KIO: " << kurl->prettyURL() << endl;
+//		kdDebug() << "Start TDEIO: " << kurl->prettyURL() << endl;
 
 		d->list_job = TDEIO::listDir( *kurl, false );
 		d->list_job->addMetaData("no-auth-prompt", "true");
diff --git a/tdeio/tdeio/kurlcompletion.h b/tdeio/tdeio/kurlcompletion.h
index a5b075f3b..a6b68b1b4 100644
--- a/tdeio/tdeio/kurlcompletion.h
+++ b/tdeio/tdeio/kurlcompletion.h
@@ -33,7 +33,7 @@ class KURLCompletionPrivate;
 
 /**
  * This class does completion of URLs including user directories (~user)
- * and environment variables.  Remote URLs are passed to KIO.
+ * and environment variables.  Remote URLs are passed to TDEIO.
  *
  * @short Completion of a single URL
  * @author David Smith <dsmith@algonet.se>
@@ -47,7 +47,7 @@ public:
 	 * Determines how completion is done.
 	 * @li ExeCompletion - executables in $PATH or with full path.
 	 * @li FileCompletion - all files with full path or in dir(), URLs
-	 * are listed using KIO.
+	 * are listed using TDEIO.
 	 * @li DirCompletion - Same as FileCompletion but only returns directories.
 	 */
 	enum Mode { ExeCompletion=1, FileCompletion, DirCompletion, SystemExeCompletion };
@@ -69,12 +69,12 @@ public:
 	/**
 	 * Finds completions to the given text.
 	 *
-	 * Remote URLs are listed with KIO. For performance reasons, local files
-	 * are listed with KIO only if KURLCOMPLETION_LOCAL_KIO is set.
-	 * The completion is done asyncronously if KIO is used.
+	 * Remote URLs are listed with TDEIO. For performance reasons, local files
+	 * are listed with TDEIO only if KURLCOMPLETION_LOCAL_TDEIO is set.
+	 * The completion is done asyncronously if TDEIO is used.
 	 *
 	 * Returns the first match for user, environment, and local dir completion
-	 * and TQString::null for asynchronous completion (KIO or threaded).
+	 * and TQString::null for asynchronous completion (TDEIO or threaded).
 	 *
 	 * @param text the text to complete
 	 * @return the first match, or TQString::null if not found
diff --git a/tdeio/tdeio/metainfojob.h b/tdeio/tdeio/metainfojob.h
index 6bf72a999..27aa4e839 100644
--- a/tdeio/tdeio/metainfojob.h
+++ b/tdeio/tdeio/metainfojob.h
@@ -27,9 +27,9 @@
 
 namespace TDEIO {
     /**
-     * MetaInfoJob is a KIO Job to retrieve meta information from files.
+     * MetaInfoJob is a TDEIO Job to retrieve meta information from files.
      * 
-     * @short KIO Job to retrieve meta information from files.
+     * @short TDEIO Job to retrieve meta information from files.
      * @since 3.1
      */
     class TDEIO_EXPORT MetaInfoJob : public TDEIO::Job
diff --git a/tdeio/tdeio/netaccess.h b/tdeio/tdeio/netaccess.h
index 0c7f020ea..82769be73 100644
--- a/tdeio/tdeio/netaccess.h
+++ b/tdeio/tdeio/netaccess.h
@@ -52,9 +52,9 @@ namespace TDEIO {
    * namespace for static functions, though an instance of the class
    * is built for internal purposes.
    *
-   * Port to kio done by David Faure, faure@kde.org
+   * Port to tdeio done by David Faure, faure@kde.org
    *
-   * @short Provides an easy, synchronous interface to KIO file operations.
+   * @short Provides an easy, synchronous interface to TDEIO file operations.
    */
 class TDEIO_EXPORT NetAccess : public TQObject
 {
diff --git a/tdeio/tdeio/passdlg.h b/tdeio/tdeio/passdlg.h
index 810993a3e..929fa1014 100644
--- a/tdeio/tdeio/passdlg.h
+++ b/tdeio/tdeio/passdlg.h
@@ -29,7 +29,7 @@ namespace TDEIO {
 /**
  * A dialog for requesting a login and a password from the end user.
  *
- * KIO-Slave authors are encouraged to use SlaveBase::openPassDlg
+ * TDEIO-Slave authors are encouraged to use SlaveBase::openPassDlg
  * instead of directly instantiating this dialog.
  * @short dialog for requesting login and password from the end user
  */
diff --git a/tdeio/tdeio/previewjob.h b/tdeio/tdeio/previewjob.h
index f0730995c..e203b807e 100644
--- a/tdeio/tdeio/previewjob.h
+++ b/tdeio/tdeio/previewjob.h
@@ -32,7 +32,7 @@ class TQPixmap;
 namespace TDEIO {
     /*!
      * This class catches a preview (thumbnail) for files.
-     * @short KIO Job to get a thumbnail picture
+     * @short TDEIO Job to get a thumbnail picture
      */
     class TDEIO_EXPORT PreviewJob : public TDEIO::Job
     {
diff --git a/tdeio/tdeio/scheduler.h b/tdeio/tdeio/scheduler.h
index 3b9b23d92..28c030a25 100644
--- a/tdeio/tdeio/scheduler.h
+++ b/tdeio/tdeio/scheduler.h
@@ -234,7 +234,7 @@ namespace TDEIO {
          * Send the slave that was put on hold back to TDELauncher. This
          * allows another process to take over the slave and resume the job
          * the that was started.
-         * Register the mainwindow @p wid with the KIO subsystem
+         * Register the mainwindow @p wid with the TDEIO subsystem
          * Do not call this, it is called automatically from
          * void TDEIO::Job::setWindow(TQWidget*).
 	 * @param wid the window to register
diff --git a/tdeio/tdeio/sessiondata.h b/tdeio/tdeio/sessiondata.h
index a87e63dba..4aee40497 100644
--- a/tdeio/tdeio/sessiondata.h
+++ b/tdeio/tdeio/sessiondata.h
@@ -18,8 +18,8 @@
    Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#ifndef __KIO_SESSIONDATA_H
-#define __KIO_SESSIONDATA_H
+#ifndef __TDEIO_SESSIONDATA_H
+#define __TDEIO_SESSIONDATA_H
 
 #include <tqobject.h>
 #include <tdeio/global.h>
diff --git a/tdeio/tdeio/slave.h b/tdeio/tdeio/slave.h
index 80ae30d3a..96e018e85 100644
--- a/tdeio/tdeio/slave.h
+++ b/tdeio/tdeio/slave.h
@@ -19,8 +19,8 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef KIO_SLAVE_H
-#define KIO_SLAVE_H
+#ifndef TDEIO_SLAVE_H
+#define TDEIO_SLAVE_H
 
 #include <time.h>
 #include <unistd.h>
diff --git a/tdeio/tdeio/slavebase.cpp b/tdeio/tdeio/slavebase.cpp
index e7989ec6b..763170437 100644
--- a/tdeio/tdeio/slavebase.cpp
+++ b/tdeio/tdeio/slavebase.cpp
@@ -65,8 +65,8 @@ using namespace TDEIO;
 template class TQPtrList<TQValueList<UDSAtom> >;
 typedef TQValueList<TQCString> AuthKeysList;
 typedef TQMap<TQString,TQCString> AuthKeysMap;
-#define KIO_DATA TQByteArray data; TQDataStream stream( data, IO_WriteOnly ); stream
-#define KIO_FILESIZE_T(x) (unsigned long)(x & 0xffffffff) << (unsigned long)(x >> 32)
+#define TDEIO_DATA TQByteArray data; TQDataStream stream( data, IO_WriteOnly ); stream
+#define TDEIO_FILESIZE_T(x) (unsigned long)(x & 0xffffffff) << (unsigned long)(x >> 32)
 
 namespace TDEIO {
 
@@ -329,7 +329,7 @@ void SlaveBase::dispatchLoop()
        }
     }
 #else
-#error The KIO slave system only works under UNIX
+#error The TDEIO slave system only works under UNIX
 #endif
 }
 
@@ -390,7 +390,7 @@ TDEConfigBase *SlaveBase::config()
 
 void SlaveBase::sendMetaData()
 {
-   KIO_DATA << mOutgoingMetaData;
+   TDEIO_DATA << mOutgoingMetaData;
 
    slaveWriteError = false;
    m_pConnection->send( INF_META_DATA, data );
@@ -430,7 +430,7 @@ void SlaveBase::error( int _errid, const TQString &_text )
 {
     mIncomingMetaData.clear(); // Clear meta data
     mOutgoingMetaData.clear();
-    KIO_DATA << (TQ_INT32) _errid << _text;
+    TDEIO_DATA << (TQ_INT32) _errid << _text;
 
     m_pConnection->send( MSG_ERROR, data );
     //reset
@@ -468,7 +468,7 @@ void SlaveBase::slaveStatus( const TQString &host, bool connected )
 {
     pid_t pid = getpid();
     TQ_INT8 b = connected ? 1 : 0;
-    KIO_DATA << pid << mProtocol << host << b;
+    TDEIO_DATA << pid << mProtocol << host << b;
     if (d->onHold)
        stream << d->onHoldUrl;
     m_pConnection->send( MSG_SLAVE_STATUS, data );
@@ -481,7 +481,7 @@ void SlaveBase::canResume()
 
 void SlaveBase::totalSize( TDEIO::filesize_t _bytes )
 {
-    KIO_DATA << KIO_FILESIZE_T(_bytes);
+    TDEIO_DATA << TDEIO_FILESIZE_T(_bytes);
     slaveWriteError = false;
     m_pConnection->send( INF_TOTAL_SIZE, data );
     if (slaveWriteError) exit();
@@ -519,7 +519,7 @@ void SlaveBase::processedSize( TDEIO::filesize_t _bytes )
     }
 
     if( emitSignal ) {
-        KIO_DATA << KIO_FILESIZE_T(_bytes);
+        TDEIO_DATA << TDEIO_FILESIZE_T(_bytes);
         slaveWriteError = false;
         m_pConnection->send( INF_PROCESSED_SIZE, data );
             if (slaveWriteError) exit();
@@ -539,7 +539,7 @@ void SlaveBase::processedPercent( float /* percent */ )
 
 void SlaveBase::speed( unsigned long _bytes_per_second )
 {
-    KIO_DATA << (TQ_UINT32) _bytes_per_second;
+    TDEIO_DATA << (TQ_UINT32) _bytes_per_second;
     slaveWriteError = false;
     m_pConnection->send( INF_SPEED, data );
     if (slaveWriteError) exit();
@@ -547,7 +547,7 @@ void SlaveBase::speed( unsigned long _bytes_per_second )
 
 void SlaveBase::redirection( const KURL& _url )
 {
-    KIO_DATA << _url;
+    TDEIO_DATA << _url;
     m_pConnection->send( INF_REDIRECTION, data );
 }
 
@@ -578,10 +578,10 @@ void SlaveBase::mimeType( const TQString &_type)
     if (!mOutgoingMetaData.isEmpty())
     {
       // kdDebug(7019) << "(" << getpid() << ") mimeType: emitting meta data" << endl;
-      KIO_DATA << mOutgoingMetaData;
+      TDEIO_DATA << mOutgoingMetaData;
       m_pConnection->send( INF_META_DATA, data );
     }
-    KIO_DATA << _type;
+    TDEIO_DATA << _type;
     m_pConnection->send( INF_MIME_TYPE, data );
     while(true)
     {
@@ -613,19 +613,19 @@ void SlaveBase::exit()
 
 void SlaveBase::warning( const TQString &_msg)
 {
-    KIO_DATA << _msg;
+    TDEIO_DATA << _msg;
     m_pConnection->send( INF_WARNING, data );
 }
 
 void SlaveBase::infoMessage( const TQString &_msg)
 {
-    KIO_DATA << _msg;
+    TDEIO_DATA << _msg;
     m_pConnection->send( INF_INFOMESSAGE, data );
 }
 
 bool SlaveBase::requestNetwork(const TQString& host)
 {
-    KIO_DATA << host << d->slaveid;
+    TDEIO_DATA << host << d->slaveid;
     m_pConnection->send( MSG_NET_REQUEST, data );
 
     if ( waitForAnswer( INF_NETWORK_STATUS, 0, data ) != -1 )
@@ -640,13 +640,13 @@ bool SlaveBase::requestNetwork(const TQString& host)
 
 void SlaveBase::dropNetwork(const TQString& host)
 {
-    KIO_DATA << host << d->slaveid;
+    TDEIO_DATA << host << d->slaveid;
     m_pConnection->send( MSG_NET_DROP, data );
 }
 
 void SlaveBase::statEntry( const UDSEntry& entry )
 {
-    KIO_DATA << entry;
+    TDEIO_DATA << entry;
     slaveWriteError = false;
     m_pConnection->send( MSG_STAT_ENTRY, data );
     if (slaveWriteError) exit();
@@ -696,7 +696,7 @@ void SlaveBase::listEntry( const UDSEntry& entry, bool _ready )
 
 void SlaveBase::listEntries( const UDSEntryList& list )
 {
-    KIO_DATA << (TQ_UINT32)list.count();
+    TDEIO_DATA << (TQ_UINT32)list.count();
     UDSEntryListConstIterator it = list.begin();
     UDSEntryListConstIterator end = list.end();
     for (; it != end; ++it)
@@ -711,13 +711,13 @@ void SlaveBase::sendAuthenticationKey( const TQCString& key,
                                        const TQCString& group,
                                        bool keepPass )
 {
-    KIO_DATA << key << group << keepPass;
+    TDEIO_DATA << key << group << keepPass;
     m_pConnection->send( MSG_AUTH_KEY, data );
 }
 
 void SlaveBase::delCachedAuthentication( const TQString& key )
 {
-    KIO_DATA << key.utf8() ;
+    TDEIO_DATA << key.utf8() ;
     m_pConnection->send( MSG_DEL_AUTH_KEY, data );
 }
 
@@ -822,7 +822,7 @@ void SlaveBase::localURL(const KURL& remoteURL)
         islocal = false;
         retURL = remoteURL;
     }
-    KIO_DATA << islocal << retURL;
+    TDEIO_DATA << islocal << retURL;
     m_pConnection->send( INF_LOCALURL, data );
 }
 
@@ -917,7 +917,7 @@ int SlaveBase::messageBox( const TQString &text, MessageBoxType type, const TQSt
                            const TQString &buttonYes, const TQString &buttonNo, const TQString &dontAskAgainName )
 {
     kdDebug(7019) << "messageBox " << type << " " << text << " - " << caption << buttonYes << buttonNo << endl;
-    KIO_DATA << (TQ_INT32)type << text << caption << buttonYes << buttonNo << dontAskAgainName;
+    TDEIO_DATA << (TQ_INT32)type << text << caption << buttonYes << buttonNo << dontAskAgainName;
     m_pConnection->send( INF_MESSAGEBOX, data );
     if ( waitForAnswer( CMD_MESSAGEBOXANSWER, 0, data ) != -1 )
     {
@@ -934,7 +934,7 @@ bool SlaveBase::canResume( TDEIO::filesize_t offset )
 {
     kdDebug(7019) << "SlaveBase::canResume offset=" << TDEIO::number(offset) << endl;
     d->needSendCanResume = false;
-    KIO_DATA << KIO_FILESIZE_T(offset);
+    TDEIO_DATA << TDEIO_FILESIZE_T(offset);
     m_pConnection->send( MSG_RESUME, data );
     if ( offset )
     {
diff --git a/tdeio/tdeio/slaveconfig.h b/tdeio/tdeio/slaveconfig.h
index 08a5e6782..fd6fa1e1e 100644
--- a/tdeio/tdeio/slaveconfig.h
+++ b/tdeio/tdeio/slaveconfig.h
@@ -18,8 +18,8 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#ifndef KIO_SLAVE_CONFIG_H
-#define KIO_SLAVE_CONFIG_H
+#ifndef TDEIO_SLAVE_CONFIG_H
+#define TDEIO_SLAVE_CONFIG_H
 
 #include <tqobject.h>
 #include <tdeio/global.h>
diff --git a/tdeio/tdeio/slaveinterface.h b/tdeio/tdeio/slaveinterface.h
index 946efa291..584a4f606 100644
--- a/tdeio/tdeio/slaveinterface.h
+++ b/tdeio/tdeio/slaveinterface.h
@@ -39,7 +39,7 @@ class SlaveInterfacePrivate;
   // Definition of enum Command has been moved to global.h
 
  /**
-  * Identifiers for KIO informational messages.
+  * Identifiers for TDEIO informational messages.
   */
  enum Info {
    INF_TOTAL_SIZE = 10,
@@ -60,7 +60,7 @@ class SlaveInterfacePrivate;
  };
 
  /**
-  * Identifiers for KIO data messages.
+  * Identifiers for TDEIO data messages.
   */
  enum Message {
    MSG_DATA = 100,
diff --git a/tdeio/tdeio/tdeemailsettings.h b/tdeio/tdeio/tdeemailsettings.h
index 0ade4520e..235dd2032 100644
--- a/tdeio/tdeio/tdeemailsettings.h
+++ b/tdeio/tdeio/tdeemailsettings.h
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef _KEMAILSETTINGS_H
-#define _KEMAILSETTINGS_H
+#ifndef _TDEEMAILSETTINGS_H
+#define _TDEEMAILSETTINGS_H
 
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/tdeio/tdeio/tdefileitem.h b/tdeio/tdeio/tdefileitem.h
index f068e3503..eace44d94 100644
--- a/tdeio/tdeio/tdefileitem.h
+++ b/tdeio/tdeio/tdefileitem.h
@@ -47,7 +47,7 @@ public:
    * Creates an item representing a file, from a UDSEntry.
    * This is the preferred constructor when using TDEIO::listDir().
    *
-   * @param _entry the KIO entry used to get the file, contains info about it
+   * @param _entry the TDEIO entry used to get the file, contains info about it
    * @param _url the file url
    * @param _determineMimeTypeOnDemand specifies if the mimetype of the given
    *       URL should be determined immediately or on demand
@@ -241,7 +241,7 @@ public:
   TQString linkDest() const;
 
   /**
-   * Returns the local path if isLocalFile() == true or the KIO item has
+   * Returns the local path if isLocalFile() == true or the TDEIO item has
    * a UDS_LOCAL_PATH atom.
    * @return the item local path, or TQString::null if not known
    * @since 3.4
diff --git a/tdeio/tdeio/tdefilemetainfo.h b/tdeio/tdeio/tdefilemetainfo.h
index dde596d19..2266690e8 100644
--- a/tdeio/tdeio/tdefilemetainfo.h
+++ b/tdeio/tdeio/tdefilemetainfo.h
@@ -17,8 +17,8 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  */
-#ifndef KILEMETAINFO_H
-#define KILEMETAINFO_H
+#ifndef TDEFILEMETAINFO_H
+#define TDEFILEMETAINFO_H
 
 /* Hack for HPUX: Namespace pollution
    m_unit is a define in <sys/sysmacros.h> */
@@ -1735,4 +1735,4 @@ TDEIO_EXPORT TQDataStream& operator <<(TQDataStream& s, const KFileMetaInfo& );
 TDEIO_EXPORT TQDataStream& operator >>(TQDataStream& s, KFileMetaInfo& );
 
 
-#endif // KILEMETAINFO_H
+#endif // TDEFILEMETAINFO_H
diff --git a/tdeio/tdeio/thumbcreator.h b/tdeio/tdeio/thumbcreator.h
index 756dd0cf9..d2061ce26 100644
--- a/tdeio/tdeio/thumbcreator.h
+++ b/tdeio/tdeio/thumbcreator.h
@@ -51,7 +51,7 @@ class TQImage;
  * INCLUDES = $(all_includes)
  * kde_module_LTLIBRARIES = yourthumbcreator.la
  * yourthumbcreator_la_SOURCES = yourthumbcreator.cpp
- * yourthumbcreator_la_LIBADD = $(LIB_KIO)
+ * yourthumbcreator_la_LIBADD = $(LIB_TDEIO)
  * yourthumbcreator_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
  * kde_services_DATA = yourthumbcreator.desktop
  * \endcode
diff --git a/tdeio/tdeioexec/Makefile.am b/tdeio/tdeioexec/Makefile.am
index 2879342ff..e26f1e83a 100644
--- a/tdeio/tdeioexec/Makefile.am
+++ b/tdeio/tdeioexec/Makefile.am
@@ -3,8 +3,8 @@ AM_CPPFLAGS = $(all_includes)
 bin_PROGRAMS = tdeioexec
 
 tdeioexec_SOURCES = main.cpp
-tdeioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-tdeioexec_LDADD   = $(LIB_KIO)
+tdeioexec_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeioexec_LDADD   = $(LIB_TDEIO)
 
 noinst_HEADERS = main.h
 METASOURCES = AUTO
diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp
index f6324afa5..54987e43c 100644
--- a/tdeio/tdeioexec/main.cpp
+++ b/tdeio/tdeioexec/main.cpp
@@ -47,7 +47,7 @@
 
 
 static const char description[] =
-        I18N_NOOP("KIO Exec - Opens remote files, watches modifications, asks for upload");
+        I18N_NOOP("TDEIO Exec - Opens remote files, watches modifications, asks for upload");
 
 static TDECmdLineOptions options[] =
 {
diff --git a/tdeio/tests/Makefile.am b/tdeio/tests/Makefile.am
index 138d0f0d2..9ef135c53 100644
--- a/tdeio/tests/Makefile.am
+++ b/tdeio/tests/Makefile.am
@@ -17,8 +17,8 @@
 #    Boston, MA 02110-1301, USA.
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/tdeio $(all_includes)
-LDADD = $(LIB_KIO)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+LDADD = $(LIB_TDEIO)
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 check_PROGRAMS = tdesycocatest getalltest kruntest ktartest kziptest\
                  tdeioslavetest kdirwatchtest kshredtest speed kurifiltertest \
@@ -77,14 +77,14 @@ kacltest_SOURCES = kacltest.cpp
 
 check_LTLIBRARIES = tdeunittest_kdirwatch.la
 tdeunittest_kdirwatch_la_SOURCES = kdirwatchunittest.cpp
-tdeunittest_kdirwatch_la_LIBADD = $(LIB_KUNITTEST) $(LIB_KIO)
+tdeunittest_kdirwatch_la_LIBADD = $(LIB_TDEUNITTEST) $(LIB_TDEIO)
 tdeunittest_kdirwatch_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN)
 
 # tdefile meta stuff. Comment this in, if you want a small
 # metadata plugin test and "make install".
 #kde_module_LTLIBRARIES = dummymeta.la
 #dummymeta_la_SOURCES = dummymeta.cpp
-#dummymeta_la_LIBADD = $(LIB_KIO)
+#dummymeta_la_LIBADD = $(LIB_TDEIO)
 #dummymeta_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 #services_DATA = dummymeta.desktop
diff --git a/tdeio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp
index a2d5b40d1..076bc250d 100644
--- a/tdeio/tests/jobtest.cpp
+++ b/tdeio/tests/jobtest.cpp
@@ -461,7 +461,7 @@ void JobTest::moveFileNoPermissions()
     bool ok = TDEIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData );
     assert( !ok );
     assert( TDEIO::NetAccess::lastError() == TDEIO::ERR_ACCESS_DENIED );
-    // OK this is fishy. Just like mv(1), KIO's behavior depends on whether
+    // OK this is fishy. Just like mv(1), TDEIO's behavior depends on whether
     // a direct rename(2) was used, or a full copy+del. In the first case
     // there is no destination file created, but in the second case the
     // destination file remains.
diff --git a/tdeio/tests/kdirwatchunittest.cpp b/tdeio/tests/kdirwatchunittest.cpp
index 3d7505a3f..ed59f3c19 100644
--- a/tdeio/tests/kdirwatchunittest.cpp
+++ b/tdeio/tests/kdirwatchunittest.cpp
@@ -106,8 +106,8 @@ void KDirWatchTest::rename_file(const TQString& from, const TQString& to)
   ::rename(TQFile::encodeName(from), TQFile::encodeName(to));
 }
 
-KUNITTEST_MODULE ( tdeunittest_kdirwatch, "KDirWatchTest" )
-KUNITTEST_MODULE_REGISTER_TESTER (KDirWatchTest)
+TDEUNITTEST_MODULE ( tdeunittest_kdirwatch, "KDirWatchTest" )
+TDEUNITTEST_MODULE_REGISTER_TESTER (KDirWatchTest)
 
 #define SLEEP() TQApplication::processEvents();
 
diff --git a/tdeio/tests/kiopassdlgtest.cpp b/tdeio/tests/kiopassdlgtest.cpp
index ba429e67a..7bf4df7a8 100644
--- a/tdeio/tests/kiopassdlgtest.cpp
+++ b/tdeio/tests/kiopassdlgtest.cpp
@@ -8,7 +8,7 @@
 
 int main ( int argc, char** argv )
 {
-    TDEAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0");
+    TDEAboutData aboutData("kiopassdlgtest", "TDEIO Password Dialog Test", "1.0");
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDEApplication app;
 
diff --git a/tdeio/tests/kpropsdlgtest.cpp b/tdeio/tests/kpropsdlgtest.cpp
index 527077eb0..6009af667 100644
--- a/tdeio/tests/kpropsdlgtest.cpp
+++ b/tdeio/tests/kpropsdlgtest.cpp
@@ -13,7 +13,7 @@ static TDECmdLineOptions options[] =
 
 int main ( int argc, char** argv )
 {
-    TDEAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0");
+    TDEAboutData aboutData("kpropertiesdialogtest", "TDEIO Properties Dialog Test", "1.0");
     TDECmdLineArgs::init(argc, argv, &aboutData);
     TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/tdeio/tests/tdeioslavetest.h b/tdeio/tests/tdeioslavetest.h
index 04992f889..7f11bd4e3 100644
--- a/tdeio/tests/tdeioslavetest.h
+++ b/tdeio/tests/tdeioslavetest.h
@@ -9,8 +9,8 @@
   LGPL version 2.
  */
 
-#ifndef _KIOSLAVETEST_H
-#define _KIOSLAVETEST_H
+#ifndef _TDEIOSLAVETEST_H
+#define _TDEIOSLAVETEST_H
 
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -105,4 +105,4 @@ private:
   TDEIO::Slave *slave;
 };
 
-#endif // _KIOSLAVETEST_H
+#endif // _TDEIOSLAVETEST_H