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

8 files changed, 31 insertions, 31 deletions

diff --git a/kbabel/common/Makefile.am b/kbabel/common/Makefile.am
index 9020f76e..7d073444 100644
--- a/kbabel/common/Makefile.am
+++ b/kbabel/common/Makefile.am
@@ -38,7 +38,7 @@ pkginclude_HEADERS = catalog.h catalogitem.h editcmd.h msgfmt.h catalogsettings.
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
 
-# KConfigXT project settings
+# TDEConfigXT project settings
 kde_kcfg_DATA=kbprojectsettings.kcfg
 
 # service type for the filters
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index d2f2f8ac..adf845fe 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -893,7 +893,7 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package)
    TQString target;
    ConversionStatus error = OK;
 
-   if(KIO::NetAccess::download(url, target, NULL))
+   if(TDEIO::NetAccess::download(url, target, NULL))
    {
        CatalogImportPlugin* filter=0;
 
@@ -912,7 +912,7 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package)
     	    if( !ptr )
 	    {
     		kdDebug(KBABEL) << "No plugin for PO files, giving up" << endl;
-    		KIO::NetAccess::removeTempFile(target);
+    		TDEIO::NetAccess::removeTempFile(target);
     		return NO_PLUGIN;
 	    }
        }
@@ -922,7 +922,7 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package)
        if (!factory)
        {
     	    kdDebug(KBABEL) << "No factory" << endl;
-    	    KIO::NetAccess::removeTempFile(target);
+    	    TDEIO::NetAccess::removeTempFile(target);
     	    return OS_ERROR;
        }
 
@@ -997,7 +997,7 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons
    TQString target;
    ConversionStatus error = OK;
 
-   if(KIO::NetAccess::download(openUrl, target, NULL))
+   if(TDEIO::NetAccess::download(openUrl, target, NULL))
    {
        CatalogImportPlugin* filter=0;
 
@@ -1010,7 +1010,7 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons
        if( !ptr )
        {
     	    kdDebug(KBABEL) << "No plugin for this type" << endl;
-    	    KIO::NetAccess::removeTempFile(target);
+    	    TDEIO::NetAccess::removeTempFile(target);
     	    return NO_PLUGIN;
        }
 
@@ -1019,7 +1019,7 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons
        if (!factory)
        {
     	    kdDebug(KBABEL) << "No factory" << endl;
-    	    KIO::NetAccess::removeTempFile(target);
+    	    TDEIO::NetAccess::removeTempFile(target);
     	    return OS_ERROR;
        }
 
@@ -1047,7 +1047,7 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons
 	if( error == STOPPED )
         {
 	    delete filter;
-            KIO::NetAccess::removeTempFile(target);
+            TDEIO::NetAccess::removeTempFile(target);
 	    return STOPPED;
 	}
 
@@ -1061,7 +1061,7 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons
                 // KBabel cannot work correctly with not any entry
                 kdWarning() << k_funcinfo << " No entries! Assuming parse error!" << endl;
                 delete filter;
-                KIO::NetAccess::removeTempFile(target);
+                TDEIO::NetAccess::removeTempFile(target);
                 return NO_ENTRY_ERROR;
             }
             
@@ -1083,7 +1083,7 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons
 	delete filter;
 
         // and remove the temp file
-        KIO::NetAccess::removeTempFile(target);
+        TDEIO::NetAccess::removeTempFile(target);
 
         return error;
    }
