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

59 files changed, 214 insertions, 214 deletions

diff --git a/kbabel/ChangeLog b/kbabel/ChangeLog
index 0fa02524..7dfd7907 100644
--- a/kbabel/ChangeLog
+++ b/kbabel/ChangeLog
@@ -37,7 +37,7 @@ Changes 1.10:
 - XLIFF support (Stanislav Visnovsky)
 - word count tool (Stanislav Visnovsky)
 - projects UI enhancements - recent projects, etc (Stanislav Visnovsky)
-- use KConfigXT for projects
+- use TDEConfigXT for projects
 - Fixed bugs: #91989, #92537, #89710, #88293, #91900
 
 Changes 1.9:
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 1eaa2c8b..e2992d21 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -595,7 +595,7 @@ void CatalogManager::saveSettings( TQString configFile )
 
     _project->setSettings( _settings );
 
-    config = new KConfig(configFile);
+    config = new TDEConfig(configFile);
 
     _catalogManager->saveView(config);
 
diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h
index 9cabc311..d7cd467e 100644
--- a/kbabel/catalogmanager/catalogmanager.h
+++ b/kbabel/catalogmanager/catalogmanager.h
@@ -58,7 +58,7 @@ class TQPopupMenu;
 class TQTimer;
 class KProgress;
 class KAction;
-class KConfig;
+class TDEConfig;
 class FindInFilesDialog;
 
 namespace KBabel
@@ -211,7 +211,7 @@ private:
    TQString _configFile;
    KBabel::Project::Ptr _project;
 
-   KConfig* config;
+   TDEConfig* config;
 
    TQMap<TQString,uint> actionMap;
 };
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 1be2cba8..c2fffb9e 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -221,7 +221,7 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* p
    connect( svnhandler, TQT_SIGNAL( signalFilesCommitted( const TQStringList& ) ),
             this, TQT_SLOT( updateFiles( const TQStringList& ) ) );
 
-   KConfig *config = TDEGlobal::config();
+   TDEConfig *config = TDEGlobal::config();
    restoreView(config);
 
    _dictBox->readSettings(_project->config());
@@ -252,18 +252,18 @@ CatalogManagerView::~CatalogManagerView()
 }
 
 
-void CatalogManagerView::saveView( KConfig *config) const
+void CatalogManagerView::saveView( TDEConfig *config) const
 {
     saveMarker(config);
 
-    KConfigGroupSaver( config, "CatalogManager" );
+    TDEConfigGroupSaver( config, "CatalogManager" );
 
     config->writeEntry( "ValidateMarkAsFuzzy", _markAsFuzzy );
     config->writeEntry( "ValidateIgnoreFuzzy", _ignoreFuzzy );
 }
 
 
