Fix a few remaining references to kio_

4 files changed, 18 insertions, 18 deletions

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;