Fix a few remaining references to kio_

31 files changed, 78 insertions, 78 deletions

diff --git a/tdeio/DESIGN.metadata b/tdeio/DESIGN.metadata
index 783d7f52a..bba81addf 100644
--- a/tdeio/DESIGN.metadata
+++ b/tdeio/DESIGN.metadata
@@ -109,7 +109,7 @@ ssl_proxied	bool		Presently exists only if true.  Set in TCPSlaveBase to indicat
 
 main_frame_request	bool	Actually for SSL, this is set in the caller to tell TCPSlaveBase if this is the request for the main frame of an html page. (dfault: true)
 
-HTTP-Version		string	The HTTP version in use for kio_http (set by http)
+HTTP-Version		string	The HTTP version in use for tdeio_http (set by http)
 
 PropagateHttpHeader	bool	Whether HTTP headers should be send back (read by http)
 
diff --git a/tdeio/misc/tdeio_uiserver.desktop b/tdeio/misc/tdeio_uiserver.desktop
index bba0a7c7c..969e0308e 100644
--- a/tdeio/misc/tdeio_uiserver.desktop
+++ b/tdeio/misc/tdeio_uiserver.desktop
@@ -3,14 +3,14 @@ Type=Service
 Name=tdeio_uiserver
 Name[de]=Server der graphischen Oberfläche
 Name[fy]=Kio_uiserver
-Name[ja]=kio_uiサーバ
+Name[ja]=tdeio_uiサーバ
 Name[mn]=График гадаргуугийн сервер
 Name[nds]=tdeio_uiserver, Server för de graafsche Böversiet
 Name[nl]=Kio_uiserver
-Name[nso]=kio_uiseabi
+Name[nso]=tdeio_uiseabi
 Name[ro]=Kio_uiserver
 Name[sv]=Kio-gränssnittsserver