-void CatalogManagerView::restoreView( KConfig *config)
+void CatalogManagerView::restoreView( TDEConfig *config)
 {
     readMarker(config);
 
@@ -439,9 +439,9 @@ void CatalogManagerView::loadMarks()
 
     TQString filename;
 #if KDE_IS_VERSION( 3, 2, 90 )
-    if (!KIO::NetAccess::download( url, filename, this ) )
+    if (!TDEIO::NetAccess::download( url, filename, this ) )
 #else
-    if( !KIO::NetAccess::download( url, filename ) )
+    if( !TDEIO::NetAccess::download( url, filename ) )
 #endif
     {
 	KMessageBox::error(this,i18n(
@@ -483,7 +483,7 @@ void CatalogManagerView::loadMarks()
 	    "Error while trying to open file:\n %1").arg(url.prettyURL()));
     }
 
-    KIO::NetAccess::removeTempFile( filename );
+    TDEIO::NetAccess::removeTempFile( filename );
 
     // test validity of list items
     TQStringList testedList;
@@ -514,7 +514,7 @@ void CatalogManagerView::saveMarks()
     if( url2.isEmpty() ) return;
 
     // ### FIXME: why is the file dialog not doing this?
-    if ( KIO::NetAccess::exists( url2, false, this ) )
+    if ( TDEIO::NetAccess::exists( url2, false, this ) )
     {
         if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
 	            "Do you want to overwrite it?").arg(url2.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
@@ -525,7 +525,7 @@ void CatalogManagerView::saveMarks()
 
 #if KDE_IS_VERSION( 3, 4, 92 )
     // Support for partially remote KIO slave like media:
-    const KURL url ( KIO::NetAccess::mostLocalURL( url2, this ) );
+    const KURL url ( TDEIO::NetAccess::mostLocalURL( url2, this ) );
 #else
     const KURL url ( url2 );
 #endif
@@ -573,7 +573,7 @@ void CatalogManagerView::saveMarks()
     else if ( !localFile )
     {
         tempFile->close();
-        if( !KIO::NetAccess::upload( tempFile->name(), url, this ) )
+        if( !TDEIO::NetAccess::upload( tempFile->name(), url, this ) )
         {
             // ### KDE4 FIXME: strip the final \n of the message
             KMessageBox::error(this,
@@ -2552,16 +2552,16 @@ void CatalogManagerView::contentsMouseMoveEvent(TQMouseEvent* event)
    }
 }
 
-void CatalogManagerView::readMarker( KConfig* config)
+void CatalogManagerView::readMarker( TDEConfig* config)
 {
-   KConfigGroupSaver cs(config,"CatalogManager");
+   TDEConfigGroupSaver cs(config,"CatalogManager");
 
    _markerList = config->readListEntry("Marker");
 }
 
-void CatalogManagerView::saveMarker( KConfig* config) const
+void CatalogManagerView::saveMarker( TDEConfig* config) const
 {
-   KConfigGroupSaver cs(config,"CatalogManager");
+   TDEConfigGroupSaver cs(config,"CatalogManager");
 
    config->writeEntry("Marker",_markerList);
    config->sync();
diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h
index 1238ed52..1743ce73 100644
--- a/kbabel/catalogmanager/catalogmanagerview.h
+++ b/kbabel/catalogmanager/catalogmanagerview.h
@@ -60,7 +60,7 @@ class KBabelDictBox;
 class CatManPreferences;
 class TQTextEdit;
 class KProgress;
-class KConfig;
+class TDEConfig;
 class KDataToolInfo;
 class ValidateProgressDialog;
 class CVSHandler;
@@ -97,8 +97,8 @@ public:
    bool isActive() const {return _active;}
    bool isStopped() const {return _stop;}
 
-   void restoreView(KConfig *config);
-   void saveView(KConfig *config) const;
+   void restoreView(TDEConfig *config);
+   void saveView(TDEConfig *config) const;
 
    void setRMBMenuFile( TQPopupMenu *m);
    void setRMBMenuDir( TQPopupMenu *m);
@@ -379,8 +379,8 @@ private slots:
 private:
    void toggleColumn( uint id, bool show);
 
-   void readMarker(KConfig *config);
-   void saveMarker(KConfig *config) const;
+   void readMarker(TDEConfig *config);
+   void saveMarker(TDEConfig *config) const;
    /**
    * remove marked entries, which are not in the current file list
    */
diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp
index f70d9d10..b035666a 100644
--- a/kbabel/catalogmanager/findinfilesdialog.cpp
+++ b/kbabel/catalogmanager/findinfilesdialog.cpp
@@ -156,10 +156,10 @@ void FindInFilesDialog::setReplaceOpts(ReplaceOptions options)
 
 void FindInFilesDialog::readSettings()
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 
 	if(isReplaceDialog()) {
-		KConfigGroupSaver cgs(config,"ReplaceDialog");
+		TDEConfigGroupSaver cgs(config,"ReplaceDialog");
 		
 		ReplaceOptions options = replaceOpts();
 	
@@ -178,7 +178,7 @@ void FindInFilesDialog::readSettings()
 		FindDialog::setReplaceOpts(options);
 	}
 	else {
-		KConfigGroupSaver cgs(config,"FindDialog");
+		TDEConfigGroupSaver cgs(config,"FindDialog");
 
 		FindOptions options = findOpts();
 
@@ -201,10 +201,10 @@ void FindInFilesDialog::readSettings()
 
 void FindInFilesDialog::saveSettings()
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 
 	if(isReplaceDialog()) {
-		KConfigGroupSaver cgs(config,"ReplaceDialog");
+		TDEConfigGroupSaver cgs(config,"ReplaceDialog");
 		ReplaceOptions options = replaceOpts();
 
 		config->writeEntry("AllFiles", options.inAllFiles);
@@ -214,7 +214,7 @@ void FindInFilesDialog::saveSettings()
 		config->writeEntry("AskForSave",options.askForSave);
 	}
 	else {
-		KConfigGroupSaver cgs(config,"FindDialog");
+		TDEConfigGroupSaver cgs(config,"FindDialog");
 		
 		FindOptions options = findOpts();
 
diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp
index 7d134e31..458611ab 100644
--- a/kbabel/catalogmanager/markpatterndialog.cpp
+++ b/kbabel/catalogmanager/markpatterndialog.cpp
@@ -140,7 +140,7 @@ void MarkPatternDialog::slotRegexpButtonClicked( )
 
 void MarkPatternDialog::restoreSettings( )
 {
-  KConfig * config = TDEGlobal::config( );
+  TDEConfig * config = TDEGlobal::config( );
   config->setGroup("MarkPatternDialog");
   
   patternList = config->readListEntry("Patterns");
@@ -160,7 +160,7 @@ void MarkPatternDialog::restoreSettings( )
 
 void MarkPatternDialog::saveSettings( )
 {
-  KConfig * config = TDEGlobal::config( );
+  TDEConfig * config = TDEGlobal::config( );
   config->setGroup("MarkPatternDialog");
   
   config->writeEntry("Patterns", patternList);
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");
       
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index bcce1578..6f4f16a7 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -128,7 +128,7 @@ TQValueList<ContextInfo> SourceContext::resolvePath( const TQString& packageDir,
     // ### TODO: find a way to allow remote files too
     TQString poDir;
 #if KDE_IS_VERSION( 3, 5, 0 )
-    const KURL localUrl( KIO::NetAccess::mostLocalURL( urlPoFile, m_parent ) );
+    const KURL localUrl( TDEIO::NetAccess::mostLocalURL( urlPoFile, m_parent ) );
     if ( localUrl.isLocalFile() )
     {
         const TQFileInfo fi( localUrl.path() );
diff --git a/kbabel/commonui/context.h b/kbabel/commonui/context.h
index 82c9ceb7..cb641c67 100644
--- a/kbabel/commonui/context.h
+++ b/kbabel/commonui/context.h
@@ -45,7 +45,7 @@ class TQComboBox;
 class TQVBoxLayout;
 class TQLineEdit;
 class KListEditor;
-class KConfig;
+class TDEConfig;
 class KURL;
 
 struct ContextInfo
@@ -107,7 +107,7 @@ private:
     TQValueList<ContextInfo> resolvePath( const TQString& packageDir, const TQString& packageName, const TQString& gettextComment, const KURL& urlPoFile );
     bool loadPart();
 
-    /// Parent widget (for KIO::NetAccess member functions)
+    /// Parent widget (for TDEIO::NetAccess member functions)
     TQWidget* m_parent;
     KTextEditor::Document* _part;
     KTextEditor::View* _view;
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index e4d99b84..02a1b2c3 100644
--- a/kbabel/commonui/finddialog.cpp
+++ b/kbabel/commonui/finddialog.cpp
@@ -386,10 +386,10 @@ void FindDialog::setReplaceOpts(ReplaceOptions options)
 
 void FindDialog::readSettings()
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 
 	if(_replaceDlg) {
-		KConfigGroupSaver cgs(config,"ReplaceDialog");
+		TDEConfigGroupSaver cgs(config,"ReplaceDialog");
 		_replaceOptions.inMsgstr = config->readBoolEntry("InMsgstr",true);
 		_replaceOptions.inComment = config->readBoolEntry("InComment",false);
 
@@ -421,7 +421,7 @@ void FindDialog::readSettings()
 		_findCombo->insertStringList(_replaceFindList);
 	}
 	else {
-		KConfigGroupSaver cgs(config,"FindDialog");
+		TDEConfigGroupSaver cgs(config,"FindDialog");
 
 		_findOptions.inMsgid = config->readBoolEntry("InMsgid",true);
 		_findOptions.inMsgstr = config->readBoolEntry("InMsgstr",true);
@@ -459,10 +459,10 @@ void FindDialog::readSettings()
 
 void FindDialog::saveSettings()
 {
-	KConfig* config = TDEGlobal::config();
+	TDEConfig* config = TDEGlobal::config();
 
 	if(_replaceDlg) {
-		KConfigGroupSaver cgs(config,"ReplaceDialog");
+		TDEConfigGroupSaver cgs(config,"ReplaceDialog");
 		config->writeEntry("InMsgstr",_replaceOptions.inMsgstr);
 		config->writeEntry("InComment",_replaceOptions.inComment);
 
@@ -478,7 +478,7 @@ void FindDialog::saveSettings()
 		config->writeEntry("ReplaceList",_replaceList);
 	}
 	else {
-		KConfigGroupSaver cgs(config,"FindDialog");
+		TDEConfigGroupSaver cgs(config,"FindDialog");
 
 		config->writeEntry("InMsgid",_findOptions.inMsgid);
 		config->writeEntry("InMsgstr",_findOptions.inMsgstr);
diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp
index f34d2cc2..0899fa34 100644
--- a/kbabel/commonui/projectpref.cpp
+++ b/kbabel/commonui/projectpref.cpp
@@ -61,7 +61,7 @@
 using namespace KBabel;
 
 ProjectDialog::ProjectDialog(Project::Ptr project)
-    : KConfigDialog(0, "project dialog", project->settings(), 
+    : TDEConfigDialog(0, "project dialog", project->settings(), 
                   IconList, Help|Default|Ok|Apply|Cancel)
     , _project( project )
 {
@@ -133,7 +133,7 @@ ProjectDialog::ProjectDialog(Project::Ptr project)
 
 void ProjectDialog::slotDefault()
 {
-    // redefine the KConfigDialog behavior to push default on the
+    // redefine the TDEConfigDialog behavior to push default on the
     // current page only
     
     _project->settings()->useDefaults(true);
diff --git a/kbabel/commonui/projectpref.h b/kbabel/commonui/projectpref.h
index d2493cd0..ca99bdea 100644
--- a/kbabel/commonui/projectpref.h
+++ b/kbabel/commonui/projectpref.h
@@ -55,7 +55,7 @@ class DiffPreferences;
 
 namespace KBabel {
 
-class KDE_EXPORT ProjectDialog : public KConfigDialog
+class KDE_EXPORT ProjectDialog : public TDEConfigDialog
 {
     Q_OBJECT
   
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 4aa6ab74..d9f7a051 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -1163,7 +1163,7 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p
     tempLabel->setBuddy( _coderootEdit );
     layout->addWidget(box);
 												
-    // FIXME: use KConfigXT    
+    // FIXME: use TDEConfigXT    
     _pathsEditor = new KListEditor(page);
     _pathsEditor->setTitle(i18n("Path Patterns"));
     layout->addWidget(_pathsEditor);
diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp
index c2526a4f..c9108f3f 100644
--- a/kbabel/commonui/projectwizard.cpp
+++ b/kbabel/commonui/projectwizard.cpp
@@ -53,7 +53,7 @@ ProjectWizard::ProjectWizard(TQWidget *parent,const char *name)
     _wizard = new ProjectStep1(this,"project wizard widget");
     
     // fill the known language codes
-    KConfig all_languages("all_languages", true, false, "locale");
+    TDEConfig all_languages("all_languages", true, false, "locale");
     TQStringList lang_codes = TDEGlobal::locale()->allLanguagesTwoAlpha();
     for (TQStringList::iterator it = lang_codes.begin();
 	it != lang_codes.end(); ++it)
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index ccf3735f..f19747e3 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -160,8 +160,8 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat
 
     TQPtrList<ModuleInfo> moduleList = dict->moduleInfos();
 
-    KConfig *config = TDEGlobal::config();
-    KConfigGroupSaver gs(config,"RoughTranslation");
+    TDEConfig *config = TDEGlobal::config();
+    TDEConfigGroupSaver gs(config,"RoughTranslation");
     TQStringList selectedList=config->readListEntry("Selected");
     if(selectedList.isEmpty())
     {
@@ -212,8 +212,8 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat
 
 RoughTransDlg::~RoughTransDlg()
 {
-    KConfig *config=TDEGlobal::config();
-    KConfigGroupSaver gs(config,"RoughTranslation");
+    TDEConfig *config=TDEGlobal::config();
+    TDEConfigGroupSaver gs(config,"RoughTranslation");
     config->writeEntry("Selected",dictChooser->selectedDicts());
 
     bool flag=transButton->isChecked();
diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp
index 195c3fa0..9f591f17 100644
--- a/kbabel/kbabel/charselectview.cpp
+++ b/kbabel/kbabel/charselectview.cpp
@@ -96,17 +96,17 @@ void CharacterSelectorView::setTab(int value)
     _table->setTableNum( value );
 }
 
-void CharacterSelectorView::saveSettings(KConfig* config)
+void CharacterSelectorView::saveSettings(TDEConfig* config)
 {
-    KConfigGroupSaver saver(config, "KBCharSelector" );
+    TDEConfigGroupSaver saver(config, "KBCharSelector" );
 	
     config->writeEntry( "TableNum", _tableNum->value() );
     config->writeEntry( "SelectedChar", TQString(_table->chr()) );
 }
 
-void CharacterSelectorView::restoreSettings(KConfig* config)
+void CharacterSelectorView::restoreSettings(TDEConfig* config)
 {
-    KConfigGroupSaver saver(config, "KBCharSelector" );
+    TDEConfigGroupSaver saver(config, "KBCharSelector" );
     
     _tableNum->setValue( config->readNumEntry("TableNum", 0 ));
     _table->setChar( config->readEntry("SelectedChar"," ").at(0));
diff --git a/kbabel/kbabel/charselectview.h b/kbabel/kbabel/charselectview.h
index bdfff62d..d55d294d 100644
--- a/kbabel/kbabel/charselectview.h
+++ b/kbabel/kbabel/charselectview.h
@@ -48,8 +48,8 @@ public:
     */
     CharacterSelectorView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project);
 
-   void saveSettings(KConfig* config);
-   void restoreSettings(KConfig* config);
+   void saveSettings(TDEConfig* config);
+   void restoreSettings(TDEConfig* config);
 
 public slots:
     // this view does not depend on the current item
diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp
index cc692bbd..11c7eba1 100644
--- a/kbabel/kbabel/headereditor.cpp
+++ b/kbabel/kbabel/headereditor.cpp
@@ -84,18 +84,18 @@ HeaderEditor::~HeaderEditor()
 
 void HeaderEditor::saveSettings()
 {
-    KConfig* config = TDEGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
 
-    KConfigGroupSaver saver(config, "HeaderEditor" );
+    TDEConfigGroupSaver saver(config, "HeaderEditor" );
 
     config->writeEntry( "Size", _editor->size() );
 }
 
 void HeaderEditor::restoreSettings()
 {
-    KConfig* config = TDEGlobal::config();
+    TDEConfig* config = TDEGlobal::config();
 
-    KConfigGroupSaver saver(config, "HeaderEditor" );
+    TDEConfigGroupSaver saver(config, "HeaderEditor" );
 
     TQSize defaultSize(350,250);
     _editorSize = config->readSizeEntry("Size", &defaultSize );
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 0abd5eca..26f33911 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -874,7 +874,7 @@ void KBabelMW::restoreSettings()
 {
     {
        applyMainWindowSettings(_config, "View");
-       KConfigGroupSaver saver(_config,"View");
+       TDEConfigGroupSaver saver(_config,"View");
 
        _config->setGroup("View");
        m_view->restoreView(_config);
@@ -891,12 +891,12 @@ void KBabelMW::restoreSettings()
 
 
 
-void KBabelMW::saveProperties(KConfig *config)
+void KBabelMW::saveProperties(TDEConfig *config)
 {
    m_view->saveSession(config);
 }
 
-void KBabelMW::readProperties(KConfig *config)
+void KBabelMW::readProperties(TDEConfig *config)
 {
    m_view->restoreSession(config);
 
diff --git a/kbabel/kbabel/kbabel.h b/kbabel/kbabel/kbabel.h
index 5b38414d..b1b63122 100644
--- a/kbabel/kbabel/kbabel.h
+++ b/kbabel/kbabel/kbabel.h
@@ -139,14 +139,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    virtual void saveProperties(KConfig *);
+    virtual void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    virtual void readProperties(KConfig *);
+    virtual void readProperties(TDEConfig *);
 
     virtual bool queryExit();
     virtual bool queryClose();
diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp
index 2bc23b9d..a241b119 100644
--- a/kbabel/kbabel/kbabelpref.cpp
+++ b/kbabel/kbabel/kbabelpref.cpp
@@ -50,7 +50,7 @@
 using namespace KBabel;
 
 KBabelPreferences::KBabelPreferences(TQPtrList<ModuleInfo> ml)
-    : KConfigDialog(0, "Preferences", KBabelSettings::self())
+    : TDEConfigDialog(0, "Preferences", KBabelSettings::self())
 {
     _editorPage = new EditorPreferences(0, "editor");
     addPage( _editorPage
@@ -116,7 +116,7 @@ bool KBabelPreferences::hasChanged()
 	module_ret = info->id != KBabelSettings::defaultModule();
     }
     
-    return KConfigDialog::hasChanged() 
+    return TDEConfigDialog::hasChanged() 
 	|| (_editorPage->_kcfg_AutoCheckTools->selectedTools() != KBabelSettings::autoCheckTools())
 	|| (module_ret);
 }
@@ -128,7 +128,7 @@ bool KBabelPreferences::isDefault()
     ModuleInfo *info = moduleList.at(_searchPage->_kcfg_DefaultModule->currentItem());
     bool module_ret = ( info && info->id == KBabelSettings::defaultModule() );
 
-    bool ret = KConfigDialog::isDefault() 
+    bool ret = TDEConfigDialog::isDefault() 
 	&& (_editorPage->_kcfg_AutoCheckTools->selectedTools().empty())
 	&& (module_ret);
 	
@@ -138,7 +138,7 @@ bool KBabelPreferences::isDefault()
 
 void KBabelPreferences::updateSettings()
 {
-    KConfigDialog::updateSettings();
+    TDEConfigDialog::updateSettings();
     
     KBabelSettings::setAutoCheckTools(_editorPage->_kcfg_AutoCheckTools->selectedTools());
 
@@ -155,7 +155,7 @@ void KBabelPreferences::updateSettings()
 
 void KBabelPreferences::updateWidgets()
 {
-    KConfigDialog::updateWidgets();
+    TDEConfigDialog::updateWidgets();
     _editorPage->_kcfg_AutoCheckTools->setSelectedTools(KBabelSettings::autoCheckTools());
     
     int i=0;
@@ -172,7 +172,7 @@ void KBabelPreferences::updateWidgets()
 
 void KBabelPreferences::updateWidgetsDefault()
 {
-    KConfigDialog::updateWidgetsDefault();
+    TDEConfigDialog::updateWidgetsDefault();
     
     bool old_useDefault = KBabelSettings::self()->useDefaults(true);
 
diff --git a/kbabel/kbabel/kbabelpref.h b/kbabel/kbabel/kbabelpref.h
index a1be6c9a..e126f1e7 100644
--- a/kbabel/kbabel/kbabelpref.h
+++ b/kbabel/kbabel/kbabelpref.h
@@ -42,7 +42,7 @@ class SearchPreferences;
 class EditorPreferences;
 struct ModuleInfo;
 
-class KBabelPreferences : public KConfigDialog
+class KBabelPreferences : public TDEConfigDialog
 {
     Q_OBJECT
   
@@ -56,8 +56,8 @@ protected slots:
    virtual void updateWidgetsDefault();
 
 protected:
-   virtual bool hasChanged();	// reimplemented from KConfigDialog for our ToolSelectionWidget
-   virtual bool isDefault();	// reimplemented from KConfigDialog for our ToolSelectionWidget
+   virtual bool hasChanged();	// reimplemented from TDEConfigDialog for our ToolSelectionWidget
+   virtual bool isDefault();	// reimplemented from TDEConfigDialog for our ToolSelectionWidget
 
 private:
     SearchPreferences* _searchPage;
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 37b9d3d6..1b8795e2 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -135,7 +135,7 @@ KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project
 
     _config = KSharedConfig::openConfig ("kbabelrc");
 
-    KConfigGroupSaver gs(_config,"Editor");
+    TDEConfigGroupSaver gs(_config,"Editor");
     bool buildLeds=! KBabelSettings::ledInStatusbar();
 
     _fuzzyLed=0;
@@ -679,7 +679,7 @@ void KBabelView::update(EditCommand* cmd, bool undo)
 
 
 
-void KBabelView::readSettings(KConfig* config)
+void KBabelView::readSettings(TDEConfig* config)
 {
 
    if(KBabelSettings::autoUnsetFuzzy())
@@ -690,7 +690,7 @@ void KBabelView::readSettings(KConfig* config)
 
    setupAutoCheckTools();
 
-   KConfigGroupSaver saver(config,"Editor");
+   TDEConfigGroupSaver saver(config,"Editor");
 
    _diffEnabled = config->readBoolEntry("AutoDiff", false);
    emit signalDiffEnabled(_diffEnabled);
@@ -799,7 +799,7 @@ void KBabelView::readProject(Project::Ptr project)
 
 void KBabelView::saveSettings()
 {
-   KConfigGroupSaver saver(_config,"Editor");
+   TDEConfigGroupSaver saver(_config,"Editor");
 
    _config->writeEntry("AutoDiff",_diffEnabled);
 
@@ -955,15 +955,15 @@ void KBabelView::setRMBSearchMenu(TQPopupMenu* popup)
 }
 
 
-void KBabelView::saveView(KConfig *)
+void KBabelView::saveView(TDEConfig *)
 {
 }
 
-void KBabelView::restoreView(KConfig *)
+void KBabelView::restoreView(TDEConfig *)
 {
 }
 
-void KBabelView::saveSession(KConfig* config)
+void KBabelView::saveSession(TDEConfig* config)
 {
    TQString focus;
    int line=0,col=0;
@@ -994,7 +994,7 @@ void KBabelView::saveSession(KConfig* config)
 
    if( _spellcheckSettings.valid )
    {
-	KConfigGroupSaver (config, "Spellcheck");
+	TDEConfigGroupSaver (config, "Spellcheck");
 	config->writeEntry("NoRootAffix",_spellcheckSettings.noRootAffix);
 	config->writeEntry("RunTogether",_spellcheckSettings.runTogether);
 	config->writeEntry("SpellEncoding",_spellcheckSettings.spellEncoding);
@@ -1007,7 +1007,7 @@ void KBabelView::saveSession(KConfig* config)
    saveView(config);
 }
 
-void KBabelView::restoreSession(KConfig* config)
+void KBabelView::restoreSession(TDEConfig* config)
 {
    TQString url=config->readPathEntry("URL");
 
@@ -1106,7 +1106,7 @@ void KBabelView::open()
 void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfModified, bool newView)
 {
 #if KDE_IS_VERSION( 3, 5, 0)
-   KURL url = KIO::NetAccess::mostLocalURL(_url,this);
+   KURL url = TDEIO::NetAccess::mostLocalURL(_url,this);
 #else
    KURL url = _url;
 #endif
@@ -1446,7 +1446,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
        newName=true;
    }
 
-   if (KIO::NetAccess::exists(url, false, this))
+   if (TDEIO::NetAccess::exists(url, false, this))
    {
        if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
 						       "Do you want to overwrite it?").arg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
@@ -1515,7 +1515,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 		   return false;
 		}
 
-		if (KIO::NetAccess::exists(url, false, this))
+		if (TDEIO::NetAccess::exists(url, false, this))
 		{
 		    if(KMessageBox::warningContinueCancel(this,i18n("The file %1 already exists.\n"
 								    "Do you want to overwrite it?").arg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue)
@@ -1584,7 +1584,7 @@ bool KBabelView::saveFileSpecial()
 	KBabel::Project::Ptr project = KBabel::ProjectManager::open (tmpname);
     
 	project->setSettings( _catalog->saveSettings() );
-	KConfigDialog *_prefDialog = new KConfigDialog(this, "project dialog", project->settings(),
+	TDEConfigDialog *_prefDialog = new TDEConfigDialog(this, "project dialog", project->settings(),
                   KDialogBase::IconList, KDialogBase::Cancel|KDialogBase::Ok|KDialogBase::Help);
 
 	_prefDialog->setCaption( i18n("Special Save Settings") );
@@ -2700,8 +2700,8 @@ void KBabelView::findInFile(TQCString fileSource, FindOptions options)
 	_showTryLaterBox=true;
 
 	// delete dontDisplayAgain from configuration
-	KConfig* config = TDEGlobal::config();
-	KConfigGroupSaver saver(config,"Notification Messages");
+	TDEConfig* config = TDEGlobal::config();
+	TDEConfigGroupSaver saver(config,"Notification Messages");
 	config->writeEntry("waitForNextFile",true);
 
 	// set that there can be more files
@@ -2729,8 +2729,8 @@ void KBabelView::replaceInFile(TQCString fileSource, KBabel::ReplaceOptions opti
 	_showTryLaterBox=true;
 
 	// delete dontDisplayAgain from configuration
-	KConfig* config = TDEGlobal::config();
-	KConfigGroupSaver saver(config,"Notification Messages");
+	TDEConfig* config = TDEGlobal::config();
+	TDEConfigGroupSaver saver(config,"Notification Messages");
 	config->writeEntry("waitForNextFile",true);
 
 	// set that there can be more files
@@ -3494,7 +3494,7 @@ void KBabelView::processUriDrop(KURL::List& uriList, const TQPoint& pos)
               KURL first(uriList.first());
               KURL second(uriList.last());
 
-              if( KIO::NetAccess::exists(first, true, this) )
+              if( TDEIO::NetAccess::exists(first, true, this) )
               {
                  open(first);
               }
diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h
index 8bad4baf..5e9c280a 100644
--- a/kbabel/kbabel/kbabelview.h
+++ b/kbabel/kbabel/kbabelview.h
@@ -131,16 +131,16 @@ public:
     void setOverwriteMode(bool ovr);
     bool isSearching() const;
 
-    void saveView(KConfig *config);
-    void restoreView(KConfig *config);
-    void saveSession(KConfig*);
-    void restoreSession(KConfig*);
+    void saveView(TDEConfig *config);
+    void restoreView(TDEConfig *config);
+    void saveSession(TDEConfig*);
+    void restoreSession(TDEConfig*);
 
-    void readSettings(KConfig* config);
+    void readSettings(TDEConfig* config);
     void saveSettings();
 
     void readProject(KBabel::Project::Ptr project);
-    void saveProject(KConfig* config);
+    void saveProject(TDEConfig* config);
 
     void openTemplate(const KURL& openURL, const KURL& saveURL);
     bool saveFile(bool checkSyntax=true);
diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp
index 34b9dc5b..c3d95520 100644
--- a/kbabel/kbabel/kbabelview2.cpp
+++ b/kbabel/kbabel/kbabelview2.cpp
@@ -679,7 +679,7 @@ bool KBabelView::openDiffFile(bool autoDiff)
 
            KURL diffFileURL(diffFilePath);
 
-           if(diffFileURL.isValid() && KIO::NetAccess::exists(diffFileURL,true,NULL))
+           if(diffFileURL.isValid() && TDEIO::NetAccess::exists(diffFileURL,true,NULL))
            {
                url = diffFileURL;
 
diff --git a/kbabel/kbabel/kbcatalogview.cpp b/kbabel/kbabel/kbcatalogview.cpp
index af4dd3dd..40aee1c0 100644
--- a/kbabel/kbabel/kbcatalogview.cpp
+++ b/kbabel/kbabel/kbcatalogview.cpp
@@ -111,15 +111,15 @@ void KBCatalogView::readConfigurationSettings()
 {
 }
 
-void KBCatalogView::readSessionSettings(KConfig *)
+void KBCatalogView::readSessionSettings(TDEConfig *)
 {
 }
 
-void KBCatalogView::writeConfigurationSettings(KConfig *)
+void KBCatalogView::writeConfigurationSettings(TDEConfig *)
 {
 }
 
-void KBCatalogView::writeSessionSettings(KConfig *)
+void KBCatalogView::writeSessionSettings(TDEConfig *)
 {
 }
 
diff --git a/kbabel/kbabel/kbcatalogview.h b/kbabel/kbabel/kbcatalogview.h
index 68efc57a..0c5ce17b 100644
--- a/kbabel/kbabel/kbcatalogview.h
+++ b/kbabel/kbabel/kbcatalogview.h
@@ -74,10 +74,10 @@ public slots:
     virtual void readProjectSettings();
     virtual void readFileSettings();
     virtual void readConfigurationSettings();
-    virtual void readSessionSettings(KConfig *config);
+    virtual void readSessionSettings(TDEConfig *config);
     
-    virtual void writeConfigurationSettings(KConfig *config);
-    virtual void writeSessionSettings(KConfig *config);
+    virtual void writeConfigurationSettings(TDEConfig *config);
+    virtual void writeSessionSettings(TDEConfig *config);
     
     virtual void setReadOnly (bool on);
 
diff --git a/kbabel/kbabel/kbcharselect.cpp b/kbabel/kbabel/kbcharselect.cpp
index 2b55d4f5..a1ad6c18 100644
--- a/kbabel/kbabel/kbcharselect.cpp
+++ b/kbabel/kbabel/kbcharselect.cpp
@@ -75,17 +75,17 @@ void KBCharSelect::setTab(int value)
     _table->setTableNum( value );
 }
 
-void KBCharSelect::saveSettings(KConfig* config)
+void KBCharSelect::saveSettings(TDEConfig* config)
 {
-    KConfigGroupSaver saver(config, "KBCharSelector" );
+    TDEConfigGroupSaver saver(config, "KBCharSelector" );
 	
     config->writeEntry( "TableNum", _tableNum->value() );
     config->writeEntry( "SelectedChar", TQString(_table->chr()) );
 }
 
-void KBCharSelect::restoreSettings(KConfig* config)
+void KBCharSelect::restoreSettings(TDEConfig* config)
 {
-    KConfigGroupSaver saver(config, "KBCharSelector" );
+    TDEConfigGroupSaver saver(config, "KBCharSelector" );
     
     _tableNum->setValue( config->readNumEntry("TableNum", 0 ));
     _table->setChar( config->readEntry("SelectedChar"," ").at(0));
diff --git a/kbabel/kbabel/kbcharselect.h b/kbabel/kbabel/kbcharselect.h
index b0780a40..bc515e8b 100644
--- a/kbabel/kbabel/kbcharselect.h
+++ b/kbabel/kbabel/kbcharselect.h
@@ -35,7 +35,7 @@
 
 #include <tqvbox.h>
 
-class KConfig;
+class TDEConfig;
 class KCharSelectTable;
 class TQSpinBox;
 
@@ -46,8 +46,8 @@ class KBCharSelect : public TQVBox
 public:
    KBCharSelect(TQWidget* parent, const char* name=0);
    
-   void saveSettings(KConfig* config);
-   void restoreSettings(KConfig* config);
+   void saveSettings(TDEConfig* config);
+   void restoreSettings(TDEConfig* config);
 
 signals:
    void characterDoubleClicked( TQChar ch );
diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp
index 3b494302..deaaf704 100644
--- a/kbabel/kbabel/kbhighlighting.cpp
+++ b/kbabel/kbabel/kbhighlighting.cpp
@@ -193,7 +193,7 @@ void KBabelHighlighter::setHasErrors( bool err )
 void KBabelHighlighter::readSettings( )
 {
   // FIXME: does not care about different projects yet
-  KConfig * config = TDEGlobal::config( );
+  TDEConfig * config = TDEGlobal::config( );
   config->setGroup( "Misc" );
   TQString temp = config->readEntry( "AccelMarker", "&" );
   accelMarker = temp[0];
diff --git a/kbabel/kbabel/spelldlg.cpp b/kbabel/kbabel/spelldlg.cpp
index 798467bf..e887fce5 100644
--- a/kbabel/kbabel/spelldlg.cpp
+++ b/kbabel/kbabel/spelldlg.cpp
@@ -59,8 +59,8 @@ SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *parent,const char *name)
 	{
 		_mainWidget->markedBtn->setEnabled(false);
 
-		KConfig *config = TDEGlobal::config();
-		KConfigGroupSaver cs(config,"SpellDlg");
+		TDEConfig *config = TDEGlobal::config();
+		TDEConfigGroupSaver cs(config,"SpellDlg");
 		TQString what=config->readEntry("Default","All");
 
 		if(what=="All")
@@ -82,8 +82,8 @@ SpellDlg::~SpellDlg()
 {
 	if(_mainWidget->defaultBtn->isChecked())
 	{
-		KConfig *config=TDEGlobal::config();
-		KConfigGroupSaver cs(config,"SpellDlg");
+		TDEConfig *config=TDEGlobal::config();
+		TDEConfigGroupSaver cs(config,"SpellDlg");
 
 		TQString what="All";
 		if(_mainWidget->endBtn->isChecked())
diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp
index 55ccbefc..f5a3701f 100644
--- a/kbabel/kbabeldict/dictchooser.cpp
+++ b/kbabel/kbabeldict/dictchooser.cpp
@@ -304,7 +304,7 @@ void DictChooser::configureSelected()
 		tempConfig.insert(mi->id ,tmp);
 
 		kdDebug(KBABEL_SEARCH) << "Temp file: " << tmp->name() << endl;
-		KConfig config(tmp->name());
+		TDEConfig config(tmp->name());
 		config.setGroup(mi->id);
 		box->saveSettings(mi->id, &config);
 	    }
@@ -323,7 +323,7 @@ void DictChooser::restoreConfig()
     TQDictIterator<KTempFile> it( tempConfig ); // See TQDictIterator
     for( ; it.current(); ++it )
     {
-        KConfig config( it.current()->name() );
+        TDEConfig config( it.current()->name() );
 	config.setGroup( it.currentKey() );
 	box->readSettings( it.currentKey(), &config);
     }
diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp
index c4fd67ae..cb2ed323 100644
--- a/kbabel/kbabeldict/kbabeldict.cpp
+++ b/kbabel/kbabeldict/kbabeldict.cpp
@@ -73,15 +73,15 @@ KBabelDict::~KBabelDict()
 
 void KBabelDict::saveConfig()
 {
-    KConfig *config=TDEGlobal::config();
-    KConfigGroupSaver gs(config,"KBabelDict");
+    TDEConfig *config=TDEGlobal::config();
+    TDEConfigGroupSaver gs(config,"KBabelDict");
     config->writeEntry("Preferences",view->prefVisible());
 }
 
 void KBabelDict::readConfig()
 {
-    KConfig *config=TDEGlobal::config();
-    KConfigGroupSaver gs(config,"KBabelDict");
+    TDEConfig *config=TDEGlobal::config();
+    TDEConfigGroupSaver gs(config,"KBabelDict");
     bool pref=config->readBoolEntry("Preferences",true);
 
     if(view->prefVisible() != pref)
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index 4fa44389..35abc555 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -367,7 +367,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent,  const char* name, WFlags fl )
    for( TQStringList::Iterator rit = rcList.begin(); rit != rcList.end();
                                              ++rit)
    {
-      KConfig rcConfig((*rit),true,false);
+      TDEConfig rcConfig((*rit),true,false);
       
       rcConfig.setGroup("SearchEngine");
 
@@ -504,9 +504,9 @@ void KBabelDictBox::registerModule( SearchEngine* e )
         , TQT_SIGNAL(errorInModule(const TQString&)));
 }
 
-void KBabelDictBox::saveSettings(KConfigBase *config)
+void KBabelDictBox::saveSettings(TDEConfigBase *config)
 {
-   KConfigGroupSaver cs(config,"KBabelDict");
+   TDEConfigGroupSaver cs(config,"KBabelDict");
 
    config->writeEntry("ResultSplitter",resultSplitter->sizes());
    
@@ -527,7 +527,7 @@ void KBabelDictBox::saveSettings(KConfigBase *config)
 
 }
 
-void KBabelDictBox::saveSettings(const TQString& moduleId, KConfigBase *config)
+void KBabelDictBox::saveSettings(const TQString& moduleId, TDEConfigBase *config)
 {
    SearchEngine *e;
 
@@ -541,10 +541,10 @@ void KBabelDictBox::saveSettings(const TQString& moduleId, KConfigBase *config)
    }
 }
 
-void KBabelDictBox::readSettings(KConfigBase *config)
+void KBabelDictBox::readSettings(TDEConfigBase *config)
 {
    SearchEngine *e;
-   KConfigGroupSaver cs(config,"KBabelDict");
+   TDEConfigGroupSaver cs(config,"KBabelDict");
    TQValueList<int> sizes=config->readIntListEntry("ResultSplitter");
    if(!sizes.isEmpty())
        resultSplitter->setSizes(sizes);
@@ -562,7 +562,7 @@ void KBabelDictBox::readSettings(KConfigBase *config)
    }
 }
 
-void KBabelDictBox::readSettings(const TQString& moduleId, KConfigBase *config)
+void KBabelDictBox::readSettings(const TQString& moduleId, TDEConfigBase *config)
 {
    SearchEngine *e;
 
diff --git a/kbabel/kbabeldict/kbabeldictbox.h b/kbabel/kbabeldict/kbabeldictbox.h
index b88c9cfc..5f6fc885 100644
--- a/kbabel/kbabeldict/kbabeldictbox.h
+++ b/kbabel/kbabeldict/kbabeldictbox.h
@@ -115,25 +115,25 @@ public:
     * Saves the settings including the settings of the different modules
     * in the given config object.
     */
-   void saveSettings(KConfigBase *config);
+   void saveSettings(TDEConfigBase *config);
    
    /**
     * Saves the settings of the given module
     * in the given config object.
     */
-   void saveSettings(const TQString& moduleId, KConfigBase *config);
+   void saveSettings(const TQString& moduleId, TDEConfigBase *config);
    
    /**
     * Reads the settings including the settings of the different modules
     * from the given config object.
     */
-   void readSettings(KConfigBase *config);
+   void readSettings(TDEConfigBase *config);
 
    /**
     * Reads the settings of the given module
     * from the given config object.
     */
-   void readSettings(const TQString& moduleId, KConfigBase *config);
+   void readSettings(const TQString& moduleId, TDEConfigBase *config);
    
 
 
diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp
index 739dd969..437de9e5 100644
--- a/kbabel/kbabeldict/kbabeldictview.cpp
+++ b/kbabel/kbabeldict/kbabeldictview.cpp
@@ -129,7 +129,7 @@ KBabelDictView::KBabelDictView( TQWidget* parent,  const char* name, WFlags fl )
     tempLayout->addWidget(prefStack);
     tempLayout->addStretch(1);
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     dictBox->readSettings(config);
     dictBox->setAutoUpdateOptions(true);
            
@@ -185,7 +185,7 @@ KBabelDictView::KBabelDictView( TQWidget* parent,  const char* name, WFlags fl )
 KBabelDictView::~KBabelDictView()
 {
     // no need to delete child widgets, TQt does it all for us
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     dictBox->saveSettings(config);
 }
 
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 1a0ba180..72042e16 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -196,20 +196,20 @@ KDBSearchEngine::loadDatabase (TQString database, bool noask = false)
 				     ".db");
 
 		      // rename the old files
-		      KIO::NetAccess::copy (KURL (transFile + ",old"),
+		      TDEIO::NetAccess::copy (KURL (transFile + ",old"),
 					    KURL (transFile), 0);
-		      KIO::NetAccess::
+		      TDEIO::NetAccess::
 			  copy (KURL
 				(database + "/wordsindex." + lang +
 				 ".db,old"),
 				KURL (database + "/wordsindex." + lang +
 				      ".db"), 0);
-		      KIO::NetAccess::
+		      TDEIO::NetAccess::
 			  copy (KURL
 				(database + "/keysindex." + lang + ".db,old"),
 				KURL (database + "/keysindex." + lang +
 				      ".db"), 0);
-		      KIO::NetAccess::
+		      TDEIO::NetAccess::
 			  copy (KURL
 				(database + "/catalogsinfo." + lang +
 				 ".db,old"),
@@ -228,15 +228,15 @@ KDBSearchEngine::loadDatabase (TQString database, bool noask = false)
 	  else if (oldstuff)
 	    {
 		// rename the old files
-		KIO::NetAccess::copy (KURL (transFile + ",old"),
+		TDEIO::NetAccess::copy (KURL (transFile + ",old"),
 				      KURL (transFile), 0);
-		KIO::NetAccess::
+		TDEIO::NetAccess::
 		    copy (KURL (database + "/wordsindex." + lang + ".db,old"),
 			  KURL (database + "/wordsindex." + lang + ".db"), 0);
-		KIO::NetAccess::
+		TDEIO::NetAccess::
 		    copy (KURL (database + "/keysindex." + lang + ".db,old"),
 			  KURL (database + "/keysindex." + lang + ".db"), 0);
-		KIO::NetAccess::
+		TDEIO::NetAccess::
 		    copy (KURL
 			  (database + "/catalogsinfo." + lang + ".db,old"),
 			  KURL (database + "/catalogsinfo." + lang + ".db"), 0);
@@ -1106,10 +1106,10 @@ KDBSearchEngine::isReady () const
 
 
 void
-KDBSearchEngine::saveSettings (KConfigBase * config)
+KDBSearchEngine::saveSettings (TDEConfigBase * config)
 {
 // updateSettings();  //maybe with autoupdate
-    KConfigGroupSaver cgs (config, "KDBSearchEngine");
+    TDEConfigGroupSaver cgs (config, "KDBSearchEngine");
 #if KDE_IS_VERSION(3,1,3)
     config->writePathEntry ("Filename", dbname);
 #else
@@ -1145,11 +1145,11 @@ KDBSearchEngine::saveSettings (KConfigBase * config)
 
 
 void
-KDBSearchEngine::readSettings (KConfigBase * config)
+KDBSearchEngine::readSettings (TDEConfigBase * config)
 {
     TQString newName;
 
-    KConfigGroupSaver cgs (config, "KDBSearchEngine");
+    TDEConfigGroupSaver cgs (config, "KDBSearchEngine");
 
     TQString defaultLang;
     TQString oldLang = lang;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h
index d246c5a7..e7edb3c3 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h
@@ -191,8 +191,8 @@ public:
  virtual bool isReady() const ;
  virtual bool isSearching() const;
 
- virtual void saveSettings(KConfigBase *config);
- virtual void readSettings(KConfigBase *config);
+ virtual void saveSettings(TDEConfigBase *config);
+ virtual void readSettings(TDEConfigBase *config);
 
  virtual PrefWidget *preferencesWidget(TQWidget *parent);
 
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index 699e3530..4ee016cd 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -440,19 +440,19 @@ DataBaseManager::openDataBase ()
 	  // use temporary file instead
 	  if (ret == 0)
 	    {
-		KIO::NetAccess::del (KURL::fromPathOrURL (transfilename));
+		TDEIO::NetAccess::del (KURL::fromPathOrURL (transfilename));
 		copy_hack (*transFile.file (), transfilenameFile);
 		transFile.unlink ();
 
-		KIO::NetAccess::del (KURL::fromPathOrURL (infofilename));
+		TDEIO::NetAccess::del (KURL::fromPathOrURL (infofilename));
 		copy_hack (*infoFile.file (), infofilenameFile);
 		infoFile.unlink ();
 
-		KIO::NetAccess::del (KURL::fromPathOrURL (wordsfilename));
+		TDEIO::NetAccess::del (KURL::fromPathOrURL (wordsfilename));
 		copy_hack (*wordsFile.file (), wordfilenameFile);
 		wordsFile.unlink ();
 
-		KIO::NetAccess::del (KURL::fromPathOrURL (keysfilename));
+		TDEIO::NetAccess::del (KURL::fromPathOrURL (keysfilename));
 		copy_hack (*keysFile.file (), keysfilenameFile);
 		keysFile.unlink ();
 
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
index 04c0ffde..d81dcc93 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
@@ -276,9 +276,9 @@ PrefWidget * KDBSearchEngine2::preferencesWidget(TQWidget *parent)
     return pw;
 }
 
-void KDBSearchEngine2::saveSettings(KConfigBase *config)
+void KDBSearchEngine2::saveSettings(TDEConfigBase *config)
 {
- KConfigGroupSaver cgs(config,"KDBSearchEngine2");
+ TDEConfigGroupSaver cgs(config,"KDBSearchEngine2");
     
  
  
@@ -318,7 +318,7 @@ void KDBSearchEngine2::saveSettings(KConfigBase *config)
     }
 }
 
-void KDBSearchEngine2::readSettings(KConfigBase *config)
+void KDBSearchEngine2::readSettings(TDEConfigBase *config)
 {
     
     /*TQString defaultDir;
@@ -331,7 +331,7 @@ void KDBSearchEngine2::readSettings(KConfigBase *config)
      defaultDir += "kbabeldict/dbsearchengine2";
  }
 */
-    KConfigGroupSaver cgs(config,"KDBSearchEngine2");
+    TDEConfigGroupSaver cgs(config,"KDBSearchEngine2");
     
     // dbDirectory=config->readEntry("DBDirectory",defaultDir);
     autoAdd=config->readBoolEntry("AutoAdd",true);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h
index 29615e9e..9f8d804c 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h
@@ -43,8 +43,8 @@ class KDBSearchEngine2 : public SearchEngine
     bool isReady() const {return iAmReady; }
     
 
-    void saveSettings(KConfigBase *config);
-    void readSettings(KConfigBase *config);
+    void saveSettings(TDEConfigBase *config);
+    void readSettings(TDEConfigBase *config);
 
 
     TQString translate(const TQString text);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
index 923d9897..9ba90514 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
@@ -33,7 +33,7 @@ MessagesSource::MessagesSource()
 {
     //FIXMR: check if we should put something in that constructor
 }
-void MessagesSource::writeConfig(KConfigBase *config)
+void MessagesSource::writeConfig(TDEConfigBase *config)
 {	
     config->writeEntry("Location",location.url());
     config->writeEntry("LocationType",type);
@@ -42,7 +42,7 @@ void MessagesSource::writeConfig(KConfigBase *config)
     config->writeEntry("Status",status);
 }
 
-void MessagesSource::readConfig(KConfigBase *config)
+void MessagesSource::readConfig(TDEConfigBase *config)
 {
     location=config->readEntry("Location");
     type=config->readNumEntry("LocationType",0);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h
index 9aaf2dce..be3ff8d7 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h
@@ -31,7 +31,7 @@
 
 #include "sourcedialog.h"
 
-class KConfigBase;
+class TDEConfigBase;
 
 class MessagesSource
 {
@@ -39,8 +39,8 @@ class MessagesSource
     
     public: 
     MessagesSource();
-    void writeConfig(KConfigBase *config);
-    void readConfig(KConfigBase *config);
+    void writeConfig(TDEConfigBase *config);
+    void readConfig(TDEConfigBase *config);
     void setDialogValues(SourceDialog *sd);
     void getDialogValues(SourceDialog *sd);
     
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
index fad15a21..8101c377 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
@@ -86,7 +86,7 @@ bool PoAuxiliary::isSearching() const
 }
 
 
-void PoAuxiliary::saveSettings(KConfigBase *config)
+void PoAuxiliary::saveSettings(TDEConfigBase *config)
 {
     if(autoUpdate && prefWidget && prefWidget->settingsChanged())
     {
@@ -97,7 +97,7 @@ void PoAuxiliary::saveSettings(KConfigBase *config)
     config->writeEntry("IgnoreFuzzy",ignoreFuzzy);
 }
 
-void PoAuxiliary::readSettings(KConfigBase *config)
+void PoAuxiliary::readSettings(TDEConfigBase *config)
 {    
     bool needLoading=false;
 
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h
index eaa8b890..c04a8db4 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h
@@ -62,8 +62,8 @@ public:
 
     virtual bool isSearching() const;
 
-    virtual void saveSettings(KConfigBase *config);
-    virtual void readSettings(KConfigBase *config);
+    virtual void saveSettings(TDEConfigBase *config);
+    virtual void readSettings(TDEConfigBase *config);
 
     virtual PrefWidget *preferencesWidget(TQWidget *parent);
 
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index 078d853a..e7a82d9a 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -113,7 +113,7 @@ bool PoCompendium::isSearching() const
 }
 
 
-void PoCompendium::saveSettings(KConfigBase *config )
+void PoCompendium::saveSettings(TDEConfigBase *config )
 {
     if(autoUpdate && prefWidget && prefWidget->settingsChanged())
     {
@@ -133,7 +133,7 @@ void PoCompendium::saveSettings(KConfigBase *config )
     config->writeEntry("Compendium", url);
 }
 
-void PoCompendium::readSettings(KConfigBase *config)
+void PoCompendium::readSettings(TDEConfigBase *config)
 {    
     caseSensitive = config->readBoolEntry("CaseSensitive", false);
     ignoreFuzzy = config->readBoolEntry("IgnoreFuzzy",true);
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h
index ef6eec63..deb1a16d 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h
@@ -45,7 +45,7 @@
 #include <tqptrlist.h>
 
 class CompendiumPreferencesWidget;
-class KConfigBase;
+class TDEConfigBase;
 class TQTimer;
 
 class PoCompendium : public SearchEngine
@@ -65,8 +65,8 @@ public:
 
 	virtual bool isSearching() const;
 
-	virtual void saveSettings(KConfigBase *config);
-	virtual void readSettings(KConfigBase *config);
+	virtual void saveSettings(TDEConfigBase *config);
+	virtual void readSettings(TDEConfigBase *config);
 
 	virtual PrefWidget *preferencesWidget(TQWidget *parent);
 
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 7f2bc8b6..913402d8 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -107,7 +107,7 @@ bool TmxCompendium::isSearching() const
 }
 
 
-void TmxCompendium::saveSettings(KConfigBase *config)
+void TmxCompendium::saveSettings(TDEConfigBase *config)
 {
     if(autoUpdate && prefWidget && prefWidget->settingsChanged())
     {
@@ -126,7 +126,7 @@ void TmxCompendium::saveSettings(KConfigBase *config)
     config->writeEntry("Compendium", url);
 }
 
-void TmxCompendium::readSettings(KConfigBase *config)
+void TmxCompendium::readSettings(TDEConfigBase *config)
 {    
     caseSensitive = config->readBoolEntry("CaseSensitive", false);
     wholeWords = config->readBoolEntry("WholeWords",true);
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h
index 8f75f5e6..992c5d93 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h
@@ -44,7 +44,7 @@
 #include <tqguardedptr.h>
 
 class TmxCompendiumPreferencesWidget;
-class KConfigBase;
+class TDEConfigBase;
 class TQTimer;
 
 class TmxCompendium : public SearchEngine
@@ -63,8 +63,8 @@ public:
 
 	virtual bool isSearching() const;
 
-	virtual void saveSettings(KConfigBase *config);
-	virtual void readSettings(KConfigBase *config);
+	virtual void saveSettings(TDEConfigBase *config);
+	virtual void readSettings(TDEConfigBase *config);
 
 	virtual PrefWidget *preferencesWidget(TQWidget *parent);
 
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index 0c186b57..0f849e9c 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -83,7 +83,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language)
     
     TQString target;
     
-    if( KIO::NetAccess::download( url, target ) )
+    if( TDEIO::NetAccess::download( url, target ) )
     {
 	TQFile f( target );
 	if ( !f.open( IO_ReadOnly ) )
@@ -96,7 +96,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language)
 	    _errorMsg = i18n( "Cannot parse XML data." );
 	}
 	f.close();
-	KIO::NetAccess::removeTempFile(target);
+	TDEIO::NetAccess::removeTempFile(target);
     } else {
 	_error = true;
 	_errorMsg = i18n( "Cannot open the file." );
diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h
index ace70b9c..ca729469 100644
--- a/kbabel/kbabeldict/searchengine.h
+++ b/kbabel/kbabeldict/searchengine.h
@@ -288,8 +288,8 @@ public:
     
 
     /** save the settings in the given config object */
-    virtual void saveSettings(KConfigBase *config) = 0;
-    virtual void readSettings(KConfigBase *config) = 0;
+    virtual void saveSettings(TDEConfigBase *config) = 0;
+    virtual void readSettings(TDEConfigBase *config) = 0;
 
     /** @returns true, if it was initialized correctly */
     virtual bool isReady() const =0;