@@ -2004,7 +2004,7 @@ ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
 
       if(status == OK)
       {
-         if( !KIO::NetAccess::upload( tempFile, targetURL, NULL ) )
+         if( !TDEIO::NetAccess::upload( tempFile, targetURL, NULL ) )
          {
             status = OS_ERROR;
          }
diff --git a/kbabel/common/catalog_private.h b/kbabel/common/catalog_private.h
index a02327b7..6f74d7ff 100644
--- a/kbabel/common/catalog_private.h
+++ b/kbabel/common/catalog_private.h
@@ -54,7 +54,7 @@ class KFileInfo;
 class TQTextCodec;
 class TQFile;
 class FindOptions;
-class KConfig;
+class TDEConfig;
 
 namespace KBabel
 {
diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp
index 18c679b1..156754d0 100644
--- a/kbabel/common/kbmailer.cpp
+++ b/kbabel/common/kbmailer.cpp
@@ -80,7 +80,7 @@ void KBabelMailer::sendOneFile(const TQString& fileName)
 void KBabelMailer::sendOneFile( const KURL& url)
 {
 #if KDE_IS_VERSION( 3, 5, 0)
-  const KURL localUrl( KIO::NetAccess::mostLocalURL( url, m_parent ) );
+  const KURL localUrl( TDEIO::NetAccess::mostLocalURL( url, m_parent ) );
 #else
   const KURL localUrl( url );
 #endif
@@ -99,7 +99,7 @@ void KBabelMailer::sendOneFile( const KURL& url)
     // ### TODO: the current implementation has the default to possibly overwrite an already existing temporary file
     TQString tempName( m_tempDir.name() );
     tempName += fileName;
-    if ( KIO::NetAccess::download( url, tempName, m_parent ) )
+    if ( TDEIO::NetAccess::download( url, tempName, m_parent ) )
       kapp->invokeMailer("", "", "", "", "", "", fileName);
     else
     {
@@ -184,12 +184,12 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName,
   for (it = fileList.constBegin(); it != fileList.constEnd(); ++it) {
 #if KDE_IS_VERSION( 3, 5, 0 )
     // Try to get a local URL instead of a remote one
-    const KURL url( KIO::NetAccess::mostLocalURL( KURL::fromPathOrURL( *it ), m_parent ) );
+    const KURL url( TDEIO::NetAccess::mostLocalURL( KURL::fromPathOrURL( *it ), m_parent ) );
 #else
     const KURL url( KURL::fromPathOrURL( *it ) );
 #endif
     TQString poTempName;
-    if ( !KIO::NetAccess::download( url, poTempName, m_parent ) ) {
+    if ( !TDEIO::NetAccess::download( url, poTempName, m_parent ) ) {
       KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").arg( url.prettyURL() ) );
       continue;
     }
@@ -208,7 +208,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName,
       KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").arg( url.prettyURL() ) );
     }
    
-    KIO::NetAccess::removeTempFile(poTempName);
+    TDEIO::NetAccess::removeTempFile(poTempName);
   }
   archive.close();
 
@@ -225,7 +225,7 @@ void KBabelMailer::readConfig()
   bzipCompression = _settings.useBzip;
   singleFileCompression = _settings.compressSingleFile;
 
-  KConfig* conf = _project->config();
+  TDEConfig* conf = _project->config();
   
   conf->setGroup ("Misc");
   archiveList = conf->readListEntry("MailArchiveNames");
@@ -236,7 +236,7 @@ void KBabelMailer::readConfig()
 void KBabelMailer::saveConfig()
 {
   // For an explanation see readConfig( )
-  KConfig* _config = _project->config();
+  TDEConfig* _config = _project->config();
 
   _config->setGroup("Misc");
   _config->writeEntry("MailArchiveNames", archiveList);
diff --git a/kbabel/common/kbproject.cpp b/kbabel/common/kbproject.cpp
index 743b26d9..ab9d81cc 100644
--- a/kbabel/common/kbproject.cpp
+++ b/kbabel/common/kbproject.cpp
@@ -191,7 +191,7 @@ Project::~Project ()
     ProjectManager::remove (this);
 }
 	    
-KConfig* Project::config ()
+TDEConfig* Project::config ()
 {
     return _config;
 }
@@ -430,7 +430,7 @@ void Project::setSettings (SpellcheckSettings settings)
 
 void Project::setSettings (SourceContextSettings settings)
 {
-    KConfigGroupSaver saver(_config,"SourceContext");
+    TDEConfigGroupSaver saver(_config,"SourceContext");
 
     _settings->setCodeRoot(settings.codeRoot);
     _settings->setPaths(settings.sourcePaths);
diff --git a/kbabel/common/kbproject.h b/kbabel/common/kbproject.h
index aebcb50d..3b2040ed 100644
--- a/kbabel/common/kbproject.h
+++ b/kbabel/common/kbproject.h
@@ -58,7 +58,7 @@ namespace KBabel
 	    
 	    void setName( const TQString& name ) { _name = name; }
 
-	    KConfig* config ();
+	    TDEConfig* config ();
             /**
              * Returns the KSharedConfig pointer of the project data
              * @since 1.11.2 (KDE 3.5.2)
diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp
index aa6b1666..81bfd8b9 100644
--- a/kbabel/common/poinfo.cpp
+++ b/kbabel/common/poinfo.cpp
@@ -363,7 +363,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w
        return OK;
 
    TQString target;
-   if(KIO::NetAccess::download(KURL( url ), target, 0))
+   if(TDEIO::NetAccess::download(KURL( url ), target, 0))
    {
        TQFile file(target);
 
@@ -375,7 +375,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w
             Msgfmt::Status stat = msgfmt.checkSyntax( target , output );
             if(stat == Msgfmt::SyntaxError)
             {
-                KIO::NetAccess::removeTempFile(target);
+                TDEIO::NetAccess::removeTempFile(target);
                 return PARSE_ERROR;
             }
        }
@@ -403,7 +403,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w
 	       
 	       if( stopStaticRead )
 	       {
-                    KIO::NetAccess::removeTempFile(target);
+                    TDEIO::NetAccess::removeTempFile(target);
                     delete lexer;
 		    delete stream;
 		    return OK;
@@ -480,18 +480,18 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w
 
            if(success==PARSE_ERROR)
            {
-	       KIO::NetAccess::removeTempFile(target);
+	       TDEIO::NetAccess::removeTempFile(target);
                return PARSE_ERROR;
            }
        }
        else
        {
           delete stream;
-          KIO::NetAccess::removeTempFile(target);
+          TDEIO::NetAccess::removeTempFile(target);
           return NO_PERMISSIONS;
        }
 
-	KIO::NetAccess::removeTempFile(target);
+	TDEIO::NetAccess::removeTempFile(target);
 	if( target == url )
 	    PoInfo::cacheSave( url, info );
         return OK;
@@ -510,12 +510,12 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
    
    stopStaticRead = false;
    TQString target;
-   if(KIO::NetAccess::download(KURL( url ), target, 0))
+   if(TDEIO::NetAccess::download(KURL( url ), target, 0))
    {
        std::ifstream* stream = new std::ifstream( target.local8Bit()); 
        if(stream->is_open())
        {
-           KIO::NetAccess::removeTempFile(target);
+           TDEIO::NetAccess::removeTempFile(target);
 	   
 	   GettextFlexLexer* lexer = new GettextFlexLexer( stream );
 
diff --git a/kbabel/common/tagextractor.cpp b/kbabel/common/tagextractor.cpp
index 18fd96f2..594ec948 100644
--- a/kbabel/common/tagextractor.cpp
+++ b/kbabel/common/tagextractor.cpp
@@ -42,7 +42,7 @@ using namespace KBabel;
 
 TagExtractor::TagExtractor() : RegExpExtractor(TQStringList())
 {
-    KConfig* config = TDEGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
     
     config->setGroup("Tags");