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

206 files changed, 754 insertions, 754 deletions

diff --git a/cervisia/ChangeLog b/cervisia/ChangeLog
index eaa88397..7c378f87 100644
--- a/cervisia/ChangeLog
+++ b/cervisia/ChangeLog
@@ -598,7 +598,7 @@
 2003-01-11  André Wöbbeking <[email protected]>
 
 	* Moved colors from UpdateViewItem to UpdateView:
-	  o it's faster as you don't need KConfig in UpdateViewItem ctor
+	  o it's faster as you don't need TDEConfig in UpdateViewItem ctor
 	  o it needs less memory (3 colors per item)
 
 2003-01-09  Christian Loose <[email protected]>
@@ -750,7 +750,7 @@
 	* Mark files with option -kb with a binary icon
 	* Fixed restoration of the last loaded sandbox
 	* Use different instance names for part and shell,
-	  otherwise KConfig get messed up
+	  otherwise TDEConfig get messed up
 
 2002-06-26  Bernd Gehrmann  <[email protected]>
 
diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp
index c370b02a..342f52b2 100644
--- a/cervisia/addrepositorydlg.cpp
+++ b/cervisia/addrepositorydlg.cpp
@@ -32,7 +32,7 @@
 #include <knuminput.h>
 
 
-AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo, 
+AddRepositoryDialog::AddRepositoryDialog(TDEConfig& cfg, const TQString& repo, 
                                          TQWidget* parent, const char* name)
     : KDialogBase(parent, name, true, i18n("Add Repository"),
                   Ok | Cancel, Ok, true)