-Name[ta]=kio_uiசேவையகம்
+Name[ta]=tdeio_uiசேவையகம்
 Name[te]=కేఐఓ_యుఐసెర్వర్
 Exec=tdeio_uiserver
 Comment=TDE's Progress Info UI server
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index a76fdc336..bc2f649b9 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -781,7 +781,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     // Extract the file name only
     filename = properties->defaultName();
     if ( filename.isEmpty() ) { // no template
-      filename = item->name(); // this gives support for UDS_NAME, e.g. for kio_trash or kio_system
+      filename = item->name(); // this gives support for UDS_NAME, e.g. for tdeio_trash or tdeio_system
     } else {
       m_bFromTemplate = true;
       setDirty(); // to enforce that the copy happens
diff --git a/tdeio/tdeio/chmodjob.h b/tdeio/tdeio/chmodjob.h
index 105df0e4d..59fb253bc 100644
--- a/tdeio/tdeio/chmodjob.h
+++ b/tdeio/tdeio/chmodjob.h
@@ -18,8 +18,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_chmodjob_h__
-#define __kio_chmodjob_h__
+#ifndef __tdeio_chmodjob_h__
+#define __tdeio_chmodjob_h__
 
 #include <kurl.h>
 #include <tqstring.h>
diff --git a/tdeio/tdeio/dataprotocol.cpp b/tdeio/tdeio/dataprotocol.cpp
index acc7b28e9..8478ea0cb 100644
--- a/tdeio/tdeio/dataprotocol.cpp
+++ b/tdeio/tdeio/dataprotocol.cpp
@@ -47,19 +47,19 @@ using namespace TDEIO;
 extern "C" {
 
   int kdemain( int argc, char **argv ) {
-    TDEInstance instance( "kio_data" );
+    TDEInstance instance( "tdeio_data" );
 
-    kdDebug(7101) << "*** Starting kio_data " << endl;
+    kdDebug(7101) << "*** Starting tdeio_data " << endl;
 
     if (argc != 4) {
-      kdDebug(7101) << "Usage: kio_data  protocol domain-socket1 domain-socket2" << endl;
+      kdDebug(7101) << "Usage: tdeio_data  protocol domain-socket1 domain-socket2" << endl;
       exit(-1);
     }
 
     DataProtocol slave(argv[2], argv[3]);
     slave.dispatchLoop();
 
-    kdDebug(7101) << "*** kio_data Done" << endl;
+    kdDebug(7101) << "*** tdeio_data Done" << endl;
     return 0;
   }
 }
@@ -242,7 +242,7 @@ static void parseDataHeader(const KURL &url, DataHeader &header_info) {
 
 #ifdef DATAKIOSLAVE
 DataProtocol::DataProtocol(const TQCString &pool_socket, const TQCString &app_socket)
-	: SlaveBase("kio_data", pool_socket, app_socket) {
+	: SlaveBase("tdeio_data", pool_socket, app_socket) {
 #else
 DataProtocol::DataProtocol() {
 #endif
@@ -260,7 +260,7 @@ DataProtocol::~DataProtocol() {
 void DataProtocol::get(const KURL& url) {
   ref();
   //kdDebug() << "===============================================================================================================================================================================" << endl;
-  kdDebug() << "kio_data@"<<this<<"::get(const KURL& url)" << endl ;
+  kdDebug() << "tdeio_data@"<<this<<"::get(const KURL& url)" << endl ;
 
   DataHeader hdr;
   parseDataHeader(url,hdr);
diff --git a/tdeio/tdeio/davjob.h b/tdeio/tdeio/davjob.h
index 1bbb722d0..83e3bb3d8 100644
--- a/tdeio/tdeio/davjob.h
+++ b/tdeio/tdeio/davjob.h
@@ -18,8 +18,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_davjob_h__
-#define __kio_davjob_h__
+#ifndef __tdeio_davjob_h__
+#define __tdeio_davjob_h__
 
 #include <kurl.h>
 
diff --git a/tdeio/tdeio/global.h b/tdeio/tdeio/global.h
index 44b9df616..1cec378e3 100644
--- a/tdeio/tdeio/global.h
+++ b/tdeio/tdeio/global.h
@@ -15,8 +15,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef __kio_global_h__
-#define __kio_global_h__
+#ifndef __tdeio_global_h__
+#define __tdeio_global_h__
 
 #include <tqstring.h>
 #include <tqvaluelist.h>
diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp
index 7bea676c5..a29ffc4d0 100644
--- a/tdeio/tdeio/job.cpp
+++ b/tdeio/tdeio/job.cpp
@@ -1354,7 +1354,7 @@ TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, boo
 	static TQValueList< int >* overriden_ports = NULL;
 	if( !override_loaded )
 	{
-	    TDEConfig cfg( "kio_httprc", true );
+	    TDEConfig cfg( "tdeio_httprc", true );
 	    overriden_ports = new TQValueList< int >;
 	    *overriden_ports = cfg.readIntListEntry( "OverriddenPorts" );
 	    override_loaded = true;
@@ -2307,7 +2307,7 @@ void CopyJob::slotStart()
 }
 
 // For unit test purposes
-TDEIO_EXPORT bool kio_resolve_local_urls = true;
+TDEIO_EXPORT bool tdeio_resolve_local_urls = true;
 
 void CopyJob::slotResultStating( Job *job )
 {
@@ -2376,7 +2376,7 @@ void CopyJob::slotResultStating( Job *job )
         if ( isGlobalDest )
             d->m_globalDestinationState = destinationState;
 
-        if ( !sLocalPath.isEmpty() && kio_resolve_local_urls ) {
+        if ( !sLocalPath.isEmpty() && tdeio_resolve_local_urls ) {
             m_dest = KURL();
             m_dest.setPath(sLocalPath);
             if ( isGlobalDest )
@@ -2586,7 +2586,7 @@ void CopyJob::slotEntries(TDEIO::Job* job, const UDSEntryList& list)
                 }
             }
             //kdDebug(7007) << "displayName=" << displayName << " url=" << url << endl;
-            if (!localPath.isEmpty() && kio_resolve_local_urls) {
+            if (!localPath.isEmpty() && tdeio_resolve_local_urls) {
                 url = KURL();
                 url.setPath(localPath);
             }
diff --git a/tdeio/tdeio/job.h b/tdeio/tdeio/job.h
index d4d7dd41d..79a21aeec 100644
--- a/tdeio/tdeio/job.h
+++ b/tdeio/tdeio/job.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_job_h__
-#define __kio_job_h__
+#ifndef __tdeio_job_h__
+#define __tdeio_job_h__
 
 #include <tdeio/jobclasses.h>
 
@@ -92,7 +92,7 @@ namespace TDEIO {
     /**
      * Execute any command that is specific to one slave (protocol).
      *
-     * Examples are : HTTP POST, mount and unmount (kio_file)
+     * Examples are : HTTP POST, mount and unmount (tdeio_file)
      *
      * @param url The URL isn't passed to the slave, but is used to know
      *        which slave to send it to :-)
@@ -106,7 +106,7 @@ namespace TDEIO {
     /**
      * Mount filesystem.
      *
-     * Special job for @p kio_file.
+     * Special job for @p tdeio_file.
      *
      * @param ro Mount read-only if @p true.
      * @param fstype File system type (e.g. "ext2", can be 0L).
@@ -120,7 +120,7 @@ namespace TDEIO {
     /**
      * Unmount filesystem.
      *
-     * Special job for @p kio_file.
+     * Special job for @p tdeio_file.
      *
      * @param point Point to unmount.
      * @param showProgressInfo true to show progress information
diff --git a/tdeio/tdeio/jobclasses.h b/tdeio/tdeio/jobclasses.h
index 7f5ec1f85..cae22e8c5 100644
--- a/tdeio/tdeio/jobclasses.h
+++ b/tdeio/tdeio/jobclasses.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_jobclasses_h__
-#define __kio_jobclasses_h__
+#ifndef __tdeio_jobclasses_h__
+#define __tdeio_jobclasses_h__
 
 #include <tqobject.h>
 #include <tqptrlist.h>
@@ -37,7 +37,7 @@
 class Observer;
 class TQTimer;
 
-#define KIO_COPYJOB_HAS_SETINTERACTIVE // new in 3.4. Used by kio_trash.
+#define KIO_COPYJOB_HAS_SETINTERACTIVE // new in 3.4. Used by tdeio_trash.
 
 namespace TDEIO {
 
diff --git a/tdeio/tdeio/kdirwatch.cpp b/tdeio/tdeio/kdirwatch.cpp
index c4057264b..4fcb921bb 100644
--- a/tdeio/tdeio/kdirwatch.cpp
+++ b/tdeio/tdeio/kdirwatch.cpp
@@ -1396,7 +1396,7 @@ bool KDirWatchPrivate::isNoisyFile( const char * filename )
     if (strncmp(filename, ".X.err", 6) == 0) return true;
     if (strncmp(filename, ".xsession-errors", 16) == 0) return true;
     // fontconfig updates the cache on every KDE app start
-    // (inclusive kio_thumbnail slaves)
+    // (inclusive tdeio_thumbnail slaves)
     if (strncmp(filename, ".fonts.cache", 12) == 0) return true;
   }
 
diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index 344be793a..e50d6c427 100644
--- a/tdeio/tdeio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -729,7 +729,7 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const
           const KURL url( u );
           if ( url.protocol() == "trash" ) {
               // We need to find if the trash is empty, preferrably without using a KIO job.
-              // So instead kio_trash leaves an entry in its config file for us.
+              // So instead tdeio_trash leaves an entry in its config file for us.
               KSimpleConfig trashConfig( "trashrc", true );
               trashConfig.setGroup( "Status" );
               if ( trashConfig.readBoolEntry( "Empty", true ) ) {
diff --git a/tdeio/tdeio/kprotocolinfo.h b/tdeio/tdeio/kprotocolinfo.h
index 65ed8c7cb..ae0eb56a2 100644
--- a/tdeio/tdeio/kprotocolinfo.h
+++ b/tdeio/tdeio/kprotocolinfo.h
@@ -104,8 +104,8 @@ public:
 
   /**
    * Returns the library / executable to open for the protocol @p protocol
-   * Example : "kio_ftp", meaning either the executable "kio_ftp" or
-   * the library "kio_ftp.la" (recommended), whichever is available.
+   * Example : "tdeio_ftp", meaning either the executable "tdeio_ftp" or
+   * the library "tdeio_ftp.la" (recommended), whichever is available.
    *
    * This corresponds to the "exec=" field in the protocol description file.
    * @param protocol the protocol to check
@@ -422,7 +422,7 @@ public:
    * copying a file or directory to another directory. By default the destination
    * filename is made out of the filename in the source URL. However if the
    * ioslave displays names that are different from the filename of the URL
-   * (e.g. kio_fonts shows Arial for arial.ttf, or kio_trash shows foo.txt and
+   * (e.g. tdeio_fonts shows Arial for arial.ttf, or tdeio_trash shows foo.txt and
    * uses some internal URL), using Name means that the display name (UDS_NAME)
    * will be used to as the filename in the destination directory.
    *
diff --git a/tdeio/tdeio/kprotocolmanager.cpp b/tdeio/tdeio/kprotocolmanager.cpp
index 363992988..7ed06376b 100644
--- a/tdeio/tdeio/kprotocolmanager.cpp
+++ b/tdeio/tdeio/kprotocolmanager.cpp
@@ -102,7 +102,7 @@ TDEConfig *KProtocolManager::http_config()
 
   if (!d->http_config)
   {
-     d->http_config = new TDEConfig("kio_httprc", false, false);
+     d->http_config = new TDEConfig("tdeio_httprc", false, false);
   }
   return d->http_config;
 }
diff --git a/tdeio/tdeio/metainfojob.h b/tdeio/tdeio/metainfojob.h
index 3a9fab67e..6bf72a999 100644
--- a/tdeio/tdeio/metainfojob.h
+++ b/tdeio/tdeio/metainfojob.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_metainfojob_h__
-#define __kio_metainfojob_h__
+#ifndef __tdeio_metainfojob_h__
+#define __tdeio_metainfojob_h__
 
 #include <tdeio/job.h>
 #include <tdefileitem.h>
diff --git a/tdeio/tdeio/netaccess.h b/tdeio/tdeio/netaccess.h
index 356a91738..0c7f020ea 100644
--- a/tdeio/tdeio/netaccess.h
+++ b/tdeio/tdeio/netaccess.h
@@ -20,8 +20,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_netaccess_h
-#define __kio_netaccess_h
+#ifndef __tdeio_netaccess_h
+#define __tdeio_netaccess_h
 
 #include <tqobject.h>
 #include <tqstring.h>
diff --git a/tdeio/tdeio/observer.h b/tdeio/tdeio/observer.h
index f018bb399..fd3cb6310 100644
--- a/tdeio/tdeio/observer.h
+++ b/tdeio/tdeio/observer.h
@@ -16,8 +16,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef __kio_observer_h__
-#define __kio_observer_h__
+#ifndef __tdeio_observer_h__
+#define __tdeio_observer_h__
 
 #include <tqobject.h>
 #include <dcopobject.h>
diff --git a/tdeio/tdeio/passdlg.h b/tdeio/tdeio/passdlg.h
index 864023398..810993a3e 100644
--- a/tdeio/tdeio/passdlg.h
+++ b/tdeio/tdeio/passdlg.h
@@ -17,8 +17,8 @@
    Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_pass_dlg_h__
-#define __kio_pass_dlg_h__
+#ifndef __tdeio_pass_dlg_h__
+#define __tdeio_pass_dlg_h__
 
 #include <kdialogbase.h>
 
diff --git a/tdeio/tdeio/paste.h b/tdeio/tdeio/paste.h
index 66579831a..6fdf1b2a4 100644
--- a/tdeio/tdeio/paste.h
+++ b/tdeio/tdeio/paste.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_paste_h__
-#define __kio_paste_h__
+#ifndef __tdeio_paste_h__
+#define __tdeio_paste_h__
 
 #include <tqstring.h>
 #include <tqmemarray.h>
diff --git a/tdeio/tdeio/previewjob.h b/tdeio/tdeio/previewjob.h
index 9c62859c9..f0730995c 100644
--- a/tdeio/tdeio/previewjob.h
+++ b/tdeio/tdeio/previewjob.h
@@ -21,8 +21,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_previewjob_h__
-#define __kio_previewjob_h__
+#ifndef __tdeio_previewjob_h__
+#define __tdeio_previewjob_h__
 
 #include <tdefileitem.h>
 #include <tdeio/job.h>
diff --git a/tdeio/tdeio/renamedlg.h b/tdeio/tdeio/renamedlg.h
index 81f16df94..2183d05b6 100644
--- a/tdeio/tdeio/renamedlg.h
+++ b/tdeio/tdeio/renamedlg.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_rename_dlg__
-#define __kio_rename_dlg__
+#ifndef __tdeio_rename_dlg__
+#define __tdeio_rename_dlg__
 
 #include <kurl.h>
 #include <tqdialog.h>
diff --git a/tdeio/tdeio/scheduler.h b/tdeio/tdeio/scheduler.h
index e55b2293c..08efafc32 100644
--- a/tdeio/tdeio/scheduler.h
+++ b/tdeio/tdeio/scheduler.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef _kio_scheduler_h
-#define _kio_scheduler_h
+#ifndef _tdeio_scheduler_h
+#define _tdeio_scheduler_h
 
 #include "tdeio/job.h"
 #include "tdeio/jobclasses.h"
diff --git a/tdeio/tdeio/skipdlg.h b/tdeio/tdeio/skipdlg.h
index 56252dace..c07086463 100644
--- a/tdeio/tdeio/skipdlg.h
+++ b/tdeio/tdeio/skipdlg.h
@@ -16,8 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_skip_dlg__
-#define __kio_skip_dlg__
+#ifndef __tdeio_skip_dlg__
+#define __tdeio_skip_dlg__
 
 #include <tdelibs_export.h>
 #include <kdialog.h>
diff --git a/tdeio/tdeio/slavebase.h b/tdeio/tdeio/slavebase.h
index 1030d94c4..05d3cbbed 100644
--- a/tdeio/tdeio/slavebase.h
+++ b/tdeio/tdeio/slavebase.h
@@ -482,11 +482,11 @@ public:
     virtual void del( const KURL &url, bool isfile);
 
     // TODO KDE4: add setLinkDest() or something, to modify symlink targets.
-    // Will be used for kio_file but also kio_remote (#97129)
+    // Will be used for tdeio_file but also tdeio_remote (#97129)
 
     /**
      * Used for any command that is specific to this slave (protocol)
-     * Examples are : HTTP POST, mount and unmount (kio_file)
+     * Examples are : HTTP POST, mount and unmount (tdeio_file)
      *
      * @param data packed data; the meaning is completely dependent on the
      *        slave, but usually starts with an int for the command number.
diff --git a/tdeio/tdeio/slaveconfig.h b/tdeio/tdeio/slaveconfig.h
index 500910062..08a5e6782 100644
--- a/tdeio/tdeio/slaveconfig.h
+++ b/tdeio/tdeio/slaveconfig.h
@@ -38,7 +38,7 @@ namespace TDEIO {
      * configuration items of an io-slave when the io-slave is used by
      * your application. 
      *
-     * Normally io-slaves are being configured by "kio_<protocol>rc" 
+     * Normally io-slaves are being configured by "tdeio_<protocol>rc" 
      * configuration files. Groups defined in such files are treated as host 
      * or domain specification. Configuration items defined in a group are 
      * only applied when the slave is connecting with a host that matches with 
diff --git a/tdeio/tdeio/slaveinterface.h b/tdeio/tdeio/slaveinterface.h
index a8992ee65..946efa291 100644
--- a/tdeio/tdeio/slaveinterface.h
+++ b/tdeio/tdeio/slaveinterface.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kio_slaveinterface_h
-#define __kio_slaveinterface_h
+#ifndef __tdeio_slaveinterface_h
+#define __tdeio_slaveinterface_h
 
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/tdeio/tdeioslave.upd b/tdeio/tdeioslave.upd
index cd4972741..842f8bb56 100644
--- a/tdeio/tdeioslave.upd
+++ b/tdeio/tdeioslave.upd
@@ -1,6 +1,6 @@
 # Hello world
 Id=kde2.2/r1
-File=tdeioslaverc,kio_httprc
+File=tdeioslaverc,tdeio_httprc
 Group=Cache Settings,
 Key=MaxCacheSize
 Key=MaxCacheAge
@@ -9,7 +9,7 @@ File=tdeioslaverc
 Group=Browser Settings/UserAgent,UserAgent
 AllKeys
 Id=kde2.2/r2
-File=tdeioslaverc,kio_httprc
+File=tdeioslaverc,tdeio_httprc
 Group=UserAgent
 Script=useragent.pl,perl
 Id=kde2.2/r3
diff --git a/tdeio/tests/dataprotocoltest.cpp b/tdeio/tests/dataprotocoltest.cpp
index e236a2d7c..e9af8574d 100644
--- a/tdeio/tests/dataprotocoltest.cpp
+++ b/tdeio/tests/dataprotocoltest.cpp
@@ -250,12 +250,12 @@ const TQChar * const charset_urls[] = {
 #endif
 
 int main(int /*argc*/,char* /*argv*/[]) {
-  DataProtocol kio_data;
+  DataProtocol tdeio_data;
 
-  kio_data.initTestrun();
+  tdeio_data.initTestrun();
   for (uint i = 0; i < sizeof testcases/sizeof testcases[0]; i++) {
-    kio_data.beginTestcase(testcases[i].name);
-    kio_data.setExpectedMimeType(testcases[i].exp_mime_type != 0
+    tdeio_data.beginTestcase(testcases[i].name);
+    tdeio_data.setExpectedMimeType(testcases[i].exp_mime_type != 0
     		? testcases[i].exp_mime_type : "text/plain");
 
     bool has_charset = false;
@@ -268,20 +268,20 @@ int main(int /*argc*/,char* /*argv*/[]) {
       }/*next j*/
     }
     if (!has_charset) exp_attrs["charset"] = "us-ascii";
-    kio_data.setExpectedAttributes(exp_attrs);
+    tdeio_data.setExpectedAttributes(exp_attrs);
 
     TQByteArray exp_content;
     uint exp_content_len = strlen(testcases[i].exp_content);
     exp_content.setRawData(testcases[i].exp_content,exp_content_len);
-    kio_data.setExpectedContent(exp_content);
+    tdeio_data.setExpectedContent(exp_content);
 
-    kio_data.get(testcases[i].url);
+    tdeio_data.get(testcases[i].url);
 
-    kio_data.endTestcase();
+    tdeio_data.endTestcase();
     exp_content.resetRawData(testcases[i].exp_content,exp_content_len);
   }/*next i*/
-  kio_data.endTestrun();
+  tdeio_data.endTestrun();
 
-  return kio_data.hasFailedTestcases() ? 1 : 0;
+  return tdeio_data.hasFailedTestcases() ? 1 : 0;
 }
 
diff --git a/tdeio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp
index 12f106cd2..c6a79743a 100644
--- a/tdeio/tests/jobtest.cpp
+++ b/tdeio/tests/jobtest.cpp
@@ -227,7 +227,7 @@ void JobTest::copyLocalFile( const TQString& src, const TQString& dest )
 
     {
         // check that the timestamp is the same (#24443)
-        // Note: this only works because of copy() in kio_file.
+        // Note: this only works because of copy() in tdeio_file.
         // The datapump solution ignores mtime, the app has to call FileCopyJob::setModificationTime()
         TQFileInfo srcInfo( src );
         TQFileInfo destInfo( dest );
@@ -533,7 +533,7 @@ void JobTest::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& lst )
 void JobTest::copyFileToSystem()
 {
     if ( !KProtocolInfo::isKnownProtocol( TQString::fromLatin1( "system" ) ) ) {
-        kdDebug() << k_funcinfo << "no kio_system, skipping test" << endl;
+        kdDebug() << k_funcinfo << "no tdeio_system, skipping test" << endl;
         return;
     }
 
@@ -551,8 +551,8 @@ void JobTest::copyFileToSystem()
 void JobTest::copyFileToSystem( bool resolve_local_urls )
 {
     kdDebug() << k_funcinfo << resolve_local_urls << endl;
-    extern TDEIO_EXPORT bool kio_resolve_local_urls;
-    kio_resolve_local_urls = resolve_local_urls;
+    extern TDEIO_EXPORT bool tdeio_resolve_local_urls;
+    tdeio_resolve_local_urls = resolve_local_urls;
 
     const TQString src = homeTmpDir() + "fileFromHome";
     createTestFile( src );
@@ -583,7 +583,7 @@ void JobTest::copyFileToSystem( bool resolve_local_urls )
 
     // Check mimetype
     kdDebug() << m_mimetype << endl;
-    // There's no mimemagic determination in kio_file in trinity. Fixing this for kde4...
+    // There's no mimemagic determination in tdeio_file in trinity. Fixing this for kde4...
     assert( m_mimetype == "application/octet-stream" );
     //assert( m_mimetype == "text/plain" );
 
@@ -601,7 +601,7 @@ void JobTest::copyFileToSystem( bool resolve_local_urls )
     }
 
     // restore normal behavior
-    kio_resolve_local_urls = true;
+    tdeio_resolve_local_urls = true;
 }
 
 void JobTest::slotMimetype(TDEIO::Job* job, const TQString& type)
diff --git a/tdeio/tests/jobtest.h b/tdeio/tests/jobtest.h
index aeaceff0d..5bff6d0e3 100644
--- a/tdeio/tests/jobtest.h
+++ b/tdeio/tests/jobtest.h
@@ -34,7 +34,7 @@ public:
     void runAll();
     void cleanup();
 
-    // Local tests (kio_file only)
+    // Local tests (tdeio_file only)
     void get();
     void copyFileToSamePartition();
     void copyDirectoryToSamePartition();
diff --git a/tdeio/tests/kprotocolinfotest.cpp b/tdeio/tests/kprotocolinfotest.cpp
index 845f3367c..30c9decd8 100644
--- a/tdeio/tests/kprotocolinfotest.cpp
+++ b/tdeio/tests/kprotocolinfotest.cpp
@@ -52,7 +52,7 @@ int main(int argc, char **argv) {
     assert( protocol == "http" );
 
     TQStringList capabilities = KProtocolInfo::capabilities( "imap" );
-    kdDebug() << "kio_imap capabilities: " << capabilities << endl;
+    kdDebug() << "tdeio_imap capabilities: " << capabilities << endl;
     //assert(capabilities.contains("ACL"));
 
     return 0;