Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

5 files changed, 7 insertions, 7 deletions

diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp
index 25b18e165..973b521b3 100644
--- a/tools/converter/koconverter.cpp
+++ b/tools/converter/koconverter.cpp
@@ -103,13 +103,13 @@ int main( int argc, char **argv )
         if ( args->isSet("backup") )
         {
             // Code form koDocument.cc
-            KIO::UDSEntry entry;
-            if ( KIO::NetAccess::stat( uOut, entry, 0L ) ) // this file exists => backup
+            TDEIO::UDSEntry entry;
+            if ( TDEIO::NetAccess::stat( uOut, entry, 0L ) ) // this file exists => backup
             {
                 kdDebug() << "Making backup..." << endl;;
                 KURL backup( uOut );
                 backup.setPath( uOut.path() + '~' );
-                KIO::NetAccess::file_copy( uOut, backup, -1, true /*overwrite*/, false /*resume*/, 0L );
+                TDEIO::NetAccess::file_copy( uOut, backup, -1, true /*overwrite*/, false /*resume*/, 0L );
             }
         }
 
diff --git a/tools/kfile-plugins/ooo/kfile_ooo.cpp b/tools/kfile-plugins/ooo/kfile_ooo.cpp
index b5c3d5d05..c66e36825 100644
--- a/tools/kfile-plugins/ooo/kfile_ooo.cpp
+++ b/tools/kfile-plugins/ooo/kfile_ooo.cpp
@@ -523,7 +523,7 @@ bool KOfficePlugin::writeMetaData(const TQString & path,
     delete m_zip;
     // NULL as third parameter is not good, but I don't know the Window ID
     // That is only to avoid the deprecated warning at compile time
-    if (!KIO::NetAccess::upload( tmp_file.name(), KURL(path), NULL)){
+    if (!TDEIO::NetAccess::upload( tmp_file.name(), KURL(path), NULL)){
 	    kdDebug(7034) << "Error while saving " << tmp_file.name() << " as " << path << endl;
 	    return false;
     }
diff --git a/tools/spell/main.cc b/tools/spell/main.cc
index 4489aa4f5..290d63020 100644
--- a/tools/spell/main.cc
+++ b/tools/spell/main.cc
@@ -78,7 +78,7 @@ bool SpellChecker::run( const TQString& command, void* data, const TQString& dat
 
     if ( instance() )
     {
-        KConfig * config = instance()->config();
+        TDEConfig * config = instance()->config();
         TQCString gn( "KSpell " );
         gn += instance()->instanceName(); // for compat reasons, and to avoid finding the group in kdeglobals (hmm...)
         TQString groupName = TQString::fromLatin1( gn );
diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc
index cca6f4953..273c5d208 100644
--- a/tools/thesaurus/main.cc
+++ b/tools/thesaurus/main.cc
@@ -71,7 +71,7 @@ Thesaurus::Thesaurus(TQObject* parent, const char* name, const TQStringList &)
     m_dialog->setHelp(TQString(), "thesaurus");
     m_dialog->resize(600, 400);
 
-    m_config = new KConfig("kthesaurusrc");
+    m_config = new TDEConfig("kthesaurusrc");
     m_data_file = m_config->readPathEntry("datafile");
     if( ! m_data_file ) {
         m_data_file = TDEGlobal::dirs()->findResourceDir("data", "thesaurus/")
diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h
index 210be1956..c69824b1b 100644
--- a/tools/thesaurus/main.h
+++ b/tools/thesaurus/main.h
@@ -115,7 +115,7 @@ protected:
 
     bool m_replacement;        // does this dialog offer a replace button etc.?
 
-    KConfig *m_config;
+    TDEConfig *m_config;
 
     TDEProcess *m_thesproc;
     TQString m_thesproc_stdout;