@@ -114,7 +114,7 @@ void AddRepositoryDialog::setCompression(int compression)
 {
     if( compression < 0 )
     {
-        // TODO: use KConfigXT to retrieve default compression level
+        // TODO: use TDEConfigXT to retrieve default compression level
         m_compressionLevel->setValue(0);
         m_useDifferentCompression->setChecked(false);
     }
diff --git a/cervisia/addrepositorydlg.h b/cervisia/addrepositorydlg.h
index f326dad1..23323c32 100644
--- a/cervisia/addrepositorydlg.h
+++ b/cervisia/addrepositorydlg.h
@@ -25,7 +25,7 @@
 #include <kdialogbase.h>
 
 class TQCheckBox;
-class KConfig;
+class TDEConfig;
 class KIntNumInput;
 class KLineEdit;
 
@@ -36,7 +36,7 @@ class AddRepositoryDialog : public KDialogBase
   
 
 public:
-    AddRepositoryDialog(KConfig& cfg, const TQString& repo, TQWidget* parent = 0,
+    AddRepositoryDialog(TDEConfig& cfg, const TQString& repo, TQWidget* parent = 0,
                          const char* name = 0);
     virtual ~AddRepositoryDialog();
 
@@ -63,7 +63,7 @@ private:
     TQCheckBox*    m_useDifferentCompression;
     TQCheckBox*    m_retrieveCvsignoreFile;
     KIntNumInput* m_compressionLevel;
-    KConfig&      partConfig;
+    TDEConfig&      partConfig;
 };
 
 #endif
diff --git a/cervisia/annotatedlg.cpp b/cervisia/annotatedlg.cpp
index b1a0977c..0616fb9e 100644
--- a/cervisia/annotatedlg.cpp
+++ b/cervisia/annotatedlg.cpp
@@ -23,7 +23,7 @@
 #include "annotateview.h"
 
 
-AnnotateDialog::AnnotateDialog(KConfig& cfg, TQWidget *parent, const char *name)
+AnnotateDialog::AnnotateDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
     : KDialogBase(parent, name, false, TQString(),
                   Close | Help, Close, true)
     , partConfig(cfg)
diff --git a/cervisia/annotatedlg.h b/cervisia/annotatedlg.h
index d9ba0317..72356390 100644
--- a/cervisia/annotatedlg.h
+++ b/cervisia/annotatedlg.h
@@ -27,7 +27,7 @@
 
 class AnnotateView;
 class TQDate;
-class KConfig;
+class TDEConfig;
 
 namespace Cervisia
 {
@@ -39,7 +39,7 @@ class AnnotateDialog : public KDialogBase
 {
 public:
 
-    explicit AnnotateDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit AnnotateDialog( TDEConfig& cfg, TQWidget *parent=0, const char *name=0 );
 
     virtual ~AnnotateDialog();
 
@@ -48,7 +48,7 @@ public:
 
 private:
     AnnotateView *annotate;
-    KConfig&      partConfig;
+    TDEConfig&      partConfig;
 };
 
 #endif
diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp
index bdbcf2a9..174ade20 100644
--- a/cervisia/annotateview.cpp
+++ b/cervisia/annotateview.cpp
@@ -140,7 +140,7 @@ int AnnotateViewItem::width(const TQFontMetrics &fm, const TQListView *, int col
   caused by a bug in TQHeader::adjustHeaderSize() in TQt <= 3.0.4.
 */
 
-AnnotateView::AnnotateView(KConfig &cfg, TQWidget *parent, const char *name)
+AnnotateView::AnnotateView(TDEConfig &cfg, TQWidget *parent, const char *name)
     : TQListView(parent, name, WRepaintNoErase | WResizeNoErase)
 {
     setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
@@ -162,7 +162,7 @@ AnnotateView::AnnotateView(KConfig &cfg, TQWidget *parent, const char *name)
     connect(toolTip, TQT_SIGNAL(queryToolTip(const TQPoint&, TQRect&, TQString&)),
             this, TQT_SLOT(slotQueryToolTip(const TQPoint&, TQRect&, TQString&)));
 
-    KConfigGroupSaver cs(&cfg, "LookAndFeel");
+    TDEConfigGroupSaver cs(&cfg, "LookAndFeel");
     setFont(cfg.readFontEntry("AnnotateFont"));
 }
 
diff --git a/cervisia/annotateview.h b/cervisia/annotateview.h
index 2a878611..52178f7f 100644
--- a/cervisia/annotateview.h
+++ b/cervisia/annotateview.h
@@ -25,7 +25,7 @@
 #include <tqlistview.h>
 
 
-class KConfig;
+class TDEConfig;
 
 
 namespace Cervisia
@@ -41,7 +41,7 @@ class AnnotateView : public TQListView
 
 public:
 
-    explicit AnnotateView( KConfig &cfg, TQWidget *parent=0, const char *name=0 );
+    explicit AnnotateView( TDEConfig &cfg, TQWidget *parent=0, const char *name=0 );
 
     void addLine(const Cervisia::LogInfo& logInfo, const TQString& content,
                  bool odd);
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 931adefa..e3eb4e95 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -121,7 +121,7 @@ CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName,
       cvsService = new CvsService_stub(appId, "CvsService");
 
     // Create UI
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     conf->setGroup("LookAndFeel");
     bool splitHorz = conf->readBoolEntry("SplitHorizontally",true);
 
@@ -176,7 +176,7 @@ CervisiaPart::~CervisiaPart()
         writeSettings();
 }
 
-KConfig *CervisiaPart::config()
+TDEConfig *CervisiaPart::config()
 {
     return CervisiaFactory::instance()->config();
 }
@@ -184,7 +184,7 @@ KConfig *CervisiaPart::config()
 bool CervisiaPart::openURL( const KURL &u )
 {
     // support url protocols like system:// or home://
-    KURL url = KIO::NetAccess::mostLocalURL(u, widget());
+    KURL url = TDEIO::NetAccess::mostLocalURL(u, widget());
 
     // right now, we are unfortunately not network-aware
     if( !url.isLocalFile() )
@@ -975,7 +975,7 @@ void CervisiaPart::slotCommit()
             while (recentCommits.count() > 50)
                 recentCommits.remove( recentCommits.last() );
 
-            KConfig* conf = config();
+            TDEConfig* conf = config();
             conf->setGroup( "CommitLogs" );
             conf->writeEntry( sandbox, recentCommits, COMMIT_SPLIT_CHAR );
         }
@@ -1628,7 +1628,7 @@ void CervisiaPart::slotDoCVSEdit()
 
 void CervisiaPart::slotConfigure()
 {
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     SettingsDialog *l = new SettingsDialog( conf, widget() );
     l->exec();
 
@@ -1755,7 +1755,7 @@ bool CervisiaPart::openSandbox(const TQString &dirname)
     update->openDirectory(sandbox);
     setFilter();
 
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     conf->setGroup("General");
     bool dostatus = conf->readBoolEntry(repository.contains(":")?
                                         "StatusForRemoteRepos" :
@@ -1767,7 +1767,7 @@ bool CervisiaPart::openSandbox(const TQString &dirname)
         slotStatus();
     }
 
-    //load the recentCommits for this app from the KConfig app
+    //load the recentCommits for this app from the TDEConfig app
     conf->setGroup( "CommitLogs" );
     recentCommits = conf->readListEntry( sandbox, COMMIT_SPLIT_CHAR );
 
@@ -1808,12 +1808,12 @@ void CervisiaPart::setFilter()
 
 void CervisiaPart::readSettings()
 {
-    KConfig* config = CervisiaFactory::instance()->config();
+    TDEConfig* config = CervisiaFactory::instance()->config();
 
     config->setGroup("Session");
     recent->loadEntries( config );
 
-    // Unfortunately, the KConfig systems sucks and we have to live
+    // Unfortunately, the TDEConfig systems sucks and we have to live
     // with all entries in one group for session management.
 
     opt_createDirs = config->readBoolEntry("Create Dirs", true);
@@ -1872,7 +1872,7 @@ void CervisiaPart::readSettings()
 
 void CervisiaPart::writeSettings()
 {
-    KConfig* config = CervisiaFactory::instance()->config();
+    TDEConfig* config = CervisiaFactory::instance()->config();
 
     config->setGroup("Session");
     recent->saveEntries( config );
diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h
index 5ab4efe4..6d1d097b 100644
--- a/cervisia/cervisiapart.h
+++ b/cervisia/cervisiapart.h
@@ -63,7 +63,7 @@ public:
     /**
      * Get the config object for the part's instance.
      */
-    static KConfig *config();
+    static TDEConfig *config();
 
     TQString sandBox() const { return sandbox; }
 
diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp
index 125df1ba..0805d8dc 100644
--- a/cervisia/cervisiashell.cpp
+++ b/cervisia/cervisiashell.cpp
@@ -177,7 +177,7 @@ bool CervisiaShell::queryExit()
 }
 
 
-void CervisiaShell::readProperties(KConfig* config)
+void CervisiaShell::readProperties(TDEConfig* config)
 {   
     m_lastOpenDir = config->readPathEntry("Current Directory");
     
@@ -188,7 +188,7 @@ void CervisiaShell::readProperties(KConfig* config)
 }
 
 
-void CervisiaShell::saveProperties(KConfig* config)
+void CervisiaShell::saveProperties(TDEConfig* config)
 {
     // Save current working directory (if part was created)
     if( m_part )
@@ -203,7 +203,7 @@ void CervisiaShell::saveProperties(KConfig* config)
 
 void CervisiaShell::readSettings()
 {
-    KConfig* config = TDEGlobal::config(); 
+    TDEConfig* config = TDEGlobal::config(); 
     config->setGroup("Session");
     
     readProperties(config);
@@ -212,7 +212,7 @@ void CervisiaShell::readSettings()
 
 void CervisiaShell::writeSettings()
 {
-    KConfig* config = TDEGlobal::config();  
+    TDEConfig* config = TDEGlobal::config();  
     config->setGroup("Session");
     
     saveProperties(config);
diff --git a/cervisia/cervisiashell.h b/cervisia/cervisiashell.h
index 1aad2c11..2a676d76 100644
--- a/cervisia/cervisiashell.h
+++ b/cervisia/cervisiashell.h
@@ -53,8 +53,8 @@ protected:
     void setupActions();
     
     bool queryExit();
-    virtual void readProperties(KConfig* config);
-    virtual void saveProperties(KConfig* config);
+    virtual void readProperties(TDEConfig* config);
+    virtual void saveProperties(TDEConfig* config);
 
 private:
     void readSettings();
diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp
index 8c19a9fc..943d7dd0 100644
--- a/cervisia/changelogdlg.cpp
+++ b/cervisia/changelogdlg.cpp
@@ -40,7 +40,7 @@ static inline TQString DateStringISO8601()
 ChangeLogDialog::Options *ChangeLogDialog::options = 0;
 
 
-ChangeLogDialog::ChangeLogDialog(KConfig& cfg, TQWidget *parent, const char *name)
+ChangeLogDialog::ChangeLogDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
     : KDialogBase(parent, name, true, i18n("Edit ChangeLog"),
                   Ok | Cancel, Ok, true)
     , partConfig(cfg)
@@ -118,7 +118,7 @@ bool ChangeLogDialog::readFile(const TQString &filename)
             f.close();
         }
 
-    KConfigGroupSaver cs(&partConfig, "General");
+    TDEConfigGroupSaver cs(&partConfig, "General");
     const TQString username = partConfig.readEntry("Username", Cervisia::UserName());
 
     edit->insertParagraph("", 0);
diff --git a/cervisia/changelogdlg.h b/cervisia/changelogdlg.h
index ee7b8fc4..7b9e0d25 100644
--- a/cervisia/changelogdlg.h
+++ b/cervisia/changelogdlg.h
@@ -25,13 +25,13 @@
 #include <kdialogbase.h>
 
 class KTextEdit;
-class KConfig;
+class TDEConfig;
 
 
 class ChangeLogDialog : public KDialogBase
 {
 public:
-    explicit ChangeLogDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit ChangeLogDialog( TDEConfig& cfg, TQWidget *parent=0, const char *name=0 );
 
     virtual ~ChangeLogDialog();
 
@@ -49,7 +49,7 @@ private:
 
     TQString fname;
     KTextEdit *edit;
-    KConfig&   partConfig;
+    TDEConfig&   partConfig;
 };
 
 #endif
diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp
index 16a57098..0fe06352 100644
--- a/cervisia/checkoutdlg.cpp
+++ b/cervisia/checkoutdlg.cpp
@@ -42,7 +42,7 @@
 using Cervisia::IsValidTag;
 
 
-CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service,
+CheckoutDialog::CheckoutDialog(TDEConfig& cfg, CvsService_stub* service,
                                ActionType action, TQWidget* parent,
                                const char* name)
     : KDialogBase(parent, name, true, TQString(),
@@ -415,7 +415,7 @@ void CheckoutDialog::branchButtonClicked()
 
 void CheckoutDialog::restoreUserInput()
 {
-    KConfigGroupSaver cs(&partConfig, "CheckoutDialog");
+    TDEConfigGroupSaver cs(&partConfig, "CheckoutDialog");
 
     repo_combo->setEditText(partConfig.readEntry("Repository"));
     workdir_edit->setText(partConfig.readPathEntry("Working directory"));
@@ -441,7 +441,7 @@ void CheckoutDialog::restoreUserInput()
 
 void CheckoutDialog::saveUserInput()
 {
-    KConfigGroupSaver cs(&partConfig, "CheckoutDialog");
+    TDEConfigGroupSaver cs(&partConfig, "CheckoutDialog");
 
     partConfig.writeEntry("Repository", repository());
     partConfig.writeEntry("Module", module());
diff --git a/cervisia/checkoutdlg.h b/cervisia/checkoutdlg.h
index d0b4a42f..2547f680 100644
--- a/cervisia/checkoutdlg.h
+++ b/cervisia/checkoutdlg.h
@@ -27,7 +27,7 @@
 
 class TQCheckBox;
 class TQComboBox;
-class KConfig;
+class TDEConfig;
 class KLineEdit;
 class CvsService_stub;
 
@@ -40,7 +40,7 @@ class CheckoutDialog : public KDialogBase
 public:
     enum ActionType { Checkout, Import };
     
-    CheckoutDialog( KConfig& cfg, CvsService_stub* service, ActionType action,
+    CheckoutDialog( TDEConfig& cfg, CvsService_stub* service, ActionType action,
                     TQWidget *parent=0, const char *name=0 );
 
     TQString workingDirectory() const;
@@ -77,7 +77,7 @@ private:
     TQCheckBox *binary_box, *export_box, *recursive_box;
     TQCheckBox* m_useModificationTimeBox;
     ActionType act;
-    KConfig&   partConfig;
+    TDEConfig&   partConfig;
 
     CvsService_stub *cvsService;
 };
diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp
index 976d93bd..485547fc 100644
--- a/cervisia/commitdlg.cpp
+++ b/cervisia/commitdlg.cpp
@@ -52,7 +52,7 @@ private:
 };
 
 
-CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service,
+CommitDialog::CommitDialog(TDEConfig& cfg, CvsService_stub* service,
                            TQWidget *parent, const char *name)
     : KDialogBase(parent, name, true, i18n("CVS Commit"),
                   Ok | Cancel | Help | User1, Ok, true)
@@ -119,7 +119,7 @@ CommitDialog::~CommitDialog()
 {
     saveDialogSize(partConfig, "CommitDialog");
 
-    KConfigGroupSaver cs(&partConfig, "CommitDialog");
+    TDEConfigGroupSaver cs(&partConfig, "CommitDialog");
     partConfig.writeEntry("UseTemplate", m_useTemplateChk->isChecked());
 }
 
@@ -286,7 +286,7 @@ void CommitDialog::checkForTemplateFile()
             f.close();
 
             m_useTemplateChk->setEnabled(true);
-            KConfigGroupSaver cs(&partConfig, "CommitDialog");
+            TDEConfigGroupSaver cs(&partConfig, "CommitDialog");
             bool check = partConfig.readBoolEntry("UseTemplate", true);
             m_useTemplateChk->setChecked(check);
 
diff --git a/cervisia/commitdlg.h b/cervisia/commitdlg.h
index 458528cb..05508163 100644
--- a/cervisia/commitdlg.h
+++ b/cervisia/commitdlg.h
@@ -30,7 +30,7 @@ namespace Cervisia { class LogMessageEdit; }
 class TQComboBox;
 class TQCheckBox;
 class KListView;
-class KConfig;
+class TDEConfig;
 class CvsService_stub;
 
 
@@ -40,7 +40,7 @@ class CommitDialog : public KDialogBase
   
 
 public:
-    CommitDialog( KConfig& cfg, CvsService_stub* service, TQWidget *parent=0, 
+    CommitDialog( TDEConfig& cfg, CvsService_stub* service, TQWidget *parent=0, 
                   const char *name=0 );
 
     virtual ~CommitDialog();
@@ -75,7 +75,7 @@ private:
     TQCheckBox* m_useTemplateChk;
     TQString    m_templateText;
 
-    KConfig&            partConfig;
+    TDEConfig&            partConfig;
     CvsService_stub*    cvsService;     // for diff dialog
 };
 
diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp
index ce69caf5..70cb283d 100644
--- a/cervisia/cvsservice/cvsservice.cpp
+++ b/cervisia/cvsservice/cvsservice.cpp
@@ -86,8 +86,8 @@ CvsService::CvsService()
     d->cvsJobs.setAutoDelete(true);
     d->loginJobs.setAutoDelete(true);
 
-    KConfig* config = kapp->config();
-    KConfigGroupSaver cs(config, "General");
+    TDEConfig* config = kapp->config();
+    TDEConfigGroupSaver cs(config, "General");
     if( config->readBoolEntry("UseSshAgent", false) )
     {
         // use the existing or start a new ssh-agent
diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp
index 398c1c47..92a56baa 100644
--- a/cervisia/cvsservice/repository.cpp
+++ b/cervisia/cvsservice/repository.cpp
@@ -201,7 +201,7 @@ void Repository::slotConfigDirty(const TQString& fileName)
 
 void Repository::Private::readGeneralConfig()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     // get path to cvs client programm
     config->setGroup("General");
@@ -211,7 +211,7 @@ void Repository::Private::readGeneralConfig()
 
 void Repository::Private::readConfig()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     // Sometimes the location can be unequal to the entry in the CVS/Root.
     //
@@ -251,7 +251,7 @@ void Repository::Private::readConfig()
     // use default global compression level instead?
     if( compressionLevel < 0 )
     {
-        KConfigGroupSaver cs(config, "General");
+        TDEConfigGroupSaver cs(config, "General");
         compressionLevel = config->readNumEntry("Compression", 0);
     }
 
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp
index 993f4f6c..bdf34841 100644
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@@ -41,7 +41,7 @@
 #include "diffview.h"
 
 
-DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool modal)
+DiffDialog::DiffDialog(TDEConfig& cfg, TQWidget *parent, const char *name, bool modal)
     : KDialogBase(parent, name, modal, TQString(),
                   Close | Help | User1, Close, true, KStdGuiItem::saveAs())
     , partConfig(cfg)
@@ -118,7 +118,7 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo
     TQSize size = configDialogSize(partConfig, "DiffDialog");
     resize(size);
 
-    KConfigGroupSaver cs(&partConfig, "DiffDialog");
+    TDEConfigGroupSaver cs(&partConfig, "DiffDialog");
     syncbox->setChecked(partConfig.readBoolEntry("Sync"));
 }
 
@@ -127,7 +127,7 @@ DiffDialog::~DiffDialog()
 {
     saveDialogSize(partConfig, "DiffDialog");
 
-    KConfigGroupSaver cs(&partConfig, "DiffDialog");
+    TDEConfigGroupSaver cs(&partConfig, "DiffDialog");
     partConfig.writeEntry("Sync", syncbox->isChecked());
 }
 
@@ -230,7 +230,7 @@ bool DiffDialog::parseCvsDiff(CvsService_stub* service, const TQString& fileName
                         i18n("Working dir:")
                         : i18n("Revision ")+revB+":" );
 
-    KConfigGroupSaver cs(&partConfig, "General");
+    TDEConfigGroupSaver cs(&partConfig, "General");
 
     // Ok, this is a hack: When the user wants an external diff
     // front end, it is executed from here. Of course, in that
diff --git a/cervisia/diffdlg.h b/cervisia/diffdlg.h
index 7600af66..7553cdc7 100644
--- a/cervisia/diffdlg.h
+++ b/cervisia/diffdlg.h
@@ -28,7 +28,7 @@
 class TQLabel;
 class TQCheckBox;
 class TQComboBox;
-class KConfig;
+class TDEConfig;
 class DiffItem;
 class DiffView;
 class CvsService_stub;
@@ -41,7 +41,7 @@ class DiffDialog : public KDialogBase
 
 public:
 
-    explicit DiffDialog( KConfig& config, TQWidget *parent=0, const char *name=0, 
+    explicit DiffDialog( TDEConfig& config, TQWidget *parent=0, const char *name=0, 
                          bool modal=false );
 
     virtual ~DiffDialog();
@@ -76,7 +76,7 @@ private:
 
     TQPtrList<DiffItem> items;
     int markeditem;
-    KConfig& partConfig;
+    TDEConfig& partConfig;
     TQStringList m_diffOutput;
 };
 
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index 90e82516..c3e43862 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -53,7 +53,7 @@ int DiffViewItemList::compareItems(TQPtrCollection::Item item1, TQPtrCollection:
 const int DiffView::BORDER = 7;
 
 
-DiffView::DiffView( KConfig& cfg, bool withlinenos, bool withmarker,
+DiffView::DiffView( TDEConfig& cfg, bool withlinenos, bool withmarker,
                     TQWidget *parent, const char *name )
     : QtTableView(parent, name, WRepaintNoErase)
     , partConfig(cfg)
@@ -388,7 +388,7 @@ void DiffView::wheelEvent(TQWheelEvent *e)
 }
 
 
-DiffZoomWidget::DiffZoomWidget(KConfig& cfg, TQWidget *parent, const char *name)
+DiffZoomWidget::DiffZoomWidget(TDEConfig& cfg, TQWidget *parent, const char *name)
     : TQFrame(parent, name)
 {
     setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
diff --git a/cervisia/diffview.h b/cervisia/diffview.h
index f691c0b6..2eff4753 100644
--- a/cervisia/diffview.h
+++ b/cervisia/diffview.h
@@ -28,7 +28,7 @@
 #include <tqptrlist.h>
 
 
-class KConfig;
+class TDEConfig;
 class DiffViewItem;
 
 
@@ -47,7 +47,7 @@ class DiffView : public QtTableView
 public:
     enum DiffType { Change, Insert, Delete, Neutral, Unchanged, Separator };
 
-    DiffView( KConfig& cfg, bool withlinenos, bool withmarker,
+    DiffView( TDEConfig& cfg, bool withlinenos, bool withmarker,
               TQWidget *parent=0, const char *name=0 );
 
     void setPartner(DiffView *other);
@@ -98,7 +98,7 @@ private:
     TQColor diffDeleteColor;
 
     int m_tabWidth;
-    KConfig& partConfig;
+    TDEConfig& partConfig;
 };
 
 
@@ -108,7 +108,7 @@ class DiffZoomWidget : public TQFrame
   
 
 public:
-    DiffZoomWidget(KConfig& cfg, TQWidget *parent=0, const char *name=0);
+    DiffZoomWidget(TDEConfig& cfg, TQWidget *parent=0, const char *name=0);
     ~DiffZoomWidget();
 
     void setDiffView(DiffView *view);
diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp
index 20e95d37..8f2ffee2 100644
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@@ -138,7 +138,7 @@ bool HistoryItem::isOther()
 }
 
 
-HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
+HistoryDialog::HistoryDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
     : KDialogBase(parent, name, false, TQString(),
                   Close | Help, ButtonCode(0), true)
     , partConfig(cfg)
diff --git a/cervisia/historydlg.h b/cervisia/historydlg.h
index fa589215..8b4345c1 100644
--- a/cervisia/historydlg.h
+++ b/cervisia/historydlg.h
@@ -26,7 +26,7 @@
 
 
 class TQCheckBox;
-class KConfig;
+class TDEConfig;
 class KLineEdit;
 class KListView;
 class CvsService_stub;
@@ -38,7 +38,7 @@ class HistoryDialog : public KDialogBase
   
 
 public:
-    explicit HistoryDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit HistoryDialog( TDEConfig& cfg, TQWidget *parent=0, const char *name=0 );
     virtual ~HistoryDialog();
 
     bool parseHistory(CvsService_stub* cvsService);
@@ -52,7 +52,7 @@ private:
     TQCheckBox *commit_box, *checkout_box, *tag_box, *other_box;
     TQCheckBox *onlyuser_box, *onlyfilenames_box, *onlydirnames_box;
     KLineEdit *user_edit, *filename_edit, *dirname_edit;
-    KConfig& partConfig;
+    TDEConfig& partConfig;
 };
 
 #endif
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index 1c09509a..bb0b9223 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -57,7 +57,7 @@
 #include "patchoptiondlg.h"
 
 
-LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
+LogDialog::LogDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
     : KDialogBase(parent, name, false, TQString(),
                   Ok | Apply | Close | Help | User1 | User2 | User3, Close, true,
                   KGuiItem(i18n("&Annotate")),
@@ -204,7 +204,7 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
     TQSize size = configDialogSize(partConfig, "LogDialog");
     resize(size);
 
-    KConfigGroupSaver cs(&partConfig, "LogDialog");
+    TDEConfigGroupSaver cs(&partConfig, "LogDialog");
     tabWidget->setCurrentPage(partConfig.readNumEntry("ShowTab", 0));
 
     updateButtons();
@@ -215,7 +215,7 @@ LogDialog::~LogDialog()
 {
     saveDialogSize(partConfig, "LogDialog");
 
-    KConfigGroupSaver cs(&partConfig, "LogDialog");
+    TDEConfigGroupSaver cs(&partConfig, "LogDialog");
     partConfig.writeEntry("ShowTab", tabWidget->currentPageIndex());
 }
 
diff --git a/cervisia/logdlg.h b/cervisia/logdlg.h
index 2e676d04..59f3b9f5 100644
--- a/cervisia/logdlg.h
+++ b/cervisia/logdlg.h
@@ -32,7 +32,7 @@ class LogListView;
 class LogTreeView;
 class LogPlainView;
 
-class KConfig;
+class TDEConfig;
 
 class TQComboBox;
 class TQLabel;
@@ -55,7 +55,7 @@ class LogDialog : public KDialogBase
   
 
 public:
-    explicit LogDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit LogDialog( TDEConfig& cfg, TQWidget *parent=0, const char *name=0 );
 
     virtual ~LogDialog();
 
@@ -95,7 +95,7 @@ private:
     TQComboBox *tagcombo[2];
 
     CvsService_stub* cvsService;
-    KConfig&         partConfig;
+    TDEConfig&         partConfig;
 };
 
 #endif
diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp
index d676718a..3b0432fd 100644
--- a/cervisia/loglist.cpp
+++ b/cervisia/loglist.cpp
@@ -106,7 +106,7 @@ int LogListViewItem::compare(TQListViewItem* i, int col, bool ascending) const
 }
 
 
-LogListView::LogListView(KConfig& cfg, TQWidget *parent, const char *name)
+LogListView::LogListView(TDEConfig& cfg, TQWidget *parent, const char *name)
     : KListView(parent, name)
     , partConfig(cfg)
 {
diff --git a/cervisia/loglist.h b/cervisia/loglist.h
index 0530283b..49c3ecdc 100644
--- a/cervisia/loglist.h
+++ b/cervisia/loglist.h
@@ -25,7 +25,7 @@
 #include <klistview.h>
 
 
-class KConfig;
+class TDEConfig;
 
 class TipLabel;
 class LogListViewItem;
@@ -42,7 +42,7 @@ class LogListView : public KListView
   
     
 public:
-    explicit LogListView( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit LogListView( TDEConfig& cfg, TQWidget *parent=0, const char *name=0 );
     virtual ~LogListView();
     
     void addRevision(const Cervisia::LogInfo& logInfo);
@@ -61,7 +61,7 @@ private slots:
 
 private:
 
-    KConfig& partConfig;
+    TDEConfig& partConfig;
 };
 
 #endif
diff --git a/cervisia/logplainview.h b/cervisia/logplainview.h
index 324c3417..75e004df 100644
--- a/cervisia/logplainview.h
+++ b/cervisia/logplainview.h
@@ -22,7 +22,7 @@
 
 #include <ktextbrowser.h>
 
-class KConfig;
+class TDEConfig;
 class KFind;
 
 namespace Cervisia
diff --git a/cervisia/main.cpp b/cervisia/main.cpp
index 9d9c89a9..e5aa2120 100644
--- a/cervisia/main.cpp
+++ b/cervisia/main.cpp
@@ -62,7 +62,7 @@ static CvsService_stub* StartDCOPService(const TQString& directory)
 
 static int ShowResolveDialog(const TQString& fileName)
 {
-    KConfig* config = new KConfig("cervisiapartrc");
+    TDEConfig* config = new TDEConfig("cervisiapartrc");
 
     ResolveDialog* dlg = new ResolveDialog(*config);
     kapp->setMainWidget(dlg);
@@ -81,7 +81,7 @@ static int ShowResolveDialog(const TQString& fileName)
 
 static int ShowLogDialog(const TQString& fileName)
 {
-    KConfig* config = new KConfig("cervisiapartrc");
+    TDEConfig* config = new TDEConfig("cervisiapartrc");
     LogDialog* dlg = new LogDialog(*config);
     kapp->setMainWidget(dlg);
 
@@ -111,7 +111,7 @@ static int ShowLogDialog(const TQString& fileName)
 
 static int ShowAnnotateDialog(const TQString& fileName)
 {
-    KConfig* config = new KConfig("cervisiapartrc");
+    TDEConfig* config = new TDEConfig("cervisiapartrc");
     AnnotateDialog* dlg = new AnnotateDialog(*config);
     kapp->setMainWidget(dlg);
 
diff --git a/cervisia/misc.h b/cervisia/misc.h
index 803c8131..f66926f4 100644
--- a/cervisia/misc.h
+++ b/cervisia/misc.h
@@ -26,7 +26,7 @@
 class TQString;
 class TQStringList;
 class TQWidget;
-class KConfig;
+class TDEConfig;
 class CvsService_stub;
 
 
diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp
index 004226a8..62e15dde 100644
--- a/cervisia/protocolview.cpp
+++ b/cervisia/protocolview.cpp
@@ -42,7 +42,7 @@ ProtocolView::ProtocolView(const TQCString& appId, TQWidget *parent, const char
     setTabChangesFocus(true);
     setTextFormat(TQt::LogText);
 
-    KConfig *config = CervisiaPart::config();
+    TDEConfig *config = CervisiaPart::config();
     config->setGroup("LookAndFeel");
     setFont(config->readFontEntry("ProtocolFont"));
 
diff --git a/cervisia/repositories.cpp b/cervisia/repositories.cpp
index 7f52a39d..28302ce3 100644
--- a/cervisia/repositories.cpp
+++ b/cervisia/repositories.cpp
@@ -111,7 +111,7 @@ TQStringList Repositories::readConfigFile()
 {
     TQStringList list;
     
-    KConfig *config = CervisiaPart::config();
+    TDEConfig *config = CervisiaPart::config();
     config->setGroup("Repositories");
     list = config->readListEntry("Repos");
 
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index be19890d..54694307 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -152,7 +152,7 @@ void RepositoryListItem::changeLoginStatusColumn()
 }
 
 
-RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
+RepositoryDialog::RepositoryDialog(TDEConfig& cfg, CvsService_stub* cvsService,
                                    TQWidget* parent, const char* name)
     : KDialogBase(parent, name, true, i18n("Configure Access to Repositories"),
                   Ok | Cancel | Help, Ok, true)
@@ -204,7 +204,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
              this, TQT_SLOT(slotLogoutClicked()) );
 
     // open cvs DCOP service configuration file
-    m_serviceConfig = new KConfig("cvsservicerc");
+    m_serviceConfig = new TDEConfig("cvsservicerc");
 
     readCvsPassFile();
     readConfigFile();
diff --git a/cervisia/repositorydlg.h b/cervisia/repositorydlg.h
index 85b9688f..6d7bffa4 100644
--- a/cervisia/repositorydlg.h
+++ b/cervisia/repositorydlg.h
@@ -27,7 +27,7 @@
 
 class TQListViewItem;
 class TQPushButton;
-class KConfig;
+class TDEConfig;
 class KListView;
 class CvsService_stub;
 class RepositoryListItem;
@@ -39,7 +39,7 @@ class RepositoryDialog : public KDialogBase
   
 
 public:
-    RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
+    RepositoryDialog(TDEConfig& cfg, CvsService_stub* cvsService,
                      TQWidget* parent = 0, const char* name = 0);
     virtual ~RepositoryDialog();
 
@@ -62,9 +62,9 @@ private:
     void writeRepositoryData(RepositoryListItem* item);
 
 private:
-    KConfig&         m_partConfig;
+    TDEConfig&         m_partConfig;
     CvsService_stub* m_cvsService;
-    KConfig*         m_serviceConfig;
+    TDEConfig*         m_serviceConfig;
     KListView*       m_repoList;
     TQPushButton*     m_modifyButton;
     TQPushButton*     m_removeButton;
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index 3df6a8ee..d9652bf1 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -95,7 +95,7 @@ private:
 }
 
 
-ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
+ResolveDialog::ResolveDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
     : KDialogBase(parent, name, false, TQString(),
                   Close | Help | User1 | User2, Close, true,
                   KStdGuiItem::saveAs(), KStdGuiItem::save())
diff --git a/cervisia/resolvedlg.h b/cervisia/resolvedlg.h
index 71aa91f2..c847e3da 100644
--- a/cervisia/resolvedlg.h
+++ b/cervisia/resolvedlg.h
@@ -31,7 +31,7 @@
 
 class TQLabel;
 class TQTextCodec;
-class KConfig;
+class TDEConfig;
 class ResolveItem;
 
 
@@ -43,7 +43,7 @@ class ResolveDialog : public KDialogBase
 public:
     enum ChooseType { ChA, ChB, ChAB, ChBA, ChEdit };
 
-    explicit ResolveDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit ResolveDialog( TDEConfig& cfg, TQWidget *parent=0, const char *name=0 );
     virtual ~ResolveDialog();
 
     bool parseFile(const TQString &name);
@@ -85,7 +85,7 @@ private:
     TQString fname;
     TQTextCodec *fcodec;
     int markeditem;
-    KConfig& partConfig;
+    TDEConfig& partConfig;
     
     TQString    m_contentMergedVersion;
 };
diff --git a/cervisia/resolvedlg_p.cpp b/cervisia/resolvedlg_p.cpp
index b353c9f4..94f06ff4 100644
--- a/cervisia/resolvedlg_p.cpp
+++ b/cervisia/resolvedlg_p.cpp
@@ -22,7 +22,7 @@ using namespace Cervisia;
 #include <ktextedit.h>
 
 
-ResolveEditorDialog::ResolveEditorDialog(KConfig& cfg, TQWidget *parent, const char *name)
+ResolveEditorDialog::ResolveEditorDialog(TDEConfig& cfg, TQWidget *parent, const char *name)
     : KDialogBase(parent, name, true, TQString(),
                   Ok | Cancel, Ok, true)
     , m_partConfig(cfg)
diff --git a/cervisia/resolvedlg_p.h b/cervisia/resolvedlg_p.h
index 680da0a6..ad2ad907 100644
--- a/cervisia/resolvedlg_p.h
+++ b/cervisia/resolvedlg_p.h
@@ -23,7 +23,7 @@
 
 class KTextEdit;
 class TQStringList;
-class KConfig;
+class TDEConfig;
 
 
 namespace Cervisia
@@ -33,7 +33,7 @@ namespace Cervisia
 class ResolveEditorDialog : public KDialogBase
 {
 public:
-    explicit ResolveEditorDialog(KConfig& cfg, TQWidget* parent=0, const char* name=0);
+    explicit ResolveEditorDialog(TDEConfig& cfg, TQWidget* parent=0, const char* name=0);
     virtual ~ResolveEditorDialog();
 
     void setContent(const TQString& text);
@@ -41,7 +41,7 @@ public:
 
 private:   
     KTextEdit* m_edit;
-    KConfig&   m_partConfig;
+    TDEConfig&   m_partConfig;
 };  
 
 
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index b5923964..6e677e95 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -77,7 +77,7 @@ void FontButton::chooseFont()
 }
 
 
-SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *name )
+SettingsDialog::SettingsDialog( TDEConfig *conf, TQWidget *parent, const char *name )
     : KDialogBase(KDialogBase::IconList, i18n("Configure Cervisia"),
       KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help,
       KDialogBase::Ok,
@@ -86,7 +86,7 @@ SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *nam
     config = conf;
 
     // open cvs DCOP service configuration file
-    serviceConfig = new KConfig("cvsservicerc");
+    serviceConfig = new TDEConfig("cvsservicerc");
 
     //
     // General Options
diff --git a/cervisia/settingsdlg.h b/cervisia/settingsdlg.h
index 9b4aecfc..8c1de6f3 100644
--- a/cervisia/settingsdlg.h
+++ b/cervisia/settingsdlg.h
@@ -29,7 +29,7 @@
 class TQCheckBox;
 class KIntNumInput;
 class KLineEdit;
-class KConfig;
+class TDEConfig;
 class KColorButton;
 class KURLRequester;
 class AdvancedPage;
@@ -54,7 +54,7 @@ class SettingsDialog : public KDialogBase
   
 
 public:
-    SettingsDialog( KConfig *conf, TQWidget *parent=0, const char *name=0 );
+    SettingsDialog( TDEConfig *conf, TQWidget *parent=0, const char *name=0 );
     virtual ~SettingsDialog();
 
 protected slots:
@@ -70,7 +70,7 @@ private:
     void addAdvancedPage();
     void addLookAndFeelPage();
 
-    KConfig *config;
+    TDEConfig *config;
     KIntNumInput *contextedit;
     KIntNumInput *tabwidthedit;
     KURLRequester *cvspathedit;
@@ -95,7 +95,7 @@ private:
     TQCheckBox*    m_splitterBox;
     AdvancedPage* m_advancedPage;
 
-    KConfig* serviceConfig;
+    TDEConfig* serviceConfig;
 };
 
 #endif
diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp
index 52e44b2e..c05c1c3f 100644
--- a/cervisia/updateview.cpp
+++ b/cervisia/updateview.cpp
@@ -38,7 +38,7 @@ using Cervisia::Entry;
 using Cervisia::EntryStatus;
 
 
-UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name)
+UpdateView::UpdateView(TDEConfig& partConfig, TQWidget *parent, const char *name)
     : KListView(parent, name),
       m_partConfig(partConfig),
       m_unfoldingTree(false)
@@ -531,7 +531,7 @@ void UpdateView::syncSelection()
  */
 void UpdateView::updateColors()
 {
-    KConfigGroupSaver cs(&m_partConfig, "Colors");
+    TDEConfigGroupSaver cs(&m_partConfig, "Colors");
     m_partConfig.setGroup("Colors");
 
     TQColor defaultColor = TQColor(255, 130, 130);
diff --git a/cervisia/updateview.h b/cervisia/updateview.h
index 0b140f43..07894253 100644
--- a/cervisia/updateview.h
+++ b/cervisia/updateview.h
@@ -29,7 +29,7 @@
 #include "entry.h"
 
 
-class KConfig;
+class TDEConfig;
 
 
 class UpdateView : public KListView
@@ -43,7 +43,7 @@ public:
                   NoRemoved=4, NoNotInCVS=8 , NoEmptyDirectories = 16 };
     enum Action { Add, Remove, Update, UpdateNoAct, Commit };
     
-    explicit UpdateView(KConfig& partConfig, TQWidget *parent=0, const char *name=0);
+    explicit UpdateView(TDEConfig& partConfig, TQWidget *parent=0, const char *name=0);
 
     virtual ~UpdateView();
 
@@ -93,7 +93,7 @@ private:
 
     void updateColors();
 
-    KConfig& m_partConfig;
+    TDEConfig& m_partConfig;
 
     Filter filt;
     Action act;
diff --git a/cervisia/watchersdlg.cpp b/cervisia/watchersdlg.cpp
index d8427f82..fec97848 100644
--- a/cervisia/watchersdlg.cpp
+++ b/cervisia/watchersdlg.cpp
@@ -30,7 +30,7 @@
 #include "progressdlg.h"
 
 
-WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* parent, const char* name)
+WatchersDialog::WatchersDialog(TDEConfig& cfg, TQWidget* parent, const char* name)
     : KDialogBase(parent, name, false, TQString(),
                   Close, ButtonCode(0), true)
     , partConfig(cfg)
diff --git a/cervisia/watchersdlg.h b/cervisia/watchersdlg.h
index fff50d88..e8f43d7a 100644
--- a/cervisia/watchersdlg.h
+++ b/cervisia/watchersdlg.h
@@ -24,14 +24,14 @@
 #include <kdialogbase.h>
 
 class TQTable;
-class KConfig;
+class TDEConfig;
 class CvsService_stub;
 
 
 class WatchersDialog : public KDialogBase
 {
 public:
-    explicit WatchersDialog(KConfig& cfg, TQWidget* parent = 0,
+    explicit WatchersDialog(TDEConfig& cfg, TQWidget* parent = 0,
                             const char* name = 0);
     virtual ~WatchersDialog();
 
@@ -39,7 +39,7 @@ public:
 
 private:
     TQTable*  table;
-    KConfig& partConfig;
+    TDEConfig& partConfig;
 };
 
 #endif
diff --git a/kapptemplate/ChangeLog b/kapptemplate/ChangeLog
index 8cb9b55a..e1cde76a 100644
--- a/kapptemplate/ChangeLog
+++ b/kapptemplate/ChangeLog
@@ -26,7 +26,7 @@ Jul-30-2001 - Kurt Granroth
 
 Jul-06-2001 - Kurt Granroth
   o Fixed 'configure toolbar' in part app template
-  o KIONetAccess is now (and has been for some time) KIO::NetAccess
+  o KIONetAccess is now (and has been for some time) TDEIO::NetAccess
 
 Jul-05-2001 - Kurt Granroth (v1.0.6)
   o KPartApp's part should be in it's own directory.  Did it ever work
diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp
index f7888c47..7f69e8e8 100644
--- a/kapptemplate/kapp/app.cpp
+++ b/kapptemplate/kapp/app.cpp
@@ -72,7 +72,7 @@ void ${APP_NAME}::load(const KURL& url)
 
     #if 0
     // download the contents
-    if (KIO::NetAccess::download(url, target))
+    if (TDEIO::NetAccess::download(url, target))
     {
         // set our caption
         setCaption(url.prettyURL());
@@ -81,7 +81,7 @@ void ${APP_NAME}::load(const KURL& url)
         loadFile(target);
 
         // and remove the temp file
-        KIO::NetAccess::removeTempFile(target);
+        TDEIO::NetAccess::removeTempFile(target);
     }
     #endif
 
@@ -107,7 +107,7 @@ void ${APP_NAME}::setupActions()
                                   actionCollection(), "custom_action");
 }
 
-void ${APP_NAME}::saveProperties(KConfig *config)
+void ${APP_NAME}::saveProperties(TDEConfig *config)
 {
     // the 'config' object points to the session managed
     // config file.  anything you write here will be available
@@ -122,7 +122,7 @@ void ${APP_NAME}::saveProperties(KConfig *config)
     }
 }
 
-void ${APP_NAME}::readProperties(KConfig *config)
+void ${APP_NAME}::readProperties(TDEConfig *config)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/kapptemplate/kapp/app.h b/kapptemplate/kapp/app.h
index 170b431e..7c80c0f2 100644
--- a/kapptemplate/kapp/app.h
+++ b/kapptemplate/kapp/app.h
@@ -55,14 +55,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    void saveProperties(KConfig *);
+    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
      */
-    void readProperties(KConfig *);
+    void readProperties(TDEConfig *);
 
 
 private slots:
diff --git a/kapptemplate/kpartapp/app.cpp b/kapptemplate/kpartapp/app.cpp
index d62e0883..77beb4fc 100644
--- a/kapptemplate/kpartapp/app.cpp
+++ b/kapptemplate/kpartapp/app.cpp
@@ -91,14 +91,14 @@ void ${APP_NAME}::setupActions()
     KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 }
 
-void ${APP_NAME}::saveProperties(KConfig* /*config*/)
+void ${APP_NAME}::saveProperties(TDEConfig* /*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  anything you write here will be available
     // later when this app is restored
 }
 
-void ${APP_NAME}::readProperties(KConfig* /*config*/)
+void ${APP_NAME}::readProperties(TDEConfig* /*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/kapptemplate/kpartapp/app.h b/kapptemplate/kpartapp/app.h
index 0310dd81..deb38136 100644
--- a/kapptemplate/kpartapp/app.h
+++ b/kapptemplate/kpartapp/app.h
@@ -43,14 +43,14 @@ protected:
      * This method is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    void saveProperties(KConfig *);
+    void saveProperties(TDEConfig *);
 
     /**
-     * This method is called when this app is restored.  The KConfig
+     * This method is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    void readProperties(KConfig *);
+    void readProperties(TDEConfig *);
 
 private slots:
     void fileNew();
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;
diff --git a/kbugbuster/backend/bugcommand.cpp b/kbugbuster/backend/bugcommand.cpp
index 25e08184..f8b55ac9 100644
--- a/kbugbuster/backend/bugcommand.cpp
+++ b/kbugbuster/backend/bugcommand.cpp
@@ -14,7 +14,7 @@ TQString BugCommand::details()
     return TQString();
 }
 
-BugCommand *BugCommand::load( KConfig *config, const TQString &type )
+BugCommand *BugCommand::load( TDEConfig *config, const TQString &type )
 {
     TQString bugNumber = config->group();
     // ### this sucks. we better let Bug implement proper persistance,
@@ -90,7 +90,7 @@ TQString BugCommandClose::details() const
     return m_message;
 }
 
-void BugCommandClose::save( KConfig *config )
+void BugCommandClose::save( TDEConfig *config )
 {
     config->writeEntry( "Close",m_message );
 }
@@ -107,7 +107,7 @@ TQString BugCommandCloseSilently::name()
     return i18n("Close Silently");
 }
 
-void BugCommandCloseSilently::save( KConfig *config )
+void BugCommandCloseSilently::save( TDEConfig *config )
 {
     config->writeEntry( "CloseSilently", true );
 }
@@ -124,7 +124,7 @@ TQString BugCommandReopen::name()
     return i18n("Reopen");
 }
 
-void BugCommandReopen::save( KConfig *config )
+void BugCommandReopen::save( TDEConfig *config )
 {
     config->writeEntry( "Reopen", true );
 }
@@ -146,7 +146,7 @@ TQString BugCommandRetitle::details() const
     return m_title;
 }
 
-void BugCommandRetitle::save( KConfig *config )
+void BugCommandRetitle::save( TDEConfig *config )
 {
     config->writeEntry( "Retitle", m_title );
 }
@@ -168,7 +168,7 @@ TQString BugCommandMerge::details() const
     return m_bugNumbers.join(", ");
 }
 
-void BugCommandMerge::save( KConfig *config )
+void BugCommandMerge::save( TDEConfig *config )
 {
     config->writeEntry( "Merge", m_bugNumbers );
 }
@@ -185,7 +185,7 @@ TQString BugCommandUnmerge::name()
     return i18n("Unmerge");
 }
 
-void BugCommandUnmerge::save( KConfig *config )
+void BugCommandUnmerge::save( TDEConfig *config )
 {
     config->writeEntry( "Unmerge", true );
 }
@@ -234,7 +234,7 @@ TQString BugCommandReply::details() const
     return m_message;
 }
 
-void BugCommandReply::save( KConfig *config )
+void BugCommandReply::save( TDEConfig *config )
 {
     config->writeEntry( "Reply", m_message );
 #if 0
@@ -264,7 +264,7 @@ TQString BugCommandReplyPrivate::details() const
     return m_message;
 }
 
-void BugCommandReplyPrivate::save( KConfig *config )
+void BugCommandReplyPrivate::save( TDEConfig *config )
 {
     TQStringList args;
     args << m_address;
@@ -289,7 +289,7 @@ TQString BugCommandSeverity::details() const
     return m_severity;
 }
 
-void BugCommandSeverity::save( KConfig *config )
+void BugCommandSeverity::save( TDEConfig *config )
 {
     config->writeEntry( "Severity", m_severity );
 }
@@ -311,7 +311,7 @@ TQString BugCommandReassign::details() const
     return m_package;
 }
 
-void BugCommandReassign::save( KConfig *config )
+void BugCommandReassign::save( TDEConfig *config )
 {
     config->writeEntry( "Reassign", m_package );
 }
diff --git a/kbugbuster/backend/bugcommand.h b/kbugbuster/backend/bugcommand.h
index 9f68fb2e..e293517c 100644
--- a/kbugbuster/backend/bugcommand.h
+++ b/kbugbuster/backend/bugcommand.h
@@ -7,7 +7,7 @@
 #include "bug.h"
 #include "package.h"
 
-class KConfig;
+class TDEConfig;
 
 class BugCommand {
   public:
@@ -31,8 +31,8 @@ class BugCommand {
 
     virtual TQString type() const { return TQString(); }
 
-    virtual void save( KConfig * ) = 0;
-    static BugCommand *load( KConfig *, const TQString &type );
+    virtual void save( TDEConfig * ) = 0;
+    static BugCommand *load( TDEConfig *, const TQString &type );
 
   protected:
     Bug m_bug;
@@ -53,7 +53,7 @@ class BugCommandClose : public BugCommand {
 
     TQString type() const { return TQString::fromLatin1("Close"); }
 
-    void save( KConfig * );
+    void save( TDEConfig * );
 
   private:
     TQString m_message;
@@ -70,7 +70,7 @@ class BugCommandCloseSilently : public BugCommand {
 
     TQString type() const { return TQString::fromLatin1("CloseSilently"); }
 
-    void save( KConfig * );
+    void save( TDEConfig * );
 };
 
 class BugCommandReopen : public BugCommand {
@@ -84,7 +84,7 @@ class BugCommandReopen : public BugCommand {
 
     TQString type() const { return TQString::fromLatin1("Reopen"); }
 
-    void save( KConfig * );
+    void save( TDEConfig * );
 };
 
 class BugCommandRetitle : public BugCommand {
@@ -99,7 +99,7 @@ class BugCommandRetitle : public BugCommand {
 
     TQString type() const { return TQString::fromLatin1("Retitle"); }
 
-    void save( KConfig * );
+    void save( TDEConfig * );
 
   private:
     TQString m_title;
@@ -117,7 +117,7 @@ class BugCommandMerge : public BugCommand {
 
     TQString type() const { return TQString::fromLatin1("Merge"); }
 
-    void save( KConfig * );
+    void save( TDEConfig * );
 
   private:
     TQStringList m_bugNumbers;
@@ -132,7 +132,7 @@ class BugCommandUnmerge : public BugCommand {
 
     TQString type() const { return TQString::fromLatin1("Unmerge"); }
 
-    void save( KConfig * );
+    void save( TDEConfig * );
 
     TQString controlString() const;
 };
@@ -150,7 +150,7 @@ class BugCommandReply : public BugCommand {
 
     TQString type() const { return TQString::fromLatin1("Reply"); }
 
-    void save( KConfig * );
+    void save( TDEConfig * );
 
   private:
     TQString m_message;
@@ -171,7 +171,7 @@ class BugCommandReplyPrivate : public BugCommand {
 
     TQString type() const { return TQString::fromLatin1("ReplyPrivate"); }
 
-    void save( KConfig * );
+    void save( TDEConfig * );
 
   private:
     TQString m_address;
@@ -190,7 +190,7 @@ class BugCommandSeverity : public BugCommand {
 
     TQString controlString() const;
 
-    void save( KConfig * );
+    void save( TDEConfig * );
 
   private:
     TQString m_severity;
@@ -208,7 +208,7 @@ class BugCommandReassign : public BugCommand {
 
     TQString controlString() const;
 
-    void save( KConfig * );
+    void save( TDEConfig * );
 
   private:
     TQString m_package;
diff --git a/kbugbuster/backend/bugjob.cpp b/kbugbuster/backend/bugjob.cpp
index 1d13913b..90828ceb 100644
--- a/kbugbuster/backend/bugjob.cpp
+++ b/kbugbuster/backend/bugjob.cpp
@@ -28,19 +28,19 @@ void BugJob::start( const KURL &url )
 
     // ### obey post, if necessary
 
-    KIO::Job *job = KIO::get( url, true /*always 'reload=true', we have our own cache*/, false );
-
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-             this, TQT_SLOT( ioResult( KIO::Job * ) ) );
-    connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
-             this, TQT_SLOT( ioData( KIO::Job *, const TQByteArray & ) ) );
-    connect( job, TQT_SIGNAL( infoMessage( KIO::Job *, const TQString & ) ),
-             this, TQT_SLOT( ioInfoMessage( KIO::Job *, const TQString & ) ) );
-    connect( job, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
-             this, TQT_SLOT( ioInfoPercent( KIO::Job *, unsigned long ) ) );
+    TDEIO::Job *job = TDEIO::get( url, true /*always 'reload=true', we have our own cache*/, false );
+
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQT_SLOT( ioResult( TDEIO::Job * ) ) );
+    connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             this, TQT_SLOT( ioData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ),
+             this, TQT_SLOT( ioInfoMessage( TDEIO::Job *, const TQString & ) ) );
+    connect( job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+             this, TQT_SLOT( ioInfoPercent( TDEIO::Job *, unsigned long ) ) );
 }
 
-void BugJob::ioResult( KIO::Job *job )
+void BugJob::ioResult( TDEIO::Job *job )
 {
     m_error = job->error();
     m_errorText = job->errorText();
@@ -71,7 +71,7 @@ void BugJob::ioResult( KIO::Job *job )
     delete this;
 }
 
-void BugJob::ioData( KIO::Job *, const TQByteArray &data )
+void BugJob::ioData( TDEIO::Job *, const TQByteArray &data )
 {
     unsigned int start = m_data.size();
 
@@ -79,13 +79,13 @@ void BugJob::ioData( KIO::Job *, const TQByteArray &data )
     memcpy( m_data.data() + start, data.data(), data.size() );
 }
 
-void BugJob::ioInfoMessage( KIO::Job *, const TQString &_text )
+void BugJob::ioInfoMessage( TDEIO::Job *, const TQString &_text )
 {
     TQString text = _text;
     emit infoMessage( text );
 }
 
-void BugJob::ioInfoPercent( KIO::Job *, unsigned long percent )
+void BugJob::ioInfoPercent( TDEIO::Job *, unsigned long percent )
 {
     emit infoPercent( percent );
 }
diff --git a/kbugbuster/backend/bugjob.h b/kbugbuster/backend/bugjob.h
index 68e57841..981283db 100644
--- a/kbugbuster/backend/bugjob.h
+++ b/kbugbuster/backend/bugjob.h
@@ -5,7 +5,7 @@
 
 #include "bugserver.h"
 
-class BugJob : public KIO::Job
+class BugJob : public TDEIO::Job
 {
     Q_OBJECT
   
@@ -27,13 +27,13 @@ class BugJob : public KIO::Job
     virtual void process( const TQByteArray &data ) = 0;
 
   private slots:
-    void ioResult( KIO::Job *job );
+    void ioResult( TDEIO::Job *job );
 
-    void ioData( KIO::Job *job, const TQByteArray &data );
+    void ioData( TDEIO::Job *job, const TQByteArray &data );
 
-    void ioInfoMessage( KIO::Job *job, const TQString &text );
+    void ioInfoMessage( TDEIO::Job *job, const TQString &text );
 
-    void ioInfoPercent( KIO::Job *job, unsigned long percent );
+    void ioInfoPercent( TDEIO::Job *job, unsigned long percent );
 
   private:
     TQByteArray m_data;
diff --git a/kbugbuster/backend/bugserver.cpp b/kbugbuster/backend/bugserver.cpp
index 1ad90567..7711212f 100644
--- a/kbugbuster/backend/bugserver.cpp
+++ b/kbugbuster/backend/bugserver.cpp
@@ -195,11 +195,11 @@ Bug::Severity BugServer::bugSeverity( const TQString &str )
   }
 }
 
-void BugServer::readConfig( KConfig * /*config*/ )
+void BugServer::readConfig( TDEConfig * /*config*/ )
 {
 }
 
-void BugServer::writeConfig( KConfig * /*config*/ )
+void BugServer::writeConfig( TDEConfig * /*config*/ )
 {
 }
 
diff --git a/kbugbuster/backend/bugserver.h b/kbugbuster/backend/bugserver.h
index c76b565a..6d6ffdc0 100644
--- a/kbugbuster/backend/bugserver.h
+++ b/kbugbuster/backend/bugserver.h
@@ -70,9 +70,9 @@ class BugServer
 
     Processor *processor() const;
 
-    void readConfig( KConfig * );
+    void readConfig( TDEConfig * );
     
-    void writeConfig( KConfig * );
+    void writeConfig( TDEConfig * );
 
     /**
       Queue a new command.
diff --git a/kbugbuster/backend/bugserverconfig.cpp b/kbugbuster/backend/bugserverconfig.cpp
index a09e6c29..203c60a9 100644
--- a/kbugbuster/backend/bugserverconfig.cpp
+++ b/kbugbuster/backend/bugserverconfig.cpp
@@ -111,7 +111,7 @@ TQStringList BugServerConfig::bugzillaVersions()
   return v;
 }
 
-void BugServerConfig::readConfig( KConfig *cfg, const TQString &name )
+void BugServerConfig::readConfig( TDEConfig *cfg, const TQString &name )
 {
   mName = name;
 
@@ -129,7 +129,7 @@ void BugServerConfig::readConfig( KConfig *cfg, const TQString &name )
   mCurrentBug = cfg->readEntry( "CurrentBug" );
 }
 
-void BugServerConfig::writeConfig( KConfig *cfg )
+void BugServerConfig::writeConfig( TDEConfig *cfg )
 {
   cfg->setGroup( "BugServer " + mName );
   
diff --git a/kbugbuster/backend/bugserverconfig.h b/kbugbuster/backend/bugserverconfig.h
index 39a34463..5a252573 100644
--- a/kbugbuster/backend/bugserverconfig.h
+++ b/kbugbuster/backend/bugserverconfig.h
@@ -29,7 +29,7 @@
 
 #include <kurl.h>
 
-class KConfig;
+class TDEConfig;
 
 class BugServerConfig
 {
@@ -50,8 +50,8 @@ class BugServerConfig
     void setPassword( const TQString &password );
     TQString password() const;
 
-    void readConfig( KConfig *, const TQString &name );
-    void writeConfig( KConfig * );
+    void readConfig( TDEConfig *, const TQString &name );
+    void writeConfig( TDEConfig * );
 
     static TQStringList bugzillaVersions();
 
diff --git a/kbugbuster/backend/bugsystem.cpp b/kbugbuster/backend/bugsystem.cpp
index c3dc0cdd..808a45f6 100644
--- a/kbugbuster/backend/bugsystem.cpp
+++ b/kbugbuster/backend/bugsystem.cpp
@@ -373,7 +373,7 @@ TQString BugSystem::lastResponse()
   return mLastResponse;
 }
 
-void BugSystem::readConfig( KConfig *config )
+void BugSystem::readConfig( TDEConfig *config )
 {
   config->setGroup("Servers");
   TQStringList servers = config->readListEntry( "Servers" );
@@ -394,7 +394,7 @@ void BugSystem::readConfig( KConfig *config )
   setServerList( serverList );
 }
 
-void BugSystem::writeConfig( KConfig *config )
+void BugSystem::writeConfig( TDEConfig *config )
 {
   TQValueList<BugServer *>::ConstIterator itServer;
   TQStringList servers;
diff --git a/kbugbuster/backend/bugsystem.h b/kbugbuster/backend/bugsystem.h
index 9a638675..7becf6b4 100644
--- a/kbugbuster/backend/bugsystem.h
+++ b/kbugbuster/backend/bugsystem.h
@@ -13,7 +13,7 @@
 #include <tqmap.h>
 #include <tqpair.h>
 
-class KConfig;
+class TDEConfig;
 
 class BugCommand;
 class BugServer;
@@ -80,8 +80,8 @@ class BugSystem : public TQObject
     static void saveResponse( const TQByteArray &d );
     static TQString lastResponse();
 
-    void readConfig( KConfig * );
-    void writeConfig( KConfig * );
+    void readConfig( TDEConfig * );
+    void writeConfig( TDEConfig * );
 
   signals:
     void packageListAvailable( const Package::List &pkgs );
diff --git a/kbugbuster/backend/kbbprefs.cpp b/kbugbuster/backend/kbbprefs.cpp
index f6f3a69c..0fa2d5af 100644
--- a/kbugbuster/backend/kbbprefs.cpp
+++ b/kbugbuster/backend/kbbprefs.cpp
@@ -37,7 +37,7 @@
 
 KBBPrefs *KBBPrefs::mInstance = 0;
 
-KBBPrefs::KBBPrefs() : KConfigSkeleton()
+KBBPrefs::KBBPrefs() : TDEConfigSkeleton()
 {
   setCurrentGroup("History");
 
diff --git a/kbugbuster/backend/kbbprefs.h b/kbugbuster/backend/kbbprefs.h
index 87dfacd8..e3e2718d 100644
--- a/kbugbuster/backend/kbbprefs.h
+++ b/kbugbuster/backend/kbbprefs.h
@@ -32,7 +32,7 @@
 
 class TQStringList;
 
-class KBBPrefs : public KConfigSkeleton
+class KBBPrefs : public TDEConfigSkeleton
 {
   public:
     virtual ~KBBPrefs();
diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp
index e88d20fb..05e6cc0f 100644
--- a/kbugbuster/gui/kbbmainwindow.cpp
+++ b/kbugbuster/gui/kbbmainwindow.cpp
@@ -360,7 +360,7 @@ void KBBMainWindow::slotListChanges()
 
 void KBBMainWindow::slotSetPercent( unsigned long percent )
 {
-    // KIO::Job::percent() shouldn't return an unsigned long. - Frerich
+    // TDEIO::Job::percent() shouldn't return an unsigned long. - Frerich
     m_progressBar->setProgress( percent );
 }
 
diff --git a/kbugbuster/gui/loadallbugsdlg.cpp b/kbugbuster/gui/loadallbugsdlg.cpp
index c53f8f81..3a5dd65d 100644
--- a/kbugbuster/gui/loadallbugsdlg.cpp
+++ b/kbugbuster/gui/loadallbugsdlg.cpp
@@ -23,7 +23,7 @@
 LoadAllBugsDlg::LoadAllBugsDlg(  const Package& pkg, const TQString &component )
     : TQDialog( 0L, "progressdlg", TRUE )
 {
-    m_bugLoadingProgress = new KIO::DefaultProgress( this );
+    m_bugLoadingProgress = new TDEIO::DefaultProgress( this );
     connect( m_bugLoadingProgress, TQT_SIGNAL( stopped() ),
              this, TQT_SLOT( slotStopped() ) );
     setCaption( i18n( "Loading All Bugs for Product %1" ).arg( pkg.name() ) );
diff --git a/kbugbuster/gui/loadallbugsdlg.h b/kbugbuster/gui/loadallbugsdlg.h
index 09b20bde..0c55715f 100644
--- a/kbugbuster/gui/loadallbugsdlg.h
+++ b/kbugbuster/gui/loadallbugsdlg.h
@@ -20,7 +20,7 @@
 class Package;
 class BugDetails;
 
-namespace KIO { class DefaultProgress; }
+namespace TDEIO { class DefaultProgress; }
 
 class LoadAllBugsDlg : public TQDialog
 {
@@ -38,7 +38,7 @@ private:
     Bug::List m_bugs;
     unsigned int m_processed;
     unsigned int m_count;
-    KIO::DefaultProgress* m_bugLoadingProgress;
+    TDEIO::DefaultProgress* m_bugLoadingProgress;
 };
 
 #endif
diff --git a/kbugbuster/kresources/kcalresource.cpp b/kbugbuster/kresources/kcalresource.cpp
index bbd7ab27..bdad0381 100644
--- a/kbugbuster/kresources/kcalresource.cpp
+++ b/kbugbuster/kresources/kcalresource.cpp
@@ -54,13 +54,13 @@
 
 #include "kcalresource.h"
 
-KCalResource::KCalResource( const KConfig* config )
+KCalResource::KCalResource( const TDEConfig* config )
   : ResourceCached( config ), mLock( 0 )
 {
   mPrefs = new KBB::ResourcePrefs;
 
-  KConfigSkeletonItem::List items = mPrefs->items();
-  KConfigSkeletonItem::List::Iterator it;
+  TDEConfigSkeletonItem::List items = mPrefs->items();
+  TDEConfigSkeletonItem::List::Iterator it;
   for( it = items.begin(); it != items.end(); ++it ) {
     (*it)->setGroup( identifier() );
   }
@@ -93,7 +93,7 @@ void KCalResource::init()
 
   mLock = new KABC::LockNull( true );
 
-  KConfig config( "kbugbusterrc" );
+  TDEConfig config( "kbugbusterrc" );
 
   BugSystem::self()->readConfig( &config );
 }
@@ -103,12 +103,12 @@ KBB::ResourcePrefs *KCalResource::prefs()
   return mPrefs;
 }
 
-void KCalResource::readConfig( const KConfig * )
+void KCalResource::readConfig( const TDEConfig * )
 {
   mPrefs->readConfig();
 }
 
-void KCalResource::writeConfig( KConfig *config )
+void KCalResource::writeConfig( TDEConfig *config )
 {
   kdDebug() << "KCalResource::writeConfig()" << endl;
 
@@ -225,7 +225,7 @@ void KCalResource::slotBugListAvailable( const Package &, const TQString &,
   emit resourceChanged( this );
 }
 
-void KCalResource::slotLoadJobResult( KIO::Job *job )
+void KCalResource::slotLoadJobResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0 );
@@ -267,9 +267,9 @@ bool KCalResource::doSave()
 
   mCalendar.save( cacheFile() );
 
-  mUploadJob = KIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true );
-  connect( mUploadJob, TQT_SIGNAL( result( KIO::Job * ) ),
-           TQT_SLOT( slotSaveJobResult( KIO::Job * ) ) );
+  mUploadJob = TDEIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true );
+  connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
+           TQT_SLOT( slotSaveJobResult( TDEIO::Job * ) ) );
 
   return true;
 }
@@ -279,7 +279,7 @@ bool KCalResource::isSaving()
   return mUploadJob;
 }
 
-void KCalResource::slotSaveJobResult( KIO::Job *job )
+void KCalResource::slotSaveJobResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
     job->showErrorDialog( 0 );
diff --git a/kbugbuster/kresources/kcalresource.h b/kbugbuster/kresources/kcalresource.h
index d96fc1e4..cfa4e2a6 100644
--- a/kbugbuster/kresources/kcalresource.h
+++ b/kbugbuster/kresources/kcalresource.h
@@ -36,7 +36,7 @@
 
 #include <bugsystem.h>
 
-namespace KIO {
+namespace TDEIO {
 class FileCopyJob;
 class Job;
 }
@@ -64,13 +64,13 @@ class KCalResource : public KCal::ResourceCached
     enum { ReloadNever, ReloadOnStartup, ReloadOnceADay, ReloadAlways };
   
     /**
-      Create resource from configuration information stored in KConfig object.
+      Create resource from configuration information stored in TDEConfig object.
     */
-    KCalResource( const KConfig * );
+    KCalResource( const TDEConfig * );
     ~KCalResource();
 
-    void readConfig( const KConfig *config );
-    void writeConfig( KConfig *config );
+    void readConfig( const TDEConfig *config );
+    void writeConfig( TDEConfig *config );
 
     KBB::ResourcePrefs *prefs();
 
@@ -89,8 +89,8 @@ class KCalResource : public KCal::ResourceCached
     void slotBugListAvailable( const Package &, const TQString &,
                                const Bug::List &bugs );
 
-    void slotLoadJobResult( KIO::Job * );
-    void slotSaveJobResult( KIO::Job * );
+    void slotLoadJobResult( TDEIO::Job * );
+    void slotSaveJobResult( TDEIO::Job * );
 
   protected:
     bool doOpen();
@@ -112,8 +112,8 @@ class KCalResource : public KCal::ResourceCached
 
     bool mOpen;
 
-    KIO::FileCopyJob *mDownloadJob;
-    KIO::FileCopyJob *mUploadJob;
+    TDEIO::FileCopyJob *mDownloadJob;
+    TDEIO::FileCopyJob *mUploadJob;
     
     KABC::Lock *mLock;
 
diff --git a/kioslave/svn/ksvnd/ksvnd.h b/kioslave/svn/ksvnd/ksvnd.h
index adea9b68..90612937 100644
--- a/kioslave/svn/ksvnd/ksvnd.h
+++ b/kioslave/svn/ksvnd/ksvnd.h
@@ -39,7 +39,7 @@ public:
   ~KSvnd();
 
 k_dcop:
-//  void addAuthInfo(KIO::AuthInfo, long);
+//  void addAuthInfo(TDEIO::AuthInfo, long);
   TQString commitDialog(TQString);
   bool anyNotValidWorkingCopy( const KURL::List& wclist );
   bool anyValidWorkingCopy( const KURL::List& wclist );
diff --git a/kioslave/svn/svn.cpp b/kioslave/svn/svn.cpp
index cfb4b243..becef81e 100644
--- a/kioslave/svn/svn.cpp
+++ b/kioslave/svn/svn.cpp
@@ -53,7 +53,7 @@
 #include "svn.h"
 #include <apr_portable.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 typedef struct
 {
@@ -125,14 +125,14 @@ kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString &
 		svn_error_t *err = svn_client_create_context(&ctx, pool);
                 if ( err ) {
                         kdDebug(7128) << "kio_svnProtocol::kio_svnProtocol() create_context ERROR" << endl;
-                        error( KIO::ERR_SLAVE_DEFINED, err->message );
+                        error( TDEIO::ERR_SLAVE_DEFINED, err->message );
                         return;
                 }
 
 		err = svn_config_ensure (NULL,pool);
 		if ( err ) {
 			kdDebug(7128) << "kio_svnProtocol::kio_svnProtocol() configensure ERROR" << endl;
-			error( KIO::ERR_SLAVE_DEFINED, err->message );
+			error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 			return;
 		}
 		svn_config_get_config (&ctx->config, NULL, pool);
@@ -272,7 +272,7 @@ void kio_svnProtocol::get(const KURL& url ){
 
 	svn_error_t *err = svn_client_cat (bt->string_stream, svn_path_canonicalize( target.utf8(),subpool ),&rev,ctx, subpool);
 	if ( err ) {
-		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 		svn_pool_destroy( subpool );
 		return;
 	}
@@ -439,7 +439,7 @@ void kio_svnProtocol::listDir(const KURL& url){
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_ls (&dirents, svn_path_canonicalize( target.utf8(), subpool ), &rev, false, ctx, subpool);
 	if ( err ) {
-		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 		svn_pool_destroy( subpool );
 		return;
 	}
@@ -490,23 +490,23 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString&
 	kdDebug(7128) << "MTime : " << ( long )mtime << endl;
 	kdDebug(7128) << "UDS filename : " << filename << endl;
 	UDSAtom atom;
-	atom.m_uds = KIO::UDS_NAME;
+	atom.m_uds = TDEIO::UDS_NAME;
 	atom.m_str = filename;
 	entry.append( atom );
 
-	atom.m_uds = KIO::UDS_FILE_TYPE;
+	atom.m_uds = TDEIO::UDS_FILE_TYPE;
 	atom.m_long = isdir ? S_IFDIR : S_IFREG;
 	entry.append( atom );
 
-	atom.m_uds = KIO::UDS_SIZE;
+	atom.m_uds = TDEIO::UDS_SIZE;
 	atom.m_long = size;
 	entry.append( atom );
 	
-	atom.m_uds = KIO::UDS_MODIFICATION_TIME;
+	atom.m_uds = TDEIO::UDS_MODIFICATION_TIME;
 	atom.m_long = mtime;
 	entry.append( atom );
 	
-	atom.m_uds = KIO::UDS_USER;
+	atom.m_uds = TDEIO::UDS_USER;
 	atom.m_str = user;
 	entry.append( atom );
 
@@ -552,7 +552,7 @@ void kio_svnProtocol::copy(const KURL & src, const KURL& dest, int /*permissions
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_copy(&commit_info, srcsvn.utf8(), &rev, destsvn.utf8(), ctx, subpool);
 	if ( err ) {
-		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 	}
 	
 	finished();
@@ -580,7 +580,7 @@ void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) {
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_mkdir(&commit_info,targets,ctx,subpool);
 	if ( err ) {
-		error( KIO::ERR_COULD_NOT_MKDIR, err->message );
+		error( TDEIO::ERR_COULD_NOT_MKDIR, err->message );
 	}
 	
 	finished();
@@ -603,7 +603,7 @@ void kio_svnProtocol::mkdir( const KURL& url, int /*permissions*/ ) {
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_mkdir(&commit_info,targets,ctx,subpool);
 	if ( err ) {
-		error( KIO::ERR_COULD_NOT_MKDIR, err->message );
+		error( TDEIO::ERR_COULD_NOT_MKDIR, err->message );
 	}
 	
 	finished();
@@ -626,7 +626,7 @@ void kio_svnProtocol::del( const KURL& url, bool /*isfile*/ ) {
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_delete(&commit_info,targets,false/*force remove locally modified files in wc*/,ctx,subpool);
 	if ( err ) {
-		error( KIO::ERR_CANNOT_DELETE, err->message );
+		error( TDEIO::ERR_CANNOT_DELETE, err->message );
 	}
 	
 	finished();
@@ -672,7 +672,7 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_move(&commit_info, srcsvn.utf8(), &rev, destsvn.utf8(), false/*force remove locally modified files in wc*/, ctx, subpool);
 	if ( err ) {
-		error( KIO::ERR_CANNOT_RENAME, err->message );
+		error( TDEIO::ERR_CANNOT_RENAME, err->message );
 	}
 	
 	finished();
@@ -935,7 +935,7 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_diff (options, path1, &revision1, path2, &revision2, recurse, false, true, outfile, NULL, ctx, subpool);
 	if ( err )
-		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 	//read the content of the outfile now
 	TQStringList tmp;
 	apr_file_close(outfile);
@@ -981,7 +981,7 @@ void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumb
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_switch (NULL/*result revision*/, path, url, &rev, recurse, ctx, subpool);
 	if ( err )
-		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 
 	finished();
 	svn_pool_destroy (subpool);
@@ -1001,7 +1001,7 @@ void kio_svnProtocol::update( const KURL& wc, int revnumber, const TQString& rev
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_update (NULL, svn_path_canonicalize( target.utf8(), subpool ), &rev, true, ctx, subpool);
 	if ( err ) 
-		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 
 	finished();
 	svn_pool_destroy (subpool);
@@ -1029,7 +1029,7 @@ void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) {
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_import(&commit_info,path,url,nonrecursive,ctx,subpool);
 	if ( err )
-		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 	
 	finished();
 	svn_pool_destroy (subpool);
@@ -1053,7 +1053,7 @@ void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber
 	initNotifier(true, false, false, subpool);
 	svn_error_t *err = svn_client_checkout (NULL/* rev actually checkedout */, svn_path_canonicalize( target.utf8(), subpool ), svn_path_canonicalize ( dpath.utf8(), subpool ), &rev, true, ctx, subpool);
 	if ( err )
-		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 
 	finished();
 	svn_pool_destroy (subpool);
@@ -1078,7 +1078,7 @@ void kio_svnProtocol::commit(const KURL::List& wc) {
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_commit(&commit_info,targets,nonrecursive,ctx,subpool);
 	if ( err )
-		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 
 	if ( commit_info ) {
 		for ( TQValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) {
@@ -1118,7 +1118,7 @@ void kio_svnProtocol::add(const KURL& wc) {
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_add(svn_path_canonicalize( nurl.path().utf8(), subpool ),nonrecursive,ctx,subpool);
 	if ( err )
-		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 	
 	finished();
 	svn_pool_destroy (subpool);
@@ -1144,7 +1144,7 @@ void kio_svnProtocol::wc_delete(const KURL::List& wc) {
 	svn_error_t *err = svn_client_delete(&commit_info,targets,nonrecursive,ctx,subpool);
 
 	if ( err )
-		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 	
 	finished();
 	svn_pool_destroy (subpool);
@@ -1168,7 +1168,7 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) {
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_revert(targets,nonrecursive,ctx,subpool);
 	if ( err )
-		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 	
 	finished();
 	svn_pool_destroy (subpool);
@@ -1192,7 +1192,7 @@ void kio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecurs
 	svn_error_t *err = svn_client_status(&result_rev, svn_path_canonicalize( nurl.path().utf8(), subpool ), &rev, kio_svnProtocol::status, this, fullRecurse, getAll, checkRepos, no_ignore, ctx, subpool);
 
 	if ( err )
-		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 	
 	finished();
 	svn_pool_destroy (subpool);
@@ -1565,7 +1565,7 @@ void kio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) {
 	initNotifier(false, false, false, subpool);
 	svn_error_t *err = svn_client_resolved(svn_path_canonicalize( nurl.path().utf8(), subpool ), recurse,ctx,subpool);
 	if ( err )
-		error( KIO::ERR_SLAVE_DEFINED, err->message );
+		error( TDEIO::ERR_SLAVE_DEFINED, err->message );
 	
 	finished();
 	svn_pool_destroy (subpool);
diff --git a/kioslave/svn/svn.h b/kioslave/svn/svn.h
index 91d4303b..d3156663 100644
--- a/kioslave/svn/svn.h
+++ b/kioslave/svn/svn.h
@@ -64,7 +64,7 @@ typedef struct notify_baton {
 } notify_baton;
 
 
-class kio_svnProtocol : public KIO::SlaveBase
+class kio_svnProtocol : public TDEIO::SlaveBase
 {
 	public:
 		kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket);
@@ -113,7 +113,7 @@ class kio_svnProtocol : public KIO::SlaveBase
 
 		KURL myURL;
 		svn_client_ctx_t *ctx;
-		KIO::AuthInfo info;
+		TDEIO::AuthInfo info;
 
 		enum SVN_METHOD { 
 			SVN_CHECKOUT=1, //KURL repository, KURL workingcopy, int revnumber=-1, TQString revkind(HEAD, ...) //revnumber==-1 => use of revkind
@@ -132,7 +132,7 @@ class kio_svnProtocol : public KIO::SlaveBase
 		};
 
 	private:
-		bool createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, KIO::UDSEntry& entry);
+		bool createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, TDEIO::UDSEntry& entry);
 		apr_pool_t *pool;
 		int m_counter;
 };
diff --git a/kioslave/svn/svnhelper/kio_svn_helper.cpp b/kioslave/svn/svnhelper/kio_svn_helper.cpp
index ec938c39..64b51d1a 100644
--- a/kioslave/svn/svnhelper/kio_svn_helper.cpp
+++ b/kioslave/svn/svnhelper/kio_svn_helper.cpp
@@ -66,9 +66,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 			int rev = -1;
 			kdDebug(7128) << "updating : " << (*it).prettyURL() << endl;
 			s << cmd << *it << rev << TQString( "HEAD" );
-			KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-			connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-			KIO::NetAccess::synchronousRun( job, 0 );
+			TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+			connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+			TDEIO::NetAccess::synchronousRun( job, 0 );
 		}
 	} else if (args->isSet("c")) {
 		kdDebug(7128) << "commit " << list << endl;
@@ -81,9 +81,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 			kdDebug(7128) << "commiting : " << (*it).prettyURL() << endl;
 			s << *it;
 		}
-		KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-		connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-		KIO::NetAccess::synchronousRun( job, 0 );
+		TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+		connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+		TDEIO::NetAccess::synchronousRun( job, 0 );
 	} else if (args->isSet("a")) {
 		kdDebug(7128) << "add " << list << endl;
 		KURL servURL = "svn+http://this_is_a_fake_URL_and_this_is_normal/";
@@ -93,9 +93,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 			int cmd = 6;
 			kdDebug(7128) << "adding : " << (*it).prettyURL() << endl;
 			s << cmd << *it;
-			KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-			connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-			KIO::NetAccess::synchronousRun( job, 0 );
+			TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+			connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+			TDEIO::NetAccess::synchronousRun( job, 0 );
 		}
 	} else if (args->isSet("D")) {
 		kdDebug(7128) << "diff " << list << endl;
@@ -110,9 +110,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 			TQString revkind1 = "BASE";
 			TQString revkind2 = "WORKING";
 			s << cmd << *it << *it << rev1 << revkind1 << rev2 << revkind2 << true ;
-			KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-			connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-			KIO::NetAccess::synchronousRun( job, 0 );
+			TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+			connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+			TDEIO::NetAccess::synchronousRun( job, 0 );
 			if ( diffresult.count() > 0 ) {
 				//check kompare is available
 				if ( !KStandardDirs::findExe( "kompare" ).isNull() ) {
@@ -151,9 +151,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 			kdDebug(7128) << "deleting : " << (*it).prettyURL() << endl;
 			s << *it;
 		}
-		KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-		connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-		KIO::NetAccess::synchronousRun( job, 0 );
+		TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+		connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+		TDEIO::NetAccess::synchronousRun( job, 0 );
 	} else if (args->isSet("s")) {
 		kdDebug(7128) << "switch " << list << endl;
 		SubversionSwitch d;
@@ -178,9 +178,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 				s << recurse;
 				s << revnumber;
 				s << revkind;
-				KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-				connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-				KIO::NetAccess::synchronousRun( job, 0 );
+				TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+				connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+				TDEIO::NetAccess::synchronousRun( job, 0 );
 			}
 		}
 	} else if (args->isSet("r")) {
@@ -194,9 +194,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 			kdDebug(7128) << "reverting : " << (*it).prettyURL() << endl;
 			s << *it;
 		}
-		KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-		connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-		KIO::NetAccess::synchronousRun( job, 0 );
+		TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+		connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+		TDEIO::NetAccess::synchronousRun( job, 0 );
 	} else if (args->isSet("C")) {
 		kdDebug(7128) << "checkout " << list << endl;
 		SubversionCheckout d;
@@ -219,9 +219,9 @@ SvnHelper::SvnHelper():TDEApplication() {
 				s << rev;
 				s << revkind;
 				kdDebug(7128) << "checkouting : " << d.url->url() << " into " << (*it).prettyURL() << " at rev : " << rev << " or " << revkind << endl;
-				KIO::SimpleJob * job = KIO::special(servURL, parms, true);
-				connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-				KIO::NetAccess::synchronousRun( job, 0 );
+				TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+				connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+				TDEIO::NetAccess::synchronousRun( job, 0 );
 			}
 		}
 	} else {
@@ -230,11 +230,11 @@ SvnHelper::SvnHelper():TDEApplication() {
 	TQTimer::singleShot( 0, this, TQT_SLOT( finished() ) );
 }
 
-void SvnHelper::slotResult( KIO::Job* job ) {
+void SvnHelper::slotResult( TDEIO::Job* job ) {
 	if ( job->error() )
 		job->showErrorDialog( );
 
-	KIO::MetaData ma = job->metaData();
+	TDEIO::MetaData ma = job->metaData();
 	TQValueList<TQString> keys = ma.keys();
 	qHeapSort( keys );
 	TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it;
diff --git a/kioslave/svn/svnhelper/kio_svn_helper.h b/kioslave/svn/svnhelper/kio_svn_helper.h
index 4ee9239b..b10dcaaf 100644
--- a/kioslave/svn/svnhelper/kio_svn_helper.h
+++ b/kioslave/svn/svnhelper/kio_svn_helper.h
@@ -33,7 +33,7 @@ public:
 	SvnHelper();
 private slots:
 	void finished();
-	void slotResult( KIO::Job *);
+	void slotResult( TDEIO::Job *);
 private:
 	WId m_id;
 	TQStringList diffresult; //for diff commands ;)
diff --git a/kompare/ChangeLog b/kompare/ChangeLog
index 3ff4c222..d7f82d98 100644
--- a/kompare/ChangeLog
+++ b/kompare/ChangeLog
@@ -63,7 +63,7 @@ Nov    20, 2003 : Otto Bruggeman
 	* When swapping source with destination also change the windows caption and the statusbar text
 	* Make sure that when swapping and when there are changes, all changes that were made can be 
 	  saved, discarded or cancel the whole swap (strings are recycled from the queryClose method)
-	* Give a better parent to the KIO::NetAccess::download in komparemodellist.cpp
+	* Give a better parent to the TDEIO::NetAccess::download in komparemodellist.cpp
 	* Added some FIXME's for after the branching to make the urls appear in bold in the error message
 	* Make queryClose not use the isModified from the part but from the modellist
 
diff --git a/kompare/interfaces/kompareinterface.h b/kompare/interfaces/kompareinterface.h
index 37fabe9f..06ab7a77 100644
--- a/kompare/interfaces/kompareinterface.h
+++ b/kompare/interfaces/kompareinterface.h
@@ -8,7 +8,7 @@
 #include <tqstringlist.h>
 #include <kdemacros.h>
 
-class KConfig;
+class TDEConfig;
 class KURL;
 
 class KompareInterfacePrivate;
@@ -87,8 +87,8 @@ public:
 	 * Warning this should be in class Part in KDE 4.0, not here !
 	 * Around that time the methods will disappear here
 	 */
-	virtual int readProperties( KConfig* config ) = 0;
-	virtual int saveProperties( KConfig* config ) = 0;
+	virtual int readProperties( TDEConfig* config ) = 0;
+	virtual int saveProperties( TDEConfig* config ) = 0;
 
 	/**
 	 * Warning this should be in class ReadWritePart in KDE 4.0, not here !
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index a1c70d90..94e9747d 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -294,7 +294,7 @@ void KompareShell::setCaption( const TQString& caption )
 	KParts::DockMainWindow::setCaption( caption, m_viewPart->isModified() );
 }
 
-void KompareShell::saveProperties(KConfig* config)
+void KompareShell::saveProperties(TDEConfig* config)
 {
 	// The 'config' object points to the session managed
 	// config file.  Anything you write here will be available
@@ -314,7 +314,7 @@ void KompareShell::saveProperties(KConfig* config)
 	m_viewPart->saveProperties( config );
 }
 
-void KompareShell::readProperties(KConfig* config)
+void KompareShell::readProperties(TDEConfig* config)
 {
 	// The 'config' object points to the session managed
 	// config file. This function is automatically called whenever
diff --git a/kompare/kompare_shell.h b/kompare/kompare_shell.h
index 195c2248..6e51c0eb 100644
--- a/kompare/kompare_shell.h
+++ b/kompare/kompare_shell.h
@@ -99,14 +99,14 @@ protected:
 	* This method is called when it is time for the app to save its
 	* properties for session management purposes.
 	*/
-	void saveProperties(KConfig *);
+	void saveProperties(TDEConfig *);
 
 	/**
-	* This method is called when this app is restored.  The KConfig
+	* This method is called when this app is restored.  The TDEConfig
 	* object points to the session management config file that was saved
 	* with @ref saveProperties
 	*/
-	void readProperties(KConfig *);
+	void readProperties(TDEConfig *);
 
 private slots:
 	void slotSetStatusBarText( const TQString& text );
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index 0c565820..c9e1f19b 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -264,7 +264,7 @@ const TQString KomparePart::fetchURL( const KURL& url )
 	TQString tempFileName( "" );
 	if ( !url.isLocalFile() )
 	{
-		if ( ! KIO::NetAccess::download( url, tempFileName, widget() ) )
+		if ( ! TDEIO::NetAccess::download( url, tempFileName, widget() ) )
 		{
 			slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).arg( url.prettyURL() ) );
 			tempFileName = "";
@@ -288,9 +288,9 @@ void KomparePart::cleanUpTemporaryFiles()
 {
 	// i hope a local file will not be removed if it was not downloaded...
 	if ( !m_info.localSource.isEmpty() )
-		KIO::NetAccess::removeTempFile( m_info.localSource );
+		TDEIO::NetAccess::removeTempFile( m_info.localSource );
 	if ( !m_info.localDestination.isEmpty() )
-		KIO::NetAccess::removeTempFile( m_info.localDestination );
+		TDEIO::NetAccess::removeTempFile( m_info.localDestination );
 }
 
 void KomparePart::compare( const KURL& source, const KURL& destination )
@@ -433,7 +433,7 @@ void KomparePart::saveDiff()
 
 	if( dlg->exec() ) {
 		w->saveOptions();
-		KConfig* config = instance()->config();
+		TDEConfig* config = instance()->config();
 		saveProperties( config );
 		config->sync();
 
@@ -441,7 +441,7 @@ void KomparePart::saveDiff()
 		{
 			KURL url = KFileDialog::getSaveURL( m_info.destination.url(),
 			              i18n("*.diff *.dif *.patch|Patch Files"), widget(), i18n( "Save .diff" ) );
-			if ( KIO::NetAccess::exists( url, false, widget() ) )
+			if ( TDEIO::NetAccess::exists( url, false, widget() ) )
 			{
 				int result = KMessageBox::warningYesNoCancel( widget(), i18n("The file exists or is write-protected; do you want to overwrite it?"), i18n("File Exists"), i18n("Overwrite"), i18n("Do Not Overwrite") );
 				if ( result == KMessageBox::Cancel )
@@ -722,7 +722,7 @@ bool KomparePart::queryClose()
 	return true;
 }
 
-int KomparePart::readProperties( KConfig *config )
+int KomparePart::readProperties( TDEConfig *config )
 {
 	m_viewSettings->loadSettings( config );
 	m_diffSettings->loadSettings( config );
@@ -730,7 +730,7 @@ int KomparePart::readProperties( KConfig *config )
 	return 0;
 }
 
-int KomparePart::saveProperties( KConfig *config )
+int KomparePart::saveProperties( TDEConfig *config )
 {
 	m_viewSettings->saveSettings( config );
 	m_diffSettings->saveSettings( config );
diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h
index c2ed918e..721d7afc 100644
--- a/kompare/komparepart/kompare_part.h
+++ b/kompare/komparepart/kompare_part.h
@@ -76,8 +76,8 @@ public:
 	// Sessionmanagement stuff, added to the kompare iface
 	// because they are not in the Part class where they belong
 	// Should be added when bic changes are allowed again (kde 4.0)
-	virtual int readProperties( KConfig *config );
-	virtual int saveProperties( KConfig *config );
+	virtual int readProperties( TDEConfig *config );
+	virtual int saveProperties( TDEConfig *config );
 	// this one is called when the shell_app is about to close.
 	// we need it now to save the properties of the part when apps dont (can't)
 	// use the readProperties and saveProperties methods
diff --git a/kompare/kompareurldialog.cpp b/kompare/kompareurldialog.cpp
index d24abaf9..06f7e4bc 100644
--- a/kompare/kompareurldialog.cpp
+++ b/kompare/kompareurldialog.cpp
@@ -37,7 +37,7 @@ KompareURLDialog::KompareURLDialog( TQWidget *parent, const char *name )
 {
 	setIconListAllVisible(true);
 
-	KConfig* cfg = kapp->config();
+	TDEConfig* cfg = kapp->config();
 	TQVBox* filesBox = addVBoxPage( i18n( "Files" ), i18n( "Here you can enter the files you want to compare." ) );
 	m_filesPage = new FilesPage( filesBox );
 	m_filesSettings = new FilesSettings( this );
@@ -76,7 +76,7 @@ void KompareURLDialog::slotOk()
 {
 	m_filesPage->setURLsInComboBoxes();
 
-	KConfig* cfg = kapp->config();
+	TDEConfig* cfg = kapp->config();
 
 	m_filesPage->apply();
 	m_diffPage->apply();
diff --git a/kompare/kompareurldialog.h b/kompare/kompareurldialog.h
index 419c5102..641f8939 100644
--- a/kompare/kompareurldialog.h
+++ b/kompare/kompareurldialog.h
@@ -26,7 +26,7 @@
 class TQGroupBox;
 
 class KComboBox;
-class KConfig;
+class TDEConfig;
 class KFileDialog;
 class KURLComboBox;
 class KURLRequester;
diff --git a/kompare/libdialogpages/diffsettings.cpp b/kompare/libdialogpages/diffsettings.cpp
index 6c2186f5..26239d78 100644
--- a/kompare/libdialogpages/diffsettings.cpp
+++ b/kompare/libdialogpages/diffsettings.cpp
@@ -44,9 +44,9 @@ DiffSettings::~DiffSettings()
 {
 }
 
-void DiffSettings::loadSettings( KConfig* config )
+void DiffSettings::loadSettings( TDEConfig* config )
 {
-	KConfigGroup group( config, "Diff Options" );
+	TDEConfigGroup group( config, "Diff Options" );
 	m_diffProgram                    = group.readEntry    ( "DiffProgram", "" );
 	m_linesOfContext                 = group.readNumEntry ( "LinesOfContext", 3 );
 	m_largeFiles                     = group.readBoolEntry( "LargeFiles", true );
@@ -66,7 +66,7 @@ void DiffSettings::loadSettings( KConfig* config )
 
 	m_format = static_cast<Kompare::Format>( group.readNumEntry( "Format", Kompare::Unified ) );
 
-	KConfigGroup group2 ( config, "Exclude File Options" );
+	TDEConfigGroup group2 ( config, "Exclude File Options" );
 	m_excludeFilePattern             = group2.readBoolEntry( "Pattern", false );
 	m_excludeFilePatternList         = group2.readListEntry( "PatternList" );
 	m_excludeFilesFile               = group2.readBoolEntry( "File", false );
@@ -74,9 +74,9 @@ void DiffSettings::loadSettings( KConfig* config )
 	m_excludeFilesFileHistoryList    = group2.readListEntry( "FileHistoryList" );
 }
 
-void DiffSettings::saveSettings( KConfig* config )
+void DiffSettings::saveSettings( TDEConfig* config )
 {
-	KConfigGroup group( config, "Diff Options" );
+	TDEConfigGroup group( config, "Diff Options" );
 	group.writeEntry( "DiffProgram",                    m_diffProgram );
 	group.writeEntry( "LinesOfContext",                 m_linesOfContext );
 	group.writeEntry( "Format",                         m_format );
@@ -96,7 +96,7 @@ void DiffSettings::saveSettings( KConfig* config )
 	group.writeEntry( "NewFiles",                       m_newFiles );
 	group.setDirty( true );
 
-	KConfigGroup group2( config, "Exclude File Options" );
+	TDEConfigGroup group2( config, "Exclude File Options" );
 	group2.writeEntry( "Pattern",            m_excludeFilePattern );
 	group2.writeEntry( "PatternList",        m_excludeFilePatternList );
 	group2.writeEntry( "File",               m_excludeFilesFile );
diff --git a/kompare/libdialogpages/diffsettings.h b/kompare/libdialogpages/diffsettings.h
index 08a2728e..27abbe7c 100644
--- a/kompare/libdialogpages/diffsettings.h
+++ b/kompare/libdialogpages/diffsettings.h
@@ -35,8 +35,8 @@ public:
 	virtual ~DiffSettings();
 public:
 	// some virtual functions that will be overloaded from the base class
-	virtual void loadSettings( KConfig* config );
-	virtual void saveSettings( KConfig* config );
+	virtual void loadSettings( TDEConfig* config );
+	virtual void saveSettings( TDEConfig* config );
 
 public:
 	TQString m_diffProgram;
diff --git a/kompare/libdialogpages/filespage.h b/kompare/libdialogpages/filespage.h
index 4ec2490c..6b3b0928 100644
--- a/kompare/libdialogpages/filespage.h
+++ b/kompare/libdialogpages/filespage.h
@@ -26,7 +26,7 @@ class TQGroupBox;
 
 class TQComboBox;
 class KComboBox;
-class KConfig;
+class TDEConfig;
 class KFileDialog;
 class KURLComboBox;
 class KURLRequester;
diff --git a/kompare/libdialogpages/filessettings.cpp b/kompare/libdialogpages/filessettings.cpp
index 01b70076..966d5fcd 100644
--- a/kompare/libdialogpages/filessettings.cpp
+++ b/kompare/libdialogpages/filessettings.cpp
@@ -30,7 +30,7 @@ FilesSettings::~FilesSettings()
 {
 }
 
-void FilesSettings::loadSettings( KConfig* config )
+void FilesSettings::loadSettings( TDEConfig* config )
 {
 	config->setGroup( m_configGroupName );
 
@@ -41,7 +41,7 @@ void FilesSettings::loadSettings( KConfig* config )
 	m_encoding                 = config->readEntry    ( "Encoding", "default" );
 }
 
-void FilesSettings::saveSettings( KConfig* config )
+void FilesSettings::saveSettings( TDEConfig* config )
 {
 	config->setGroup( m_configGroupName );
 	config->writeEntry( "Recent Sources", m_recentSources );
diff --git a/kompare/libdialogpages/filessettings.h b/kompare/libdialogpages/filessettings.h
index 945b53c2..59517770 100644
--- a/kompare/libdialogpages/filessettings.h
+++ b/kompare/libdialogpages/filessettings.h
@@ -23,7 +23,7 @@
 
 #include "settingsbase.h"
 
-class KConfig;
+class TDEConfig;
 
 class FilesSettings : public SettingsBase
 {
@@ -35,8 +35,8 @@ public:
 
 public:
 	// some virtual functions that will be overloaded from the base class
-	virtual void loadSettings( KConfig* config );
-	virtual void saveSettings( KConfig* config );
+	virtual void loadSettings( TDEConfig* config );
+	virtual void saveSettings( TDEConfig* config );
 
 	void setGroup( const TQString& groupName );
 
diff --git a/kompare/libdialogpages/settingsbase.cpp b/kompare/libdialogpages/settingsbase.cpp
index 6e347719..9c184194 100644
--- a/kompare/libdialogpages/settingsbase.cpp
+++ b/kompare/libdialogpages/settingsbase.cpp
@@ -31,11 +31,11 @@ SettingsBase::~SettingsBase()
 
 }
 
-void SettingsBase::loadSettings( KConfig* /* config */ )
+void SettingsBase::loadSettings( TDEConfig* /* config */ )
 {
 }
 
-void SettingsBase::saveSettings( KConfig* /* config */ )
+void SettingsBase::saveSettings( TDEConfig* /* config */ )
 {
 }
 
diff --git a/kompare/libdialogpages/settingsbase.h b/kompare/libdialogpages/settingsbase.h
index 607a2dc2..41eed474 100644
--- a/kompare/libdialogpages/settingsbase.h
+++ b/kompare/libdialogpages/settingsbase.h
@@ -25,7 +25,7 @@
 #include "kompare.h"
 
 class TQWidget;
-class KConfig;
+class TDEConfig;
 
 class SettingsBase : public TQObject
 {
@@ -36,8 +36,8 @@ public:
 	~SettingsBase();
 
 public:
-	virtual void loadSettings( KConfig* config );
-	virtual void saveSettings( KConfig* config );
+	virtual void loadSettings( TDEConfig* config );
+	virtual void saveSettings( TDEConfig* config );
 };
 
 #endif
diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp
index 85420d53..8bbd8895 100644
--- a/kompare/libdialogpages/viewsettings.cpp
+++ b/kompare/libdialogpages/viewsettings.cpp
@@ -46,9 +46,9 @@ ViewSettings::~ViewSettings()
 {
 }
 
-void ViewSettings::loadSettings( KConfig* config )
+void ViewSettings::loadSettings( TDEConfig* config )
 {
-	KConfigGroup cfg( config, "View Options" );
+	TDEConfigGroup cfg( config, "View Options" );
 	m_removeColor         = cfg.readColorEntry( "RemoveColor",         &default_removeColor );
 	m_changeColor         = cfg.readColorEntry( "ChangeColor",         &default_changeColor );
 	m_addColor            = cfg.readColorEntry( "AddColor",            &default_addColor );
@@ -61,9 +61,9 @@ void ViewSettings::loadSettings( KConfig* config )
 	m_font                = cfg.readFontEntry ( "TextFont", &stdFixed );
 }
 
-void ViewSettings::saveSettings( KConfig* config )
+void ViewSettings::saveSettings( TDEConfig* config )
 {
-	KConfigGroup cfg( config, "View Options" );
+	TDEConfigGroup cfg( config, "View Options" );
 	cfg.writeEntry( "RemoveColor",         m_removeColor );
 	cfg.writeEntry( "ChangeColor",         m_changeColor );
 	cfg.writeEntry( "AddColor",            m_addColor );
diff --git a/kompare/libdialogpages/viewsettings.h b/kompare/libdialogpages/viewsettings.h
index 84fc3539..7443285e 100644
--- a/kompare/libdialogpages/viewsettings.h
+++ b/kompare/libdialogpages/viewsettings.h
@@ -40,8 +40,8 @@ public:
 	~ViewSettings();
 public:
 	// some virtual functions that will be overloaded from the base class
-	virtual void loadSettings( KConfig* config );
-	virtual void saveSettings( KConfig* config );
+	virtual void loadSettings( TDEConfig* config );
+	virtual void saveSettings( TDEConfig* config );
 	TQColor colorForDifferenceType( int type, bool selected = false, bool applied = false );
 
 public:
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index 4d76e07f..20d7e551 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -360,22 +360,22 @@ bool KompareModelList::saveDestination( DiffModel* model )
 		TQString destination = model->destinationPath() + model->destinationFile();
 		kdDebug(8101) << "Tempfilename   : " << temp->name() << endl;
 		kdDebug(8101) << "DestinationURL : " << destination << endl;
-		KIO::UDSEntry entry;
-		if ( !KIO::NetAccess::stat( KURL( destination ).path(), entry, (TQWidget*)parent() ) )
+		TDEIO::UDSEntry entry;
+		if ( !TDEIO::NetAccess::stat( KURL( destination ).path(), entry, (TQWidget*)parent() ) )
 		{
-			if ( !KIO::NetAccess::mkdir( KURL( destination ).path(), (TQWidget*)parent() ) )
+			if ( !TDEIO::NetAccess::mkdir( KURL( destination ).path(), (TQWidget*)parent() ) )
 			{
 				emit error( i18n( "<qt>Could not create destination directory <b>%1</b>.\nThe file has not been saved.</qt>" ) );
 				return false;
 			}
 		}
-		result = KIO::NetAccess::upload( temp->name(), KURL( destination ), (TQWidget*)parent() );
+		result = TDEIO::NetAccess::upload( temp->name(), KURL( destination ), (TQWidget*)parent() );
 	}
 	else
 	{
 		kdDebug(8101) << "Tempfilename   : " << temp->name() << endl;
 		kdDebug(8101) << "DestinationURL : " << m_destination << endl;
-		result = KIO::NetAccess::upload( temp->name(), KURL( m_destination ), (TQWidget*)parent() );
+		result = TDEIO::NetAccess::upload( temp->name(), KURL( m_destination ), (TQWidget*)parent() );
 	}
 
 	if ( !result )
@@ -613,7 +613,7 @@ void KompareModelList::slotWriteDiffOutput( bool success )
 			emit error( i18n( "Could not write to the temporary file." ) );
 		}
 
-		KIO::NetAccess::upload( m_diffTemp->name(), KURL( m_diffURL ), (TQWidget*)parent() );
+		TDEIO::NetAccess::upload( m_diffTemp->name(), KURL( m_diffURL ), (TQWidget*)parent() );
 
 		emit status( Kompare::FinishedWritingDiff );
 	}
diff --git a/kuiviewer/kuiviewer.cpp b/kuiviewer/kuiviewer.cpp
index f2ae01cb..99797f91 100644
--- a/kuiviewer/kuiviewer.cpp
+++ b/kuiviewer/kuiviewer.cpp
@@ -101,14 +101,14 @@ void KUIViewer::setupActions()
     KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
 }
 
-void KUIViewer::saveProperties(KConfig* /*config*/)
+void KUIViewer::saveProperties(TDEConfig* /*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  anything you write here will be available
     // later when this app is restored
 }
 
-void KUIViewer::readProperties(KConfig* /*config*/)
+void KUIViewer::readProperties(TDEConfig* /*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/kuiviewer/kuiviewer.h b/kuiviewer/kuiviewer.h
index 09e43358..7ac3ed9a 100644
--- a/kuiviewer/kuiviewer.h
+++ b/kuiviewer/kuiviewer.h
@@ -79,14 +79,14 @@ protected:
      * This method is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    void saveProperties(KConfig *);
+    void saveProperties(TDEConfig *);
 
     /**
-     * This method is called when this app is restored.  The KConfig
+     * This method is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    void readProperties(KConfig *);
+    void readProperties(TDEConfig *);
 
 private slots:
     void fileOpen();
diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp
index ef00120a..b14d2412 100644
--- a/kuiviewer/kuiviewer_part.cpp
+++ b/kuiviewer/kuiviewer_part.cpp
@@ -153,7 +153,7 @@ bool KUIViewerPart::openURL( const KURL& url)
 
     m_url = url;
     m_file = TQString();
-    if (KIO::NetAccess::download(url, m_file))
+    if (TDEIO::NetAccess::download(url, m_file))
 	return openFile();
     else
 	return false;
diff --git a/scripts/README b/scripts/README
index 6bbc0d80..fe31583f 100644
--- a/scripts/README
+++ b/scripts/README
@@ -51,8 +51,8 @@ kde-spellcheck.pl A script to check source code for misspelings and optionally
 
 === MODERNIZATION SCRIPTS
 
-rc2kcfgxt.pl	Reads an existing KConfig rc file and creates a best-guess
-		version of a KConfigXT XML file.
+rc2kcfgxt.pl	Reads an existing TDEConfig rc file and creates a best-guess
+		version of a TDEConfigXT XML file.
 
 kdelnk2desktop.py Converts old-style .kdelnk files to their modern .desktop
 		equivalents.
diff --git a/scripts/fixheaders b/scripts/fixheaders
index b5724785..b5a5e902 100644
--- a/scripts/fixheaders
+++ b/scripts/fixheaders
@@ -28,21 +28,21 @@ $lastdir = '.';
  '`QTextStream\' undeclared \(first use this function\)' => "qtextstream",
  '`QTextStream\' was not declared in this scope' => "qtextstream",
  'incomplete type `QSocketNotifier\'' => "qsocketnotifier",
- 'no matching function for call to `KConfig' => "kconfig",
- 'variable `class KConfig \S*\' has initializer but incomplete type' => "kconfig",
+ 'no matching function for call to `TDEConfig' => "kconfig",
+ 'variable `class TDEConfig \S*\' has initializer but incomplete type' => "kconfig",
  'implicit declaration of function `int kdDebug' => "kdebug",
  'implicit declaration of function `int kdWarning' => "kdebug",
  '`QFile\' undeclared \(first use this function' => "qfile",
  'variable `QFile \S*\' has initializer but incomplete type' => "qfile",
- 'type `KConfigBase\' is not a base type for type `KConfig' => "kconfig",
+ 'type `TDEConfigBase\' is not a base type for type `TDEConfig' => "kconfig",
  'invalid use of undefined type `class QAccel' => "qaccel",
  'invalid use of undefined type `class TDEAboutData' => "kaboutdata",
  'incomplete type `TDEAboutData\'' => "kaboutdata",
  'incomplete type `QGrid\'' => "qgrid",
  'invalid use of undefined type `class QGrid\'' => "qgrid",
- 'aggregate `class KConfig \S*\' has incomplete type' => "kconfig",
+ 'aggregate `class TDEConfig \S*\' has incomplete type' => "kconfig",
  '`stderr\' undeclared \(first use this function' => "stdio",
- 'invalid use of undefined type `class KConfig' => "kconfig",
+ 'invalid use of undefined type `class TDEConfig' => "kconfig",
  'implicit declaration of function `int f?printf' => "stdio",
  'no method `TDEGlobal::' => "kglobal",
  '`TDEGlobal\' undeclared \(first use this function\)' => "kglobal",
diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim
index a002e8fc..141434ef 100644
--- a/scripts/kde-devel-vim.vim
+++ b/scripts/kde-devel-vim.vim
@@ -234,7 +234,7 @@ function! MapIdentHeader( ident )
     " KDE stuff
     elseif a:ident == 'K\(Double\|Int\)\(NumInput\|SpinBox\)'
         return '<knuminput.h>'
-    elseif a:ident == 'KConfigGroup'
+    elseif a:ident == 'TDEConfigGroup'
         return '<kconfigbase.h>'
     elseif a:ident == 'KListViewItem'
         return '<klistview.h>'
diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el
index ef0c6bf9..5ebc5a4a 100644
--- a/scripts/kde-emacs/klaralv.el
+++ b/scripts/kde-emacs/klaralv.el
@@ -121,7 +121,7 @@
 
     ; KDE
     (kdebug.h kdDebug kdWarning kdError kdFatal kdBacktrace)
-    (kconfig.h KConfigGroup)
+    (kconfig.h TDEConfigGroup)
     (kiconloader.h BarIcon SmallIcon DesktopIcon KIcon)
     (kicondialog.h KIconCanvas KIconButton)
     (knuminput.h KDoubleNumInput KIntNumInput)
diff --git a/scripts/rc2kcfgxt.pl b/scripts/rc2kcfgxt.pl
index 4b015dee..ecd1ae27 100644
--- a/scripts/rc2kcfgxt.pl
+++ b/scripts/rc2kcfgxt.pl
@@ -8,7 +8,7 @@
 #
 # Usage: rc2kcfgtxt.pl < rcfile > xmlfile
 #
-# Reads an rcfile (say, kmailrc) and writes out an KConfigXT XML
+# Reads an rcfile (say, kmailrc) and writes out an TDEConfigXT XML
 # file that represents a reasonable guess for representing the
 # rc file. No guarantees about well-formedness of the XML are made.
 #
diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp
index 9db08a7b..12da360b 100644
--- a/tdecachegrind/tdecachegrind/callgraphview.cpp
+++ b/tdecachegrind/tdecachegrind/callgraphview.cpp
@@ -2685,10 +2685,10 @@ TQString CallGraphView::zoomPosString(ZoomPosition p)
     return TQString("TopLeft");
 }
 
-void CallGraphView::readViewConfig(KConfig* c, 
+void CallGraphView::readViewConfig(TDEConfig* c, 
 				   TQString prefix, TQString postfix, bool)
 {
-    KConfigGroup* g = configGroup(c, prefix, postfix);
+    TDEConfigGroup* g = configGroup(c, prefix, postfix);
 
     if (0) tqDebug("CallGraphView::readViewConfig");
 
@@ -2709,10 +2709,10 @@ void CallGraphView::readViewConfig(KConfig* c,
     delete g;
 }
 
-void CallGraphView::saveViewConfig(KConfig* c,
+void CallGraphView::saveViewConfig(TDEConfig* c,
 				   TQString prefix, TQString postfix, bool)
 {
-    KConfigGroup g(c, (prefix+postfix).ascii());
+    TDEConfigGroup g(c, (prefix+postfix).ascii());
 
     writeConfigEntry(&g, "MaxCaller", _maxCallerDepth, DEFAULT_MAXCALLER);
     writeConfigEntry(&g, "MaxCalling", _maxCallingDepth, DEFAULT_MAXCALLING);
diff --git a/tdecachegrind/tdecachegrind/callgraphview.h b/tdecachegrind/tdecachegrind/callgraphview.h
index bb78af3b..8f99a706 100644
--- a/tdecachegrind/tdecachegrind/callgraphview.h
+++ b/tdecachegrind/tdecachegrind/callgraphview.h
@@ -426,8 +426,8 @@ public:
                 TQWidget* parent=0, const char* name=0);
   ~CallGraphView();
 
-  void readViewConfig(KConfig*, TQString prefix, TQString postfix, bool);
-  void saveViewConfig(KConfig*, TQString prefix, TQString postfix, bool);
+  void readViewConfig(TDEConfig*, TQString prefix, TQString postfix, bool);
+  void saveViewConfig(TDEConfig*, TQString prefix, TQString postfix, bool);
 
   TQWidget* widget() { return this; }
   TQString whatsThis() const;
diff --git a/tdecachegrind/tdecachegrind/callmapview.cpp b/tdecachegrind/tdecachegrind/callmapview.cpp
index 5af303f9..0bc70c7c 100644
--- a/tdecachegrind/tdecachegrind/callmapview.cpp
+++ b/tdecachegrind/tdecachegrind/callmapview.cpp
@@ -948,10 +948,10 @@ TQColor CallMapCallerItem::backColor() const
   return w->groupColor(_c->caller());
 }
 
-void CallMapView::readViewConfig(KConfig* c,
+void CallMapView::readViewConfig(TDEConfig* c,
 				 TQString prefix, TQString postfix, bool)
 {
-    KConfigGroup* g = configGroup(c, prefix, postfix);
+    TDEConfigGroup* g = configGroup(c, prefix, postfix);
 
     setSplitMode(g->readEntry("SplitMode", DEFAULT_SPLITMODE));
 
@@ -975,10 +975,10 @@ void CallMapView::readViewConfig(KConfig* c,
     delete g;
 }
 
-void CallMapView::saveViewConfig(KConfig* c, 
+void CallMapView::saveViewConfig(TDEConfig* c, 
 				 TQString prefix, TQString postfix, bool)
 {
-    KConfigGroup g(c, (prefix+postfix).ascii());
+    TDEConfigGroup g(c, (prefix+postfix).ascii());
 
     writeConfigEntry(&g, "SplitMode", splitModeString(), DEFAULT_SPLITMODE);
     writeConfigEntry(&g, "DrawName", fieldVisible(0), DEFAULT_DRAWNAME);
diff --git a/tdecachegrind/tdecachegrind/callmapview.h b/tdecachegrind/tdecachegrind/callmapview.h
index 7518553e..d9ec69e3 100644
--- a/tdecachegrind/tdecachegrind/callmapview.h
+++ b/tdecachegrind/tdecachegrind/callmapview.h
@@ -41,8 +41,8 @@ public:
   TQString whatsThis() const;
   void setData(TraceData*);
 
-  void readViewConfig(KConfig*, TQString prefix, TQString postfix, bool);
-  void saveViewConfig(KConfig*, TQString prefix, TQString postfix, bool);
+  void readViewConfig(TDEConfig*, TQString prefix, TQString postfix, bool);
+  void saveViewConfig(TDEConfig*, TQString prefix, TQString postfix, bool);
 
   bool showCallers() const { return _showCallers; }
   TraceCost* totalCost();
diff --git a/tdecachegrind/tdecachegrind/configuration.cpp b/tdecachegrind/tdecachegrind/configuration.cpp
index 1455da45..b18440d2 100644
--- a/tdecachegrind/tdecachegrind/configuration.cpp
+++ b/tdecachegrind/tdecachegrind/configuration.cpp
@@ -130,12 +130,12 @@ Configuration* Configuration::config()
 }
 
 
-void Configuration::saveOptions(KConfig* kconfig)
+void Configuration::saveOptions(TDEConfig* kconfig)
 {
   Configuration* c = config();
 
   // color options
-  KConfigGroup colorConfig(kconfig, TQCString("CostColors"));
+  TDEConfigGroup colorConfig(kconfig, TQCString("CostColors"));
   TQDictIterator<ColorSetting> it( c->_colors );
   int count = 1;
   for( ; it.current(); ++it ) {
@@ -152,7 +152,7 @@ void Configuration::saveOptions(KConfig* kconfig)
   colorConfig.writeEntry( "Count", count-1);
 
   // source options
-  KConfigGroup sourceConfig(kconfig, TQCString("Source"));
+  TDEConfigGroup sourceConfig(kconfig, TQCString("Source"));
   sourceConfig.writeEntry("Dirs", c->_generalSourceDirs, ':');
   TQDictIterator<TQStringList> it2( c->_objectSourceDirs );
   count = 1;
@@ -166,7 +166,7 @@ void Configuration::saveOptions(KConfig* kconfig)
   sourceConfig.writeEntry( "Count", count-1);
 
   // general options
-  KConfigGroup generalConfig(kconfig, TQCString("General"));
+  TDEConfigGroup generalConfig(kconfig, TQCString("General"));
   generalConfig.writeEntry("ShowPercentage", c->_showPercentage);
   generalConfig.writeEntry("ShowExpanded", c->_showExpanded);
   generalConfig.writeEntry("ShowCycles", c->_showCycles);
@@ -179,7 +179,7 @@ void Configuration::saveOptions(KConfig* kconfig)
   generalConfig.writeEntry("Context", c->_context);
   generalConfig.writeEntry("NoCostInside", c->_noCostInside);
 
-  KConfigGroup ctConfig(kconfig, TQCString("CostTypes"));
+  TDEConfigGroup ctConfig(kconfig, TQCString("CostTypes"));
   int ctCount = TraceCostType::knownTypeCount();
   ctConfig.writeEntry( "Count", ctCount);
   for (int i=0; i<ctCount; i++) {
@@ -200,7 +200,7 @@ void Configuration::saveOptions(KConfig* kconfig)
 
 
 
-void Configuration::readOptions(KConfig* kconfig)
+void Configuration::readOptions(TDEConfig* kconfig)
 {
   int i, count;
   Configuration* c = config();
@@ -226,7 +226,7 @@ void Configuration::readOptions(KConfig* kconfig)
   c->color("CostType-Dr")->color = TQColor(40,40,180);
   c->color("CostType-Dw")->color = TQColor(80,80,120);
 
-  KConfigGroup colorConfig(kconfig, TQCString("CostColors"));
+  TDEConfigGroup colorConfig(kconfig, TQCString("CostColors"));
   count = colorConfig.readNumEntry("Count", 0);
   for (i=1;i<=count;i++) {
     TQString n = colorConfig.readEntry(TQString("Name%1").arg(i));
@@ -245,7 +245,7 @@ void Configuration::readOptions(KConfig* kconfig)
   }
 
   // source options
-  KConfigGroup sourceConfig(kconfig, TQCString("Source"));
+  TDEConfigGroup sourceConfig(kconfig, TQCString("Source"));
   TQStringList dirs;
   dirs = sourceConfig.readListEntry("Dirs", ':');
   if (dirs.count()>0) c->_generalSourceDirs = dirs;
@@ -263,7 +263,7 @@ void Configuration::readOptions(KConfig* kconfig)
 
 
   // general options
-  KConfigGroup generalConfig(kconfig, TQCString("General"));
+  TDEConfigGroup generalConfig(kconfig, TQCString("General"));
   c->_showPercentage = generalConfig.readBoolEntry("ShowPercentage", true);
   c->_showExpanded = generalConfig.readBoolEntry("ShowExpanded", false);
   c->_showCycles = generalConfig.readBoolEntry("ShowCycles", true);
@@ -279,7 +279,7 @@ void Configuration::readOptions(KConfig* kconfig)
   // known cost types
   if (TraceCostType::knownTypeCount()==0) {
 
-    KConfigGroup ctConfig(kconfig, TQCString("CostTypes"));
+    TDEConfigGroup ctConfig(kconfig, TQCString("CostTypes"));
     int ctCount = ctConfig.readNumEntry("Count", 0);
     if (ctCount>0) {
       for (int i=1;i<=ctCount;i++) {
diff --git a/tdecachegrind/tdecachegrind/configuration.h b/tdecachegrind/tdecachegrind/configuration.h
index 478f6176..b5f3bfbe 100644
--- a/tdecachegrind/tdecachegrind/configuration.h
+++ b/tdecachegrind/tdecachegrind/configuration.h
@@ -29,7 +29,7 @@
 
 #include "tracedata.h"
 
-class KConfig;
+class TDEConfig;
 
 class Configuration
 {
@@ -40,8 +40,8 @@ public:
 
   static Configuration* config();
 
-  static void saveOptions(KConfig*);
-  static void readOptions(KConfig*);
+  static void saveOptions(TDEConfig*);
+  static void readOptions(TDEConfig*);
 
   // color for visualisation of an object
   static TQColor functionColor(TraceItem::CostType gt, TraceFunction*);
diff --git a/tdecachegrind/tdecachegrind/instrview.cpp b/tdecachegrind/tdecachegrind/instrview.cpp
index ed3ad4de..5b819d6c 100644
--- a/tdecachegrind/tdecachegrind/instrview.cpp
+++ b/tdecachegrind/tdecachegrind/instrview.cpp
@@ -926,10 +926,10 @@ void InstrView::updateInstrItems()
     }
 }
 
-void InstrView::readViewConfig(KConfig* c, 
+void InstrView::readViewConfig(TDEConfig* c, 
 			       TQString prefix, TQString postfix, bool)
 {
-    KConfigGroup* g = configGroup(c, prefix, postfix);
+    TDEConfigGroup* g = configGroup(c, prefix, postfix);
 
     if (0) tqDebug("InstrView::readViewConfig");
 
@@ -938,10 +938,10 @@ void InstrView::readViewConfig(KConfig* c,
     delete g;
 }
 
-void InstrView::saveViewConfig(KConfig* c,
+void InstrView::saveViewConfig(TDEConfig* c,
 			       TQString prefix, TQString postfix, bool)
 {
-    KConfigGroup g(c, (prefix+postfix).ascii());
+    TDEConfigGroup g(c, (prefix+postfix).ascii());
 
     writeConfigEntry(&g, "ShowHexCode", _showHexCode, DEFAULT_SHOWHEXCODE);
 }
diff --git a/tdecachegrind/tdecachegrind/instrview.h b/tdecachegrind/tdecachegrind/instrview.h
index 882f4e99..f5e847ad 100644
--- a/tdecachegrind/tdecachegrind/instrview.h
+++ b/tdecachegrind/tdecachegrind/instrview.h
@@ -42,8 +42,8 @@ public:
   virtual TQWidget* widget() { return this; }
   TQString whatsThis() const;
 
-  void readViewConfig(KConfig*, TQString prefix, TQString postfix, bool);
-  void saveViewConfig(KConfig*, TQString prefix, TQString postfix, bool);
+  void readViewConfig(TDEConfig*, TQString prefix, TQString postfix, bool);
+  void saveViewConfig(TDEConfig*, TQString prefix, TQString postfix, bool);
 
 protected:
   int arrowLevels() { return _arrowLevels; }
diff --git a/tdecachegrind/tdecachegrind/multiview.cpp b/tdecachegrind/tdecachegrind/multiview.cpp
index 53307c5c..9bf384b0 100644
--- a/tdecachegrind/tdecachegrind/multiview.cpp
+++ b/tdecachegrind/tdecachegrind/multiview.cpp
@@ -165,7 +165,7 @@ void MultiView::doUpdate(int changeType)
 }
 
 
-void MultiView::readViewConfig(KConfig* c,
+void MultiView::readViewConfig(TDEConfig* c,
 			       TQString prefix, TQString postfix,
 			       bool withOptions)
 {
@@ -173,7 +173,7 @@ void MultiView::readViewConfig(KConfig* c,
 		prefix.ascii(), postfix.ascii());
 
   TQString active;
-  KConfigGroup* g = configGroup(c, prefix, postfix);
+  TDEConfigGroup* g = configGroup(c, prefix, postfix);
   int n = g->readNumEntry("Panels", 1);
   setChildCount(n);
   setOrientation( (g->readEntry("Orientation") == TQString("Horizontal")) ?
@@ -200,11 +200,11 @@ void MultiView::readViewConfig(KConfig* c,
     activeTV->setActive(true);
 }
 
-void MultiView::saveViewConfig(KConfig* c, 
+void MultiView::saveViewConfig(TDEConfig* c, 
 			       TQString prefix, TQString postfix,
 			       bool withOptions)
 {
-  KConfigGroup g(c, (prefix+postfix).ascii());
+  TDEConfigGroup g(c, (prefix+postfix).ascii());
   
   g.writeEntry("Panels", childCount());
   g.writeEntry("Orientation",
diff --git a/tdecachegrind/tdecachegrind/multiview.h b/tdecachegrind/tdecachegrind/multiview.h
index 9b739c14..c5d4d81f 100644
--- a/tdecachegrind/tdecachegrind/multiview.h
+++ b/tdecachegrind/tdecachegrind/multiview.h
@@ -51,8 +51,8 @@ public:
   void selected(TraceItemView*, TraceItem*);
   void activated(TraceItemView*, TraceItem*);
 
-  void readViewConfig(KConfig*, TQString prefix, TQString postfix, bool);
-  void saveViewConfig(KConfig*, TQString prefix, TQString postfix, bool);
+  void readViewConfig(TDEConfig*, TQString prefix, TQString postfix, bool);
+  void saveViewConfig(TDEConfig*, TQString prefix, TQString postfix, bool);
 
 public slots:
     void tabActivated(TabView*);
diff --git a/tdecachegrind/tdecachegrind/partselection.cpp b/tdecachegrind/tdecachegrind/partselection.cpp
index 8acef22b..4f30e1fe 100644
--- a/tdecachegrind/tdecachegrind/partselection.cpp
+++ b/tdecachegrind/tdecachegrind/partselection.cpp
@@ -461,7 +461,7 @@ void PartSelection::hiddenPartsChangedSlot(const TracePartList& list)
   partAreaWidget->changeHidden(list);
 }
 
-void PartSelection::readVisualisationConfig(KConfigGroup* config)
+void PartSelection::readVisualisationConfig(TDEConfigGroup* config)
 {
   bool enable;
 
@@ -500,7 +500,7 @@ void PartSelection::readVisualisationConfig(KConfigGroup* config)
   showInfo(config->readBoolEntry("ShowInfo", false));
 }
 
-void PartSelection::saveVisualisationConfig(KConfigGroup* config)
+void PartSelection::saveVisualisationConfig(TDEConfigGroup* config)
 {
   TQString mode;
   if (partAreaWidget->visualisation() == PartAreaWidget::Inclusive)
diff --git a/tdecachegrind/tdecachegrind/partselection.h b/tdecachegrind/tdecachegrind/partselection.h
index 974fa585..4313d0d8 100644
--- a/tdecachegrind/tdecachegrind/partselection.h
+++ b/tdecachegrind/tdecachegrind/partselection.h
@@ -30,7 +30,7 @@
 #include "partgraph.h"
 #include "tracedata.h"
 
-class KConfigGroup;
+class TDEConfigGroup;
 class TraceFunction;
 class TraceData;
 class TreeMapItem;
@@ -49,8 +49,8 @@ public:
 
   PartAreaWidget* graph() { return partAreaWidget; }
 
-  void readVisualisationConfig(KConfigGroup*);
-  void saveVisualisationConfig(KConfigGroup*);
+  void readVisualisationConfig(TDEConfigGroup*);
+  void saveVisualisationConfig(TDEConfigGroup*);
 
 signals:
   void activePartsChanged(const TracePartList& list);
diff --git a/tdecachegrind/tdecachegrind/tabview.cpp b/tdecachegrind/tdecachegrind/tabview.cpp
index a194ddb4..2c38aa4b 100644
--- a/tdecachegrind/tdecachegrind/tabview.cpp
+++ b/tdecachegrind/tdecachegrind/tabview.cpp
@@ -709,14 +709,14 @@ void TabView::selected(TraceItemView*, TraceItem* s)
 }
 
 
-void TabView::readViewConfig(KConfig* c,
+void TabView::readViewConfig(TDEConfig* c,
 			     TQString prefix, TQString postfix,
 			     bool withOptions)
 {
     if (0) tqDebug("%s::readConfig(%s%s)", name(),
 		  prefix.ascii(), postfix.ascii());
 
-    KConfigGroup* g = configGroup(c, prefix, postfix);
+    TDEConfigGroup* g = configGroup(c, prefix, postfix);
 
     _mainSplitter->setSizes(g->readIntListEntry("MainSizes"));
     _leftSplitter->setSizes(g->readIntListEntry("LeftSizes"));
@@ -806,11 +806,11 @@ void TabView::readViewConfig(KConfig* c,
     updateView();
 }
 
-void TabView::saveViewConfig(KConfig* c,
+void TabView::saveViewConfig(TDEConfig* c,
 			     TQString prefix, TQString postfix,
 			     bool withOptions)
 {
-    KConfigGroup g(c, (prefix+postfix).ascii());
+    TDEConfigGroup g(c, (prefix+postfix).ascii());
 
     g.writeEntry("MainSizes", _mainSplitter->sizes());
     g.writeEntry("LeftSizes", _leftSplitter->sizes());
diff --git a/tdecachegrind/tdecachegrind/tabview.h b/tdecachegrind/tdecachegrind/tabview.h
index cbca5aa4..19c52297 100644
--- a/tdecachegrind/tdecachegrind/tabview.h
+++ b/tdecachegrind/tdecachegrind/tabview.h
@@ -135,8 +135,8 @@ public:
   int visibleTabs();
   int visibleAreas();
 
-  void readViewConfig(KConfig*, TQString prefix, TQString postfix, bool);
-  void saveViewConfig(KConfig*, TQString prefix, TQString postfix, bool);
+  void readViewConfig(TDEConfig*, TQString prefix, TQString postfix, bool);
+  void saveViewConfig(TDEConfig*, TQString prefix, TQString postfix, bool);
 
 public slots:
   void tabChanged(TQWidget*);
diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp
index 6364e53c..bb9db209 100644
--- a/tdecachegrind/tdecachegrind/toplevel.cpp
+++ b/tdecachegrind/tdecachegrind/toplevel.cpp
@@ -105,7 +105,7 @@ TopLevel::TopLevel(const char *name)
 #endif
   _statusbar->addWidget(_statusLabel, 1);
 
-  KConfig* kconfig = TDEGlobal::config();
+  TDEConfig* kconfig = TDEGlobal::config();
   Configuration::readOptions( kconfig );
   _openRecent->loadEntries( kconfig );
 
@@ -201,13 +201,13 @@ void TopLevel::setupPartSelection(PartSelection* ps)
  */
 void TopLevel::saveCurrentState(TQString postfix)
 {
-  KConfig* kconfig = TDEGlobal::config();
+  TDEConfig* kconfig = TDEGlobal::config();
   TQCString pf = postfix.ascii();
 
-  KConfigGroup psConfig(kconfig, TQCString("PartOverview")+pf);
+  TDEConfigGroup psConfig(kconfig, TQCString("PartOverview")+pf);
   _partSelection->saveVisualisationConfig(&psConfig);
 
-  KConfigGroup stateConfig(kconfig, TQCString("CurrentState")+pf);
+  TDEConfigGroup stateConfig(kconfig, TQCString("CurrentState")+pf);
   stateConfig.writeEntry("CostType",
 			 _costType ? _costType->name() : TQString("?"));
   stateConfig.writeEntry("CostType2",
@@ -225,7 +225,7 @@ void TopLevel::saveTraceSettings()
 {
   TQString key = traceKey();
 
-  KConfigGroup pConfig(TDEGlobal::config(), TQCString("TracePositions"));
+  TDEConfigGroup pConfig(TDEGlobal::config(), TQCString("TracePositions"));
   pConfig.writeEntry(TQString("CostType%1").arg(key),
                      _costType ? _costType->name() : TQString("?"));
   pConfig.writeEntry(TQString("CostType2%1").arg(key),
@@ -235,7 +235,7 @@ void TopLevel::saveTraceSettings()
 
   if (!_data) return;
 
-  KConfigGroup aConfig(TDEGlobal::config(), TQCString("Layouts"));
+  TDEConfigGroup aConfig(TDEGlobal::config(), TQCString("Layouts"));
   aConfig.writeEntry(TQString("Count%1").arg(key), _layoutCount);
   aConfig.writeEntry(TQString("Current%1").arg(key), _layoutCurrent);
 
@@ -253,14 +253,14 @@ void TopLevel::saveTraceSettings()
  */
 void TopLevel::restoreCurrentState(TQString postfix)
 {
-  KConfig* kconfig = TDEGlobal::config();
+  TDEConfig* kconfig = TDEGlobal::config();
   TQStringList gList = kconfig->groupList();
   TQCString pf = postfix.ascii();
 
   // dock properties (not position, this should be have done before)
   TQCString group = TQCString("PartOverview");
   if (gList.contains(group+pf)) group += pf;
-  KConfigGroup psConfig(kconfig, group);
+  TDEConfigGroup psConfig(kconfig, group);
   _partSelection->readVisualisationConfig(&psConfig);
 
   _multiView->readViewConfig(kconfig, TQString("MainView"), postfix, true);
@@ -388,7 +388,7 @@ void TopLevel::createDocks()
 #endif
 
   // Restore QT Dock positions...
-  KConfigGroup dockConfig(TDEGlobal::config(), TQCString("Docks"));
+  TDEConfigGroup dockConfig(TDEGlobal::config(), TQCString("Docks"));
   TQString str = dockConfig.readEntry("Position", TQString());
   if (0) tqDebug("Docks/Position: '%s'", str.ascii());
   if (str.isEmpty()) {
@@ -427,12 +427,12 @@ TopLevel::~TopLevel()
 }
 
 
-void TopLevel::saveProperties(KConfig* c)
+void TopLevel::saveProperties(TDEConfig* c)
 {
   c->writeEntry("TraceName", _data->traceName());
 }
 
-void TopLevel::readProperties(KConfig* c)
+void TopLevel::readProperties(TDEConfig* c)
 {
   TQString traceName = c->readEntry("TraceName");
   if (!traceName.isEmpty()) {
@@ -1017,16 +1017,16 @@ void TopLevel::loadTrace(const KURL& url)
   // network transparancy
   TQString tmpFile;
 #if TDE_VERSION > 0x030190
-  // for KDE 3.2: KIO::NetAccess::download with 2 args is deprecated
-  if(KIO::NetAccess::download( url, tmpFile, this )) {
+  // for KDE 3.2: TDEIO::NetAccess::download with 2 args is deprecated
+  if(TDEIO::NetAccess::download( url, tmpFile, this )) {
 #else
-  if(KIO::NetAccess::download( url, tmpFile )) {
+  if(TDEIO::NetAccess::download( url, tmpFile )) {
 #endif
     _openRecent->addURL(url);
     _openRecent->saveEntries( TDEGlobal::config() );
 
     loadTrace(tmpFile);
-    KIO::NetAccess::removeTempFile( tmpFile );
+    TDEIO::NetAccess::removeTempFile( tmpFile );
   }
 }
 
@@ -1066,16 +1066,16 @@ void TopLevel::addTrace(const KURL& url)
   // network transparancy
   TQString tmpFile;
 #if TDE_VERSION > 0x030190
-  // for KDE 3.2: KIO::NetAccess::download with 2 args is deprecated
-  if(KIO::NetAccess::download( url, tmpFile, this )) {
+  // for KDE 3.2: TDEIO::NetAccess::download with 2 args is deprecated
+  if(TDEIO::NetAccess::download( url, tmpFile, this )) {
 #else
-  if(KIO::NetAccess::download( url, tmpFile )) {
+  if(TDEIO::NetAccess::download( url, tmpFile )) {
 #endif
     _openRecent->addURL(url);
     _openRecent->saveEntries( TDEGlobal::config() );
 
     addTrace(tmpFile);
-    KIO::NetAccess::removeTempFile( tmpFile );
+    TDEIO::NetAccess::removeTempFile( tmpFile );
   }
 }
 
@@ -1721,8 +1721,8 @@ void TopLevel::restoreTraceTypes()
 {
   TQString key = traceKey();
 
-  KConfigGroup cConfig(TDEGlobal::config(), TQCString("CurrentState"));
-  KConfigGroup pConfig(TDEGlobal::config(), TQCString("TracePositions"));
+  TDEConfigGroup cConfig(TDEGlobal::config(), TQCString("CurrentState"));
+  TDEConfigGroup pConfig(TDEGlobal::config(), TQCString("TracePositions"));
 
   TQString groupType, costType, costType2;
   groupType =  pConfig.readEntry(TQString("GroupType%1").arg(key));
@@ -1741,7 +1741,7 @@ void TopLevel::restoreTraceTypes()
   if (!_costType && !_saCost->items().isEmpty())
       costTypeSelected(_saCost->items().first());
 
-  KConfigGroup aConfig(TDEGlobal::config(), TQCString("Layouts"));
+  TDEConfigGroup aConfig(TDEGlobal::config(), TQCString("Layouts"));
   _layoutCount = aConfig.readNumEntry(TQString("Count%1").arg(key), 0);
   _layoutCurrent = aConfig.readNumEntry(TQString("Current%1").arg(key), 0);
   if (_layoutCount == 0) layoutRestore();
@@ -1760,7 +1760,7 @@ void TopLevel::restoreTraceSettings()
 
   TQString key = traceKey();
 
-  KConfigGroup pConfig(TDEGlobal::config(), TQCString("TracePositions"));
+  TDEConfigGroup pConfig(TDEGlobal::config(), TQCString("TracePositions"));
   TQString group = pConfig.readEntry(TQString("Group%1").arg(key));
   if (!group.isEmpty()) setGroup(group);
 
@@ -1811,7 +1811,7 @@ void TopLevel::layoutNext()
 {
   if (_layoutCount <2) return;
 
-  KConfig* config = TDEGlobal::config();
+  TDEConfig* config = TDEGlobal::config();
   TQString key = traceKey();
 
   _multiView->saveViewConfig(config,
@@ -1832,7 +1832,7 @@ void TopLevel::layoutPrevious()
 {
   if (_layoutCount <2) return;
 
-  KConfig* config = TDEGlobal::config();
+  TDEConfig* config = TDEGlobal::config();
   TQString key = traceKey();
 
   _multiView->saveViewConfig(config,
@@ -1851,7 +1851,7 @@ void TopLevel::layoutPrevious()
 
 void TopLevel::layoutSave()
 {
-  KConfig* config = TDEGlobal::config();
+  TDEConfig* config = TDEGlobal::config();
   TQString key = traceKey();
 
   _multiView->saveViewConfig(config,
@@ -1871,15 +1871,15 @@ void TopLevel::layoutSave()
 			     TQString("Layout%1-MainView").arg(_layoutCurrent),
 			     key, false);
 
-  KConfigGroup aConfig(config, TQCString("Layouts"));
+  TDEConfigGroup aConfig(config, TQCString("Layouts"));
   aConfig.writeEntry("DefaultCount", _layoutCount);
   aConfig.writeEntry("DefaultCurrent", _layoutCurrent);
 }
 
 void TopLevel::layoutRestore()
 {
-  KConfig* config = TDEGlobal::config();
-  KConfigGroup aConfig(config, TQCString("Layouts"));
+  TDEConfig* config = TDEGlobal::config();
+  TDEConfigGroup aConfig(config, TQCString("Layouts"));
   _layoutCount = aConfig.readNumEntry("DefaultCount", 0);
   _layoutCurrent = aConfig.readNumEntry("DefaultCurrent", 0);
   if (_layoutCount == 0) {
@@ -1994,7 +1994,7 @@ bool TopLevel::queryExit()
   // Its already stored.
   delete toolBar();
 
-  KConfigGroup dockConfig(TDEGlobal::config(), TQCString("Docks"));
+  TDEConfigGroup dockConfig(TDEGlobal::config(), TQCString("Docks"));
   TQString str;
   TQTextStream ts( &str, IO_WriteOnly );
   ts << *this;
diff --git a/tdecachegrind/tdecachegrind/toplevel.h b/tdecachegrind/tdecachegrind/toplevel.h
index 4db0bc09..7ac4f2de 100644
--- a/tdecachegrind/tdecachegrind/toplevel.h
+++ b/tdecachegrind/tdecachegrind/toplevel.h
@@ -64,8 +64,8 @@ public:
   TraceData* data() { return _data; }
   void setData(TraceData*);
 
-  virtual void saveProperties(KConfig*);
-  virtual void readProperties(KConfig*);
+  virtual void saveProperties(TDEConfig*);
+  virtual void readProperties(TDEConfig*);
 
   void createActions();
   void createDocks();
diff --git a/tdecachegrind/tdecachegrind/traceitemview.cpp b/tdecachegrind/tdecachegrind/traceitemview.cpp
index d11f02b6..8df7297f 100644
--- a/tdecachegrind/tdecachegrind/traceitemview.cpp
+++ b/tdecachegrind/tdecachegrind/traceitemview.cpp
@@ -58,15 +58,15 @@ void TraceItemView::select(TraceItem* i)
     _newSelectedItem = i;
 }
 
-KConfigGroup* TraceItemView::configGroup(KConfig* c,
+TDEConfigGroup* TraceItemView::configGroup(TDEConfig* c,
 					 TQString group, TQString post)
 {
     TQStringList gList = c->groupList();
     if (gList.contains((group+post).ascii()) ) group += post;
-    return new KConfigGroup(c, group);
+    return new TDEConfigGroup(c, group);
 }
 
-void TraceItemView::writeConfigEntry(KConfigBase* c, const char* pKey,
+void TraceItemView::writeConfigEntry(TDEConfigBase* c, const char* pKey,
 				     TQString value, const char* def, bool bNLS)
 {
     if (!c) return;
@@ -77,7 +77,7 @@ void TraceItemView::writeConfigEntry(KConfigBase* c, const char* pKey,
 	c->writeEntry(pKey, value, true, false, bNLS);
 }
 
-void TraceItemView::writeConfigEntry(KConfigBase* c, const char* pKey,
+void TraceItemView::writeConfigEntry(TDEConfigBase* c, const char* pKey,
 				     int value, int def)
 {
     if (!c) return;
@@ -87,7 +87,7 @@ void TraceItemView::writeConfigEntry(KConfigBase* c, const char* pKey,
 	c->writeEntry(pKey, value);
 }
 
-void TraceItemView::writeConfigEntry(KConfigBase* c, const char* pKey,
+void TraceItemView::writeConfigEntry(TDEConfigBase* c, const char* pKey,
 				     double value, double def)
 {
     if (!c) return;
@@ -97,7 +97,7 @@ void TraceItemView::writeConfigEntry(KConfigBase* c, const char* pKey,
 	c->writeEntry(pKey, value);
 }
 
-void TraceItemView::writeConfigEntry(KConfigBase* c, const char* pKey,
+void TraceItemView::writeConfigEntry(TDEConfigBase* c, const char* pKey,
 				     bool value, bool def)
 {
     if (!c) return;
@@ -107,18 +107,18 @@ void TraceItemView::writeConfigEntry(KConfigBase* c, const char* pKey,
 	c->writeEntry(pKey, value);
 }
 
-void TraceItemView::readViewConfig(KConfig*, TQString, TQString, bool)
+void TraceItemView::readViewConfig(TDEConfig*, TQString, TQString, bool)
 {}
 
 #if 1
-void TraceItemView::saveViewConfig(KConfig*, TQString, TQString, bool)
+void TraceItemView::saveViewConfig(TDEConfig*, TQString, TQString, bool)
 {}
 #else
-void TraceItemView::saveViewConfig(KConfig* c, 
+void TraceItemView::saveViewConfig(TDEConfig* c, 
 				   TQString prefix, TQString postfix, bool)
 {
     // write a dummy config entry to see missing virtual functions
-    KConfigGroup g(c, (prefix+postfix).ascii());
+    TDEConfigGroup g(c, (prefix+postfix).ascii());
     g.writeEntry("SaveNotImplemented", true);
 }
 #endif
diff --git a/tdecachegrind/tdecachegrind/traceitemview.h b/tdecachegrind/tdecachegrind/traceitemview.h
index f83aa896..aad2b145 100644
--- a/tdecachegrind/tdecachegrind/traceitemview.h
+++ b/tdecachegrind/tdecachegrind/traceitemview.h
@@ -28,9 +28,9 @@
 class TQWidget;
 class TQPopupMenu;
 
-class KConfig;
-class KConfigGroup;
-class KConfigBase;
+class TDEConfig;
+class TDEConfigGroup;
+class TDEConfigBase;
 
 class TopLevel;
 
@@ -74,18 +74,18 @@ public:
 
   virtual TQString whatsThis() const;
 
-  static KConfigGroup* configGroup(KConfig*, TQString prefix, TQString postfix);
-  static void writeConfigEntry(KConfigBase*, const char* pKey, TQString value,
+  static TDEConfigGroup* configGroup(TDEConfig*, TQString prefix, TQString postfix);
+  static void writeConfigEntry(TDEConfigBase*, const char* pKey, TQString value,
                                const char* def, bool bNLS = false);
-  static void writeConfigEntry(KConfigBase*, const char* pKey,
+  static void writeConfigEntry(TDEConfigBase*, const char* pKey,
                                int value, int def);
-  static void writeConfigEntry(KConfigBase*, const char* pKey,
+  static void writeConfigEntry(TDEConfigBase*, const char* pKey,
                                bool value, bool def);
-  static void writeConfigEntry(KConfigBase*, const char* pKey,
+  static void writeConfigEntry(TDEConfigBase*, const char* pKey,
                                double value, double def);
-  virtual void readViewConfig(KConfig*, TQString prefix, TQString postfix,
+  virtual void readViewConfig(TDEConfig*, TQString prefix, TQString postfix,
 			      bool withOptions);
-  virtual void saveViewConfig(KConfig*, TQString prefix, TQString postfix,
+  virtual void saveViewConfig(TDEConfig*, TQString prefix, TQString postfix,
 			      bool withOptions);
 
   // Immediate remove all references to old data, and set the new.
diff --git a/tdecachegrind/tdecachegrind/treemap.cpp b/tdecachegrind/tdecachegrind/treemap.cpp
index 0d4b8dc9..fe5965b2 100644
--- a/tdecachegrind/tdecachegrind/treemap.cpp
+++ b/tdecachegrind/tdecachegrind/treemap.cpp
@@ -3132,7 +3132,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
  * Option saving/restoring
  */
 
-void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix)
+void TreeMapWidget::saveOptions(TDEConfigGroup* config, TQString prefix)
 {
   config->writeEntry(prefix+"Nesting", splitModeString());
   config->writeEntry(prefix+"AllowRotation", allowRotation());
@@ -3157,7 +3157,7 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix)
 }
 
 
-void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix)
+void TreeMapWidget::restoreOptions(TDEConfigGroup* config, TQString prefix)
 {
   bool enabled;
   int num;
diff --git a/tdecachegrind/tdecachegrind/treemap.h b/tdecachegrind/tdecachegrind/treemap.h
index 0b494d8f..e7f99801 100644
--- a/tdecachegrind/tdecachegrind/treemap.h
+++ b/tdecachegrind/tdecachegrind/treemap.h
@@ -46,7 +46,7 @@ class TreeMapItem;
 class TreeMapItemList;
 class TQString;
 
-class KConfigGroup;
+class TDEConfigGroup;
 
 
 /**
@@ -614,8 +614,8 @@ public:
   /**
    * Save/restore options.
    */
-  void saveOptions(KConfigGroup*, TQString prefix = TQString());
-  void restoreOptions(KConfigGroup*, TQString prefix = TQString());
+  void saveOptions(TDEConfigGroup*, TQString prefix = TQString());
+  void restoreOptions(TDEConfigGroup*, TQString prefix = TQString());
 
   /**
    * These functions populate given popup menus.
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
index fb76d4f8..9cb96f18 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
@@ -20,7 +20,7 @@
 #include <kdebug.h>
 
 
-AutolayoutDlg::AutolayoutDlg(KConfig* c,UMLView* v,TQWidget *parent, const char *name)
+AutolayoutDlg::AutolayoutDlg(TDEConfig* c,UMLView* v,TQWidget *parent, const char *name)
         :MyDialog1(parent, name)
 {
     view=v;
@@ -122,7 +122,7 @@ void AutolayoutDlg::slotDoAutolayout()
     accept();
 }
 
-void AutolayoutDlg::readConfig( KConfig * conf)
+void AutolayoutDlg::readConfig( TDEConfig * conf)
 {
     conf->setGroup("AutolayoutDlg");
     associationEdgesCB->setChecked((bool)(conf->readBoolEntry( "associationAsEdges",false)));
@@ -138,7 +138,7 @@ void AutolayoutDlg::readConfig( KConfig * conf)
     algorithmCOB->setCurrentItem((int)(conf->readNumEntry( "algorithm",0)));
 }
 
-void AutolayoutDlg::writeConfig( KConfig * conf)
+void AutolayoutDlg::writeConfig( TDEConfig * conf)
 {
     //  conf=kapp->config();
     conf->setGroup("AutolayoutDlg");
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index 35f75231..d970c521 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@@ -23,7 +23,7 @@ class AutolayoutDlg : public MyDialog1
     Q_OBJECT
   
   public:
-    AutolayoutDlg(KConfig* c,UMLView* v, TQWidget *parent = 0, const char *name = 0);
+    AutolayoutDlg(TDEConfig* c,UMLView* v, TQWidget *parent = 0, const char *name = 0);
   public slots:
     virtual void slotSetAssociationWeight(int i);
     virtual void slotSetDependenciesWeight(int i);
@@ -38,8 +38,8 @@ class AutolayoutDlg : public MyDialog1
     virtual void slotReloadSettings();
     virtual void slotSaveSettings();
     virtual void slotDoAutolayout();
-    void readConfig(KConfig*);
-    void writeConfig(KConfig*);
+    void readConfig(TDEConfig*);
+    void writeConfig(TDEConfig*);
     virtual void slotSelectAlgorithm(const TQString&);
 
 
@@ -55,7 +55,7 @@ class AutolayoutDlg : public MyDialog1
     bool centerDiagram;
     bool clusterizeHierarchies;
     int shapeSeparation;
-    KConfig* config;
+    TDEConfig* config;
     TQString algname;
     Autolayout::Autolayouter* getAutolayouter();
 
diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp
index fcb9043c..725f322f 100644
--- a/umbrello/umbrello/codegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerationpolicy.cpp
@@ -100,7 +100,7 @@ CodeGenerationPolicy::CodeGenerationPolicy(CodeGenerationPolicy * clone)
     setDefaults(clone,false);
 }
 
-CodeGenerationPolicy::CodeGenerationPolicy(KConfig * config)
+CodeGenerationPolicy::CodeGenerationPolicy(TDEConfig * config)
 {
     initFields();
     setDefaults(config,false);
@@ -441,7 +441,7 @@ void CodeGenerationPolicy::setDefaults ( CodeGenerationPolicy * clone , bool emi
 
 }
 
-void CodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSignal)
+void CodeGenerationPolicy::setDefaults( TDEConfig * config, bool emitUpdateSignal)
 {
 
     if(!config)
@@ -485,7 +485,7 @@ void CodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSignal)
 
 }
 
-void CodeGenerationPolicy::writeConfig (KConfig * config) {
+void CodeGenerationPolicy::writeConfig (TDEConfig * config) {
 
     config->setGroup("Code Generation");
 
diff --git a/umbrello/umbrello/codegenerationpolicy.h b/umbrello/umbrello/codegenerationpolicy.h
index 146299c2..3d065dee 100644
--- a/umbrello/umbrello/codegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerationpolicy.h
@@ -24,7 +24,7 @@
 #include <tqdom.h>
 
 class TQWidget;
-class KConfig;
+class TDEConfig;
 class CodeGenerationPolicyPage;
 
 /**
@@ -79,7 +79,7 @@ public:
     // note that as the code gen policy may be the 'default' policy, it may
     // not be coupled with a code generator.
     CodeGenerationPolicy (CodeGenerationPolicy * clone = 0);
-    CodeGenerationPolicy (KConfig * config );
+    CodeGenerationPolicy (TDEConfig * config );
 
     /**
      * Empty Destructor
@@ -315,14 +315,14 @@ public:
     virtual void setDefaults (CodeGenerationPolicy * defaults, bool emitUpdateSignal = true);
 
     /**
-     * set the defaults from a config file for this code generator from the passed KConfig pointer.
+     * set the defaults from a config file for this code generator from the passed TDEConfig pointer.
      */
-    virtual void setDefaults(KConfig * config, bool emitUpdateSignal = true);
+    virtual void setDefaults(TDEConfig * config, bool emitUpdateSignal = true);
 
     /**
-     * write Default params to passed KConfig pointer.
+     * write Default params to passed TDEConfig pointer.
      */
-    virtual void writeConfig (KConfig * config);
+    virtual void writeConfig (TDEConfig * config);
 
     void emitModifiedCodeContentSig();
 
diff --git a/umbrello/umbrello/codegenerator.h b/umbrello/umbrello/codegenerator.h
index 5bca8eb6..aa8a9188 100644
--- a/umbrello/umbrello/codegenerator.h
+++ b/umbrello/umbrello/codegenerator.h
@@ -47,7 +47,7 @@ class CodeDocument;
 class CodeOperation;
 class CodeViewerDialog;
 
-class KConfig;
+class TDEConfig;
 
 /**
   * class CodeGenerator
diff --git a/umbrello/umbrello/codegenerators/codegenpolicyext.h b/umbrello/umbrello/codegenerators/codegenpolicyext.h
index 29e358a1..b95cfdac 100644
--- a/umbrello/umbrello/codegenerators/codegenpolicyext.h
+++ b/umbrello/umbrello/codegenerators/codegenpolicyext.h
@@ -15,7 +15,7 @@
 #include <tqobject.h>
 
 class TQWidget;
-class KConfig;
+class TDEConfig;
 class CodeGenerationPolicyPage;
 
 /**
@@ -39,14 +39,14 @@ public:
     virtual CodeGenerationPolicyPage * createPage(TQWidget *parent = 0, const char *name = 0) = 0;
 
     /**
-     * set the defaults from a config file for this code generator from the passed KConfig pointer.
+     * set the defaults from a config file for this code generator from the passed TDEConfig pointer.
      */
-    virtual void setDefaults(KConfig * config, bool emitUpdateSignal = true) = 0;
+    virtual void setDefaults(TDEConfig * config, bool emitUpdateSignal = true) = 0;
 
     /**
-     * write Default params to passed KConfig pointer.
+     * write Default params to passed TDEConfig pointer.
      */
-    virtual void writeConfig (KConfig * config) = 0;
+    virtual void writeConfig (TDEConfig * config) = 0;
 };
 
 #endif
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
index 8aec0351..70983d96 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
@@ -45,7 +45,7 @@ const bool CPPCodeGenerationPolicy::DEFAULT_PUBLIC_ACCESSORS = false;
 // Constructors/Destructors
 //
 
-CPPCodeGenerationPolicy::CPPCodeGenerationPolicy(KConfig *config)
+CPPCodeGenerationPolicy::CPPCodeGenerationPolicy(TDEConfig *config)
 {
     init();
     setDefaults(config,false);
@@ -264,7 +264,7 @@ TQString CPPCodeGenerationPolicy::getObjectMethodInit(const TQString & variableN
 // Other methods
 //
 
-void CPPCodeGenerationPolicy::writeConfig ( KConfig * config )
+void CPPCodeGenerationPolicy::writeConfig ( TDEConfig * config )
 {
 
     // write ONLY the CPP specific stuff
@@ -319,7 +319,7 @@ void CPPCodeGenerationPolicy::setDefaults ( CPPCodeGenerationPolicy * cppclone,
 
 }
 
-void CPPCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSignal )
+void CPPCodeGenerationPolicy::setDefaults( TDEConfig * config, bool emitUpdateSignal )
 {
 
     if(!config)
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
index d3b2d1b0..b2742ae0 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
@@ -21,7 +21,7 @@
 #include "codegenpolicyext.h"
 #include "../codegenerationpolicy.h"
 
-class KConfig;
+class TDEConfig;
 class CodeGenerationPolicyPage;
 
 class CPPCodeGenerationPolicy : public CodeGenPolicyExt
@@ -56,7 +56,7 @@ public:
     /**
      * Constructors
      */
-    CPPCodeGenerationPolicy ( KConfig * config = 0 );
+    CPPCodeGenerationPolicy ( TDEConfig * config = 0 );
 
     /**
      * Empty Destructor
@@ -180,14 +180,14 @@ public:
     virtual void setDefaults (CPPCodeGenerationPolicy * defaults, bool emitUpdateSignal = true);
 
     /**
-     * set the defaults from a config file for this code generator from the passed KConfig pointer.
+     * set the defaults from a config file for this code generator from the passed TDEConfig pointer.
      */
-    virtual void setDefaults(KConfig * config, bool emitUpdateSignal = true);
+    virtual void setDefaults(TDEConfig * config, bool emitUpdateSignal = true);
 
     /**
-     * write Default params to passed KConfig pointer.
+     * write Default params to passed TDEConfig pointer.
      */
-    virtual void writeConfig (KConfig * config);
+    virtual void writeConfig (TDEConfig * config);
 
     /**
      * Create a new dialog interface for this object.
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.h b/umbrello/umbrello/codegenerators/cppcodegenerator.h
index 1b7cfe0b..a6687249 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.h
@@ -28,7 +28,7 @@
 class CodeViewerDialog;
 class CPPHeaderCodeDocument;
 class CodeBlockWithComments;
-class KConfig;
+class TDEConfig;
 
 class CPPCodeGenerator : public CodeGenerator
 {
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
index 6225485f..02cd8adf 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
@@ -37,7 +37,7 @@ JavaCodeGenerationPolicy::JavaCodeGenerationPolicy(CodeGenerationPolicy *default
 }
  */
 
-JavaCodeGenerationPolicy::JavaCodeGenerationPolicy(KConfig *config)
+JavaCodeGenerationPolicy::JavaCodeGenerationPolicy(TDEConfig *config)
   //      : CodeGenerationPolicy(config)
 {
     init();
@@ -93,7 +93,7 @@ bool JavaCodeGenerationPolicy::getAutoGenerateAssocAccessors( ){
 // Other methods
 //
 
-void JavaCodeGenerationPolicy::writeConfig ( KConfig * config )
+void JavaCodeGenerationPolicy::writeConfig ( TDEConfig * config )
 {
 
     // write ONLY the Java specific stuff
@@ -136,7 +136,7 @@ void JavaCodeGenerationPolicy::setDefaults ( CodeGenPolicyExt * clone, bool emit
 
 }
 
-void JavaCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSignal )
+void JavaCodeGenerationPolicy::setDefaults( TDEConfig * config, bool emitUpdateSignal )
 {
 
     if(!config)
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
index bde47753..89e6b294 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
@@ -21,7 +21,7 @@
 #include "codegenpolicyext.h"
 #include "../codegenerationpolicy.h"
 
-class KConfig;
+class TDEConfig;
 class CodeGenerationPolicyPage;
 
 class JavaCodeGenerationPolicy : public CodeGenPolicyExt
@@ -40,7 +40,7 @@ public:
      * Constructors
      */
     //JavaCodeGenerationPolicy (CodeGenerationPolicy * defaults = 0);
-    JavaCodeGenerationPolicy (KConfig * config = 0);
+    JavaCodeGenerationPolicy (TDEConfig * config = 0);
 
     /**
      * Empty Destructor
@@ -84,14 +84,14 @@ public:
     virtual void setDefaults (CodeGenPolicyExt * defaults, bool emitUpdateSignal = true);
 
     /**
-     * set the defaults from a config file for this code generator from the passed KConfig pointer.
+     * set the defaults from a config file for this code generator from the passed TDEConfig pointer.
      */
-    virtual void setDefaults(KConfig * config, bool emitUpdateSignal = true);
+    virtual void setDefaults(TDEConfig * config, bool emitUpdateSignal = true);
 
     /**
-     * write Default params to passed KConfig pointer.
+     * write Default params to passed TDEConfig pointer.
      */
-    virtual void writeConfig (KConfig * config);
+    virtual void writeConfig (TDEConfig * config);
 
     /**
      * Create a new dialog interface for this object.
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
index 8e58fdf0..d9c8527d 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
@@ -32,7 +32,7 @@ const bool RubyCodeGenerationPolicy::DEFAULT_AUTO_GEN_ASSOC_ACCESSORS = true;
 // Constructors/Destructors
 //
 
-RubyCodeGenerationPolicy::RubyCodeGenerationPolicy(KConfig *config)
+RubyCodeGenerationPolicy::RubyCodeGenerationPolicy(TDEConfig *config)
 {
     init();
     setDefaults(config,false);
@@ -87,7 +87,7 @@ bool RubyCodeGenerationPolicy::getAutoGenerateAssocAccessors( ){
 // Other methods
 //
 
-void RubyCodeGenerationPolicy::writeConfig ( KConfig * config )
+void RubyCodeGenerationPolicy::writeConfig ( TDEConfig * config )
 {
     // @todo do we need to call CodeGenerationPolicy::writeConfig ???
 
@@ -125,7 +125,7 @@ void RubyCodeGenerationPolicy::setDefaults ( CodeGenPolicyExt * clone, bool emit
 
 }
 
-void RubyCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSignal )
+void RubyCodeGenerationPolicy::setDefaults( TDEConfig * config, bool emitUpdateSignal )
 {
 
     if(!config)
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
index afbc26b4..f9f35894 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
@@ -24,7 +24,7 @@
 #include "codegenpolicyext.h"
 #include "../codegenerationpolicy.h"
 
-class KConfig;
+class TDEConfig;
 class CodeGenerationPolicyPage;
 
 class RubyCodeGenerationPolicy : public CodeGenPolicyExt
@@ -42,7 +42,7 @@ public:
     /**
      * Constructors
      */
-    RubyCodeGenerationPolicy (KConfig * config = 0);
+    RubyCodeGenerationPolicy (TDEConfig * config = 0);
 
     /**
      * Empty Destructor
@@ -86,14 +86,14 @@ public:
     virtual void setDefaults (CodeGenPolicyExt * defaults, bool emitUpdateSignal = true);
 
     /**
-     * set the defaults from a config file for this code generator from the passed KConfig pointer.
+     * set the defaults from a config file for this code generator from the passed TDEConfig pointer.
      */
-    virtual void setDefaults(KConfig * config, bool emitUpdateSignal = true);
+    virtual void setDefaults(TDEConfig * config, bool emitUpdateSignal = true);
 
     /**
-     * write Default params to passed KConfig pointer.
+     * write Default params to passed TDEConfig pointer.
      */
-    virtual void writeConfig (KConfig * config);
+    virtual void writeConfig (TDEConfig * config);
 
     /**
      * Create a new dialog interface for this object.
diff --git a/umbrello/umbrello/configurable.cpp b/umbrello/umbrello/configurable.cpp
index 96bef270..c4f9683c 100644
--- a/umbrello/umbrello/configurable.cpp
+++ b/umbrello/umbrello/configurable.cpp
@@ -44,7 +44,7 @@ Configurable::~Configurable()
 }
 
 bool
-Configurable::loadPlugins(KConfig *config,
+Configurable::loadPlugins(TDEConfig *config,
                           const TQString &key)
 {
     bool ret = true;
diff --git a/umbrello/umbrello/configurable.h b/umbrello/umbrello/configurable.h
index df6bf7d8..758c2aa6 100644
--- a/umbrello/umbrello/configurable.h
+++ b/umbrello/umbrello/configurable.h
@@ -24,7 +24,7 @@
 
 // forward declarations
 class KLibrary;
-class KConfig;
+class TDEConfig;
 
 /**
  * @defgroup U2_Lib Umbrello2 API
@@ -97,7 +97,7 @@ protected:
      *
      * @return True on success, false on failure.
      */
-    bool loadPlugins(KConfig *config, const TQString &key);
+    bool loadPlugins(TDEConfig *config, const TQString &key);
 
     /**
      * This is a convenience method for derived classes. When a functional object
diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h
index ff745bd7..78f8b064 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.h
+++ b/umbrello/umbrello/dialogs/settingsdlg.h
@@ -163,7 +163,7 @@ private:
     CodeGenerationOptionsPage * m_pCodeGenPage;
     CodeViewerOptionsPage * m_pCodeViewerPage;
 
-    KConfig * m_pCfg;
+    TDEConfig * m_pCfg;
     bool m_bChangesApplied;
 
 private slots:
diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
index 0afbcb0a..e1e3c297 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
@@ -61,7 +61,7 @@ bool DocbookGenerator::generateDocbookForProject()
   return true;
 }
 
-KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
+TDEIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
 {
   UMLApp* app = UMLApp::app();
   UMLDoc* umlDoc = app->getDocument();
@@ -135,7 +135,7 @@ KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
   url.setPath(destDir.path());
   url.addPath(fileName);
   kDebug() << "Copying result to: " << url << endl;
-  KIO::Job* job = KIO::file_copy(tmpDocBook.file()->name(),url,-1,true,false,false);
+  TDEIO::Job* job = TDEIO::file_copy(tmpDocBook.file()->name(),url,-1,true,false,false);
   job->setAutoErrorHandlingEnabled(true);
 
   return job;
diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.h b/umbrello/umbrello/docgenerators/docbookgenerator.h
index 04c295a9..0dc873f3 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.h
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.h
@@ -23,7 +23,7 @@
 
 class UMLDoc;
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
 }
@@ -72,7 +72,7 @@ class DocbookGenerator : public TQObject
      * @todo better handling of error conditions
      * @return true if saving is successful and false otherwise.
      */
-    KIO::Job* generateDocbookForProjectInto(const KURL& destDir);
+    TDEIO::Job* generateDocbookForProjectInto(const KURL& destDir);
 
 };
 
diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
index 1b8e3a46..5c147e84 100644
--- a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
@@ -66,17 +66,17 @@ bool XhtmlGenerator::generateXhtmlForProjectInto(const KURL& destDir)
   kDebug() << "First convert to docbook" << endl;
   m_destDir = destDir;
 //   KURL url(TQString("file://")+m_tmpDir.name());
-  KIO::Job* docbookJob = DocbookGenerator().generateDocbookForProjectInto(destDir);
+  TDEIO::Job* docbookJob = DocbookGenerator().generateDocbookForProjectInto(destDir);
   if (docbookJob == 0)
   {
     return false;
   }
   kDebug() << "Connecting..." << endl;
-  connect(docbookJob, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotDocbookToXhtml( KIO::Job *)));
+  connect(docbookJob, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotDocbookToXhtml( TDEIO::Job *)));
   return true;
 }
 
-void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob)
+void XhtmlGenerator::slotDocbookToXhtml(TDEIO::Job * docbookJob)
 {
   kDebug() << "Now convert docbook to html..." << endl;
   if ( docbookJob->error() )
@@ -150,19 +150,19 @@ void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob)
   xhtmlUrl.addPath(xhtmlName);
 
   kDebug() << "Copying HTML result to: " << xhtmlUrl << endl;
-  KIO::Job* job = KIO::file_copy(tmpXhtml.file()->name(),xhtmlUrl,-1,true,false,false);
+  TDEIO::Job* job = TDEIO::file_copy(tmpXhtml.file()->name(),xhtmlUrl,-1,true,false,false);
   job->setAutoErrorHandlingEnabled(true);
-  connect (job, TQT_SIGNAL(result( KIO::Job* )), this, TQT_SLOT(slotHtmlCopyFinished( KIO::Job* )));
+  connect (job, TQT_SIGNAL(result( TDEIO::Job* )), this, TQT_SLOT(slotHtmlCopyFinished( TDEIO::Job* )));
 
   TQString cssFileName(TDEGlobal::dirs()->findResource("appdata","xmi.css"));
   kDebug() << "CSS file is'"<<cssFileName<<"'" << endl;
   KURL cssUrl = m_destDir;
   cssUrl.addPath("xmi.css");
-  KIO::Job* cssJob = KIO::file_copy(cssFileName,cssUrl,-1,true,false,false);
+  TDEIO::Job* cssJob = TDEIO::file_copy(cssFileName,cssUrl,-1,true,false,false);
   cssJob->setAutoErrorHandlingEnabled(true);
 }
 
-void XhtmlGenerator::slotHtmlCopyFinished( KIO::Job* )
+void XhtmlGenerator::slotHtmlCopyFinished( TDEIO::Job* )
 {
   kDebug() << "HTML copy finished: emiting finished" << endl;
   emit(finished());
diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.h b/umbrello/umbrello/docgenerators/xhtmlgenerator.h
index c63b3bba..a6b8e6a4 100644
--- a/umbrello/umbrello/docgenerators/xhtmlgenerator.h
+++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.h
@@ -22,7 +22,7 @@
 #include <ktempdir.h>
 #include <tqobject.h>
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
 }
@@ -86,12 +86,12 @@ class XhtmlGenerator : public TQObject
      * @param docbookJob the job copying the docbook file to its destination.
      * Used only for error reporting
      */
-    void slotDocbookToXhtml(KIO::Job * docbookJob);
+    void slotDocbookToXhtml(TDEIO::Job * docbookJob);
 
     /** Triggered when the copying of the HTML result file is finished. Emits
      * the signal finished().
      */
-    void slotHtmlCopyFinished( KIO::Job* );
+    void slotHtmlCopyFinished( TDEIO::Job* );
 
   private:
 
diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp
index 24928759..52d96693 100644
--- a/umbrello/umbrello/main.cpp
+++ b/umbrello/umbrello/main.cpp
@@ -62,7 +62,7 @@ bool getShowGUI(TDECmdLineArgs *args);
  * @param showGUI If the GUI should be shown.
  * @return The startup logo for the application, or a null pointer if it shouldn't be shown.
  */
-KStartupLogo* showStartupLogo(KConfig* cfg, bool showGUI);
+KStartupLogo* showStartupLogo(TDEConfig* cfg, bool showGUI);
 
 /**
  * Initializes the document used by the application.
@@ -73,7 +73,7 @@ KStartupLogo* showStartupLogo(KConfig* cfg, bool showGUI);
  * @param args The command line arguments given.
  * @param cfg The application configuration.
  */
-void initDocument(TDECmdLineArgs *args, KConfig* cfg);
+void initDocument(TDECmdLineArgs *args, TDEConfig* cfg);
 
 /**
  * Export all the views in the document using the command line args set by the user.
@@ -108,7 +108,7 @@ int main(int argc, char *argv[]) {
 
         UMLApp *uml = new UMLApp();
         flushEvents();
-        KConfig * cfg = app.config();
+        TDEConfig * cfg = app.config();
 
         KStartupLogo* startLogo = showStartupLogo(cfg, showGUI);
 
@@ -145,7 +145,7 @@ bool getShowGUI(TDECmdLineArgs *args) {
     return true;
 }
 
-KStartupLogo* showStartupLogo(KConfig* cfg, bool showGUI) {
+KStartupLogo* showStartupLogo(TDEConfig* cfg, bool showGUI) {
     KStartupLogo* startLogo = 0L;
 
     cfg->setGroup( "General Options" );
@@ -167,7 +167,7 @@ KStartupLogo* showStartupLogo(KConfig* cfg, bool showGUI) {
     return startLogo;
 }
 
-void initDocument(TDECmdLineArgs *args, KConfig* cfg) {
+void initDocument(TDECmdLineArgs *args, TDEConfig* cfg) {
     if ( args -> count() ) {
         UMLApp::app()->openDocumentFile( args->url( 0 ) );
     } else {
diff --git a/umbrello/umbrello/plugin.cpp b/umbrello/umbrello/plugin.cpp
index fddbb6e9..d3efb4e7 100644
--- a/umbrello/umbrello/plugin.cpp
+++ b/umbrello/umbrello/plugin.cpp
@@ -112,7 +112,7 @@ Plugin::instanceName() const
     return _instanceName;
 }
 
-KConfig *
+TDEConfig *
 Plugin::config()
 {
     return _config;
@@ -136,7 +136,7 @@ Plugin::configure()
     bool ret = true;
 
     // grab the OnStartup map
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     if(!conf) {
         kdDebug() << "no configuration for " << instanceName() << endl;
         ret = false;
diff --git a/umbrello/umbrello/plugin.h b/umbrello/umbrello/plugin.h
index da8e92df..ec26c542 100644
--- a/umbrello/umbrello/plugin.h
+++ b/umbrello/umbrello/plugin.h
@@ -30,7 +30,7 @@
 
 // forward declarations
 class TQStringList;
-class KConfig;
+class TDEConfig;
 
 /**
  * This macro replaces the K_EXPORT_COMPONENT_FACTORY macro because of
@@ -99,7 +99,7 @@ public:
     TQCString instanceName() const;
 
     /** Return the configuration record for the plugin */
-    KConfig *config();
+    TDEConfig *config();
 
     /** Return the category descriptor string */
     virtual TQString category();
@@ -157,7 +157,7 @@ private:
 protected:
     uint        _ref;           ///< Reference counter
     TQCString    _instanceName;  ///< Instance name of the plugin
-    KConfig    *_config;        ///< Configuration record
+    TDEConfig    *_config;        ///< Configuration record
 };
 }
 
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index cc262b44..f6792444 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -587,7 +587,7 @@ void UMLApp::readOptions() {
     resize( m_config->readSizeEntry("Geometry", & tmpTQSize) );
 }
 
-void UMLApp::saveProperties(KConfig *_config) {
+void UMLApp::saveProperties(TDEConfig *_config) {
     if(m_doc->URL().fileName()!=i18n("Untitled") && !m_doc->isModified()) {
         // saving to tempfile not necessary
 
@@ -603,7 +603,7 @@ void UMLApp::saveProperties(KConfig *_config) {
     }
 }
 
-void UMLApp::readProperties(KConfig* _config) {
+void UMLApp::readProperties(TDEConfig* _config) {
     TQString filename = _config->readPathEntry("filename");
     KURL url(filename);
     bool modified = _config->readBoolEntry("modified", false);
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index 2c4f59c8..dc4dcfec 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -69,7 +69,7 @@ class TQCustomEvent;
  * full session management as well as using KActions.
  * @see KMainWindow
  * @see TDEApplication
- * @see KConfig
+ * @see TDEConfig
  *
  * @author Paul Hensgen <[email protected]>
  * Bugs and comments to [email protected] or http://bugs.kde.org
@@ -402,7 +402,7 @@ protected:
      * temporary filename provided by TDEApplication.
      * @see KMainWindow#saveProperties
      */
-    virtual void saveProperties(KConfig *_cfg);
+    virtual void saveProperties(TDEConfig *_cfg);
 
     /**
      * Reads the session config file and restores the
@@ -411,7 +411,7 @@ protected:
      * saveProperties()
      * @see KMainWindow#readProperties
      */
-    virtual void readProperties(KConfig *_cfg);
+    virtual void readProperties(TDEConfig *_cfg);
 
     CodeGenerationPolicy * m_commoncodegenpolicy;
 
@@ -433,7 +433,7 @@ protected slots:
 public slots:
 
     /**
-     * Reads the activeLanguage from the KConfig and calls updateLangSelectMenu()
+     * Reads the activeLanguage from the TDEConfig and calls updateLangSelectMenu()
      */
     void initGenerator();
 
@@ -650,8 +650,8 @@ public slots:
     TQString activeLanguageScopeSeparator();
 
     /**
-     * Return the default code generation language as configured by KConfig.
-     * If the activeLanguage is not found in the KConfig then use Uml::pl_Cpp
+     * Return the default code generation language as configured by TDEConfig.
+     * If the activeLanguage is not found in the TDEConfig then use Uml::pl_Cpp
      * as the default.
      */
     Uml::Programming_Language getDefaultLanguage();
@@ -801,7 +801,7 @@ public slots:
      */
     void slotMoveTabRight();
 
-    KConfig *getConfig() { return m_config; }
+    TDEConfig *getConfig() { return m_config; }
 
     /**
      * This slot deletes the current XHTML documentation generator as soon as
@@ -866,7 +866,7 @@ private:
     /**
      * The configuration object of the application.
      */
-    KConfig* m_config;
+    TDEConfig* m_config;
 
     /**
      * View is the main widget which represents your working area.
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index edf56b23..8bff0db0 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -349,7 +349,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
     // changed to true to block recording of changes in redo-buffer
     m_bLoading = true;
     TQString tmpfile;
-    KIO::NetAccess::download( url, tmpfile, UMLApp::app() );
+    TDEIO::NetAccess::download( url, tmpfile, UMLApp::app() );
     TQFile file( tmpfile );
     if ( !file.exists() ) {
         KMessageBox::error(0, i18n("The file %1 does not exist.").arg(d.path()), i18n("Load Error"));
@@ -482,7 +482,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
     }
 
     file.close();
-    KIO::NetAccess::removeTempFile( tmpfile );
+    TDEIO::NetAccess::removeTempFile( tmpfile );
     if( !status )
     {
         KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error"));
@@ -592,7 +592,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
 
         // now we have to check, if we have to upload the file
         if ( !url.isLocalFile() ) {
-            uploaded = KIO::NetAccess::upload( tmp_tgz_file.name(), m_doc_url,
+            uploaded = TDEIO::NetAccess::upload( tmp_tgz_file.name(), m_doc_url,
                                                UMLApp::app() );
         }
 
@@ -626,10 +626,10 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
 
         // if it is a remote file, we have to upload the tmp file
         if ( !url.isLocalFile() ) {
-            uploaded = KIO::NetAccess::upload( tmpfile.name(), m_doc_url, UMLApp::app() );
+            uploaded = TDEIO::NetAccess::upload( tmpfile.name(), m_doc_url, UMLApp::app() );
         } else {
             // now remove the original file
-            if ( KIO::NetAccess::file_move( tmpfile.name(), d.path(), -1, true ) == false ) {
+            if ( TDEIO::NetAccess::file_move( tmpfile.name(), d.path(), -1, true ) == false ) {
                 KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 return false;
diff --git a/umbrello/umbrello/umlviewimageexporter.cpp b/umbrello/umbrello/umlviewimageexporter.cpp
index c669086d..6436536d 100644
--- a/umbrello/umbrello/umlviewimageexporter.cpp
+++ b/umbrello/umbrello/umlviewimageexporter.cpp
@@ -61,7 +61,7 @@ bool UMLViewImageExporter::prepareExportView() {
         }
 
         // check if the file exists
-        if (KIO::NetAccess::exists(m_imageURL, true, UMLApp::app())) {
+        if (TDEIO::NetAccess::exists(m_imageURL, true, UMLApp::app())) {
             int wantSave = KMessageBox::warningContinueCancel(0,
                                 i18n("The selected file %1 exists.\nDo you want to overwrite it?").arg(m_imageURL.prettyURL()),
                                 i18n("File Already Exists"), i18n("&Overwrite"));
diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp
index 155ba9b8..7bd5a30a 100644
--- a/umbrello/umbrello/umlviewimageexportermodel.cpp
+++ b/umbrello/umbrello/umlviewimageexportermodel.cpp
@@ -153,7 +153,7 @@ TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &im
 
     // if the file wasn't local, upload the temp file to the target
     if (!url.isLocalFile()) {
-        if (!KIO::NetAccess::upload(tmpFile.name(), url, UMLApp::app())) {
+        if (!TDEIO::NetAccess::upload(tmpFile.name(), url, UMLApp::app())) {
             tmpFile.unlink();
             return i18n("There was a problem saving file: %1").arg(url.path());
         }
@@ -198,9 +198,9 @@ bool UMLViewImageExporterModel::prepareDirectory(const KURL &url) const {
     for (TQStringList::ConstIterator it = dirs.begin() ; it != dirs.end(); ++it ) {
         directory.addPath(*it);
 
-        if (!KIO::NetAccess::exists(directory, true, UMLApp::app())) {
+        if (!TDEIO::NetAccess::exists(directory, true, UMLApp::app())) {
 
-            if (!KIO::NetAccess::mkdir(directory, UMLApp::app())) {
+            if (!TDEIO::NetAccess::mkdir(directory, UMLApp::app())) {
                 return false;
             }
         }