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

27 files changed, 100 insertions, 100 deletions

diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 9bf1c4150..6dbde4a7e 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -352,7 +352,7 @@ bool KateApp::openInput (const TQString &text)
   return true;
 }
 
-KateMainWindow *KateApp::newMainWindow (KConfig *sconfig, const TQString &sgroup)
+KateMainWindow *KateApp::newMainWindow (TDEConfig *sconfig, const TQString &sgroup)
 {
   KateMainWindow *mainWindow = new KateMainWindow (sconfig, sgroup);
   m_mainWindows.push_back (mainWindow);
diff --git a/kate/app/kateapp.h b/kate/app/kateapp.h
index fb7d30f5b..e18dba866 100644
--- a/kate/app/kateapp.h
+++ b/kate/app/kateapp.h
@@ -140,7 +140,7 @@ class KDE_EXPORT KateApp : public TDEApplication
      * @param sgroup session group for this window
      * @return new constructed main window
      */
-    KateMainWindow *newMainWindow (KConfig *sconfig = 0, const TQString &sgroup = "");
+    KateMainWindow *newMainWindow (TDEConfig *sconfig = 0, const TQString &sgroup = "");
 
     /**
      * removes the mainwindow given, DOES NOT DELETE IT
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 1433d95be..afa77b6a5 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -68,7 +68,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
                  parent,
                  "configdialog" )
 {
-  KConfig *config = KateApp::self()->config();
+  TDEConfig *config = KateApp::self()->config();
 
   KWin::setIcons( winId(), KateApp::self()->icon(), KateApp::self()->miniIcon() );
 
@@ -372,7 +372,7 @@ void KateConfigDialog::slotOk()
 
 void KateConfigDialog::slotApply()
 {
-  KConfig *config = KateApp::self()->config();
+  TDEConfig *config = KateApp::self()->config();
 
   // if data changed apply the kate app stuff
   if( dataChanged )
diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp
index f23d5abba..8e895e019 100644
--- a/kate/app/katedocmanager.cpp
+++ b/kate/app/katedocmanager.cpp
@@ -60,7 +60,7 @@ KateDocManager::KateDocManager (TQObject *parent)
 
   m_dcop = new KateDocManagerDCOPIface (this);
 
-  m_metaInfos = new KConfig("metainfos", false, false, "appdata");
+  m_metaInfos = new TDEConfig("metainfos", false, false, "appdata");
 
   createDoc ();
 }
@@ -315,7 +315,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL)
                 "Do you want to delete it anyway?").arg(m_tempFiles[ documentNumber ].first.prettyURL()),
             i18n("Delete File?") ) == KMessageBox::Yes*/ )
     {
-      KIO::del( m_tempFiles[ documentNumber ].first, false, false );
+      TDEIO::del( m_tempFiles[ documentNumber ].first, false, false );
       kdDebug(13001)<<"Deleted temporary file "<<m_tempFiles[ documentNumber ].first<<endl;
       m_tempFiles.remove( documentNumber );
     }
@@ -444,7 +444,7 @@ void KateDocManager::saveAll()
       ((Kate::View*)it.current()->views().first())->save();
 }
 
-void KateDocManager::saveDocumentList (KConfig* config)
+void KateDocManager::saveDocumentList (TDEConfig* config)
 {
   TQString prevGrp=config->group();
   config->setGroup ("Open Documents");
@@ -466,7 +466,7 @@ void KateDocManager::saveDocumentList (KConfig* config)
   config->setGroup(prevGrp);
 }
 
-void KateDocManager::restoreDocumentList (KConfig* config)
+void KateDocManager::restoreDocumentList (TDEConfig* config)
 {
   TQString prevGrp=config->group();
   config->setGroup ("Open Documents");
diff --git a/kate/app/katedocmanager.h b/kate/app/katedocmanager.h
index 25b1ba631..1eaef7f99 100644
--- a/kate/app/katedocmanager.h
+++ b/kate/app/katedocmanager.h
@@ -36,7 +36,7 @@
 
 namespace KParts { class Factory; }
 
-class KConfig;
+class TDEConfig;
 class DCOPObject;
 
 class KateDocumentInfo
@@ -104,8 +104,8 @@ class KateDocManager : public TQObject
     TQPtrList<Kate::Document> modifiedDocumentList();
     bool queryCloseDocuments(KateMainWindow *w);
 
-    void saveDocumentList (class KConfig *config);
-    void restoreDocumentList (class KConfig *config);
+    void saveDocumentList (class TDEConfig *config);
+    void restoreDocumentList (class TDEConfig *config);
 
     DCOPObject *dcopObject () { return m_dcop; };
 
@@ -143,7 +143,7 @@ class KateDocManager : public TQObject
     TQPtrDict<KateDocumentInfo> m_docInfos;
     TQMap<uint,TPair> m_tempFiles;
     TQGuardedPtr<Kate::Document> m_currentDoc;
-    KConfig *m_metaInfos;
+    TDEConfig *m_metaInfos;
     bool m_saveMetaInfos;
     int m_daysMetaInfos;
 
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index ec1e92847..1ceab8a23 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -151,7 +151,7 @@ void KateExternalToolsCommand::reload () {
   m_list.clear();
   m_map.clear();
 
-  KConfig config("externaltools", false, false, "appdata");
+  TDEConfig config("externaltools", false, false, "appdata");
   config.setGroup("Global");
   TQStringList tools = config.readListEntry("tools");
 
@@ -312,7 +312,7 @@ void KateExternalToolsMenuAction::reload()
   popupMenu()->clear();
 
   // load all the tools, and create a action for each of them
-  KConfig *config = new KConfig( "externaltools", false, false, "appdata" );
+  TDEConfig *config = new TDEConfig( "externaltools", false, false, "appdata" );
   config->setGroup( "Global" );
   TQStringList tools = config->readListEntry( "tools" );
 
@@ -601,7 +601,7 @@ KateExternalToolsConfigWidget::KateExternalToolsConfigWidget( TQWidget *parent,
   TQWhatsThis::add( lbTools, i18n(
       "This list shows all the configured tools, represented by their menu text.") );
 
-  config = new KConfig("externaltools", false, false, "appdata");
+  config = new TDEConfig("externaltools", false, false, "appdata");
   reload();
   slotSelectionChanged();
 }
@@ -616,7 +616,7 @@ void KateExternalToolsConfigWidget::reload()
   //m_tools.clear();
   lbTools->clear();
 
-  // load the files from a KConfig
+  // load the files from a TDEConfig
   config->setGroup( "Global" );
   TQStringList tools = config->readListEntry("tools");
 
diff --git a/kate/app/kateexternaltools.h b/kate/app/kateexternaltools.h
index 507e1cfca..1d88ab847 100644
--- a/kate/app/kateexternaltools.h
+++ b/kate/app/kateexternaltools.h
@@ -171,7 +171,7 @@ class KateExternalToolsConfigWidget : public Kate::ConfigPage
     class KListBox *lbTools;
     class TQPushButton *btnNew, *btnRemove, *btnEdit, *btnMoveUp, *btnMoveDwn;
 
-    class KConfig *config;
+    class TDEConfig *config;
 
     bool m_changed;
 };
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index cda0d6b00..f956c9ea5 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -480,7 +480,7 @@ void KateFileList::updateSort ()
   updateFileListLocations();
 }
 
-void KateFileList::readConfig( KConfig *config, const TQString &group )
+void KateFileList::readConfig( TDEConfig *config, const TQString &group )
 {
   TQString oldgroup = config->group();
   config->setGroup( group );
@@ -495,7 +495,7 @@ void KateFileList::readConfig( KConfig *config, const TQString &group )
   config->setGroup( oldgroup );
 }
 
-void KateFileList::writeConfig( KConfig *config, const TQString &group )
+void KateFileList::writeConfig( TDEConfig *config, const TQString &group )
 {
   TQString oldgroup = config->group();
   config->setGroup( group );
@@ -715,7 +715,7 @@ void KFLConfigPage::apply()
 void KFLConfigPage::reload()
 {
   // read in from config file
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "Filelist" );
   cbEnableShading->setChecked( config->readBoolEntry("Shading Enabled", &m_filelist->m_enableBgShading ) );
   kcbViewShade->setColor( config->readColorEntry("View Shade", &m_filelist->m_viewShade ) );
diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h
index 76403c1e8..dd166b460 100644
--- a/kate/app/katefilelist.h
+++ b/kate/app/katefilelist.h
@@ -102,8 +102,8 @@ class KateFileList : public KListView
     TQColor viewShade() const { return m_viewShade; }
     bool shadingEnabled() { return m_enableBgShading; }
 
-    void readConfig( class KConfig *config, const TQString &group );
-    void writeConfig( class KConfig *config, const TQString &group );
+    void readConfig( class TDEConfig *config, const TQString &group );
+    void writeConfig( class TDEConfig *config, const TQString &group );
 
     /**
      * reimplemented to remove the item from the history stacks
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index de2b617a5..0482b2739 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -216,7 +216,7 @@ KateFileSelector::~KateFileSelector()
 
 //BEGIN Public Methods
 
-void KateFileSelector::readConfig(KConfig *config, const TQString & name)
+void KateFileSelector::readConfig(TDEConfig *config, const TQString & name)
 {
   dir->setViewConfig( config, name + ":view" );
   dir->readConfig(config, name + ":dir");
@@ -258,7 +258,7 @@ void KateFileSelector::initialDirChangeHack()
   setDir( waitingDir );
 }
 
-void KateFileSelector::setupToolbar( KConfig *config )
+void KateFileSelector::setupToolbar( TDEConfig *config )
 {
   toolbar->clear();
   TQStringList tbactions = config->readListEntry( "toolbar actions", ',' );
@@ -279,7 +279,7 @@ void KateFileSelector::setupToolbar( KConfig *config )
   }
 }
 
-void KateFileSelector::writeConfig(KConfig *config, const TQString & name)
+void KateFileSelector::writeConfig(TDEConfig *config, const TQString & name)
 {
   dir->writeConfig(config,name + ":dir");
 
@@ -630,7 +630,7 @@ void KFSConfigPage::apply()
 
   m_changed = false;
 
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "fileselector" );
   // toolbar
   TQStringList l;
@@ -672,7 +672,7 @@ void KFSConfigPage::reload()
 }
 void KFSConfigPage::init()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup( "fileselector" );
   // toolbar
   TQStringList l = config->readListEntry( "toolbar actions", ',' );
diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h
index 285418d64..7a6f9c728 100644
--- a/kate/app/katefileselector.h
+++ b/kate/app/katefileselector.h
@@ -83,9 +83,9 @@ class KateFileSelector : public TQVBox
                       TQWidget * parent = 0, const char * name = 0 );
     ~KateFileSelector();
 
-    void readConfig( KConfig *, const TQString & );
-    void writeConfig( KConfig *, const TQString & );
-    void setupToolbar( KConfig * );
+    void readConfig( TDEConfig *, const TQString & );
+    void writeConfig( TDEConfig *, const TQString & );
+    void setupToolbar( TDEConfig * );
     void setView( KFile::FileView );
     KDirOperator *dirOperator(){ return dir; }
     KActionCollection *actionCollection() { return mActionCollection; };
diff --git a/kate/app/kategrepdialog.h b/kate/app/kategrepdialog.h
index 0d8d48366..a3cbbc871 100644
--- a/kate/app/kategrepdialog.h
+++ b/kate/app/kategrepdialog.h
@@ -31,7 +31,7 @@ class TQListBox;
 class KPushButton;
 class TQLabel;
 class TDEProcess;
-class KConfig;
+class TDEConfig;
 class KURLRequester;
 class TQEvent;
 
@@ -85,7 +85,7 @@ private:
     TDEProcess *childproc;
     TQString buf;
     TQString errbuf;
-    KConfig* config;
+    TDEConfig* config;
     TQStringList lastSearchItems;
     TQStringList lastSearchPaths;
     TQStringList lastSearchFiles;
diff --git a/kate/app/katemain.h b/kate/app/katemain.h
index 5c9c3d1b9..6a6eaedbc 100644
--- a/kate/app/katemain.h
+++ b/kate/app/katemain.h
@@ -38,7 +38,7 @@ class TQWidgetStack;
 
 class KAction;
 class KActionMenu;
-class KConfig;
+class TDEConfig;
 class KDirOperator;
 class KEditToolbar;
 class KFileViewItem;
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index cc19881cb..e0967695e 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -86,7 +86,7 @@
 
 uint KateMainWindow::uniqueID = 1;
 
-KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
+KateMainWindow::KateMainWindow (TDEConfig *sconfig, const TQString &sgroup)
   : KateMDI::MainWindow (0,(TQString(TQString("__KateMainWindow#%1").arg(uniqueID))).latin1())
 {
   // first the very important id
@@ -402,7 +402,7 @@ void KateMainWindow::slotFileQuit()
 
 void KateMainWindow::readOptions ()
 {
-  KConfig *config = KateApp::self()->config ();
+  TDEConfig *config = KateApp::self()->config ();
 
   config->setGroup("General");
   syncKonsole =  config->readBoolEntry("Sync Konsole", true);
@@ -420,7 +420,7 @@ void KateMainWindow::readOptions ()
 
 void KateMainWindow::saveOptions ()
 {
-  KConfig *config = KateApp::self()->config ();
+  TDEConfig *config = KateApp::self()->config ();
 
   config->setGroup("General");
 
@@ -553,7 +553,7 @@ void KateMainWindow::editKeys()
     }
   }
 
-  externalTools->actionCollection()->writeShortcutSettings( "Shortcuts", new KConfig("externaltools", false, false, "appdata") );
+  externalTools->actionCollection()->writeShortcutSettings( "Shortcuts", new TDEConfig("externaltools", false, false, "appdata") );
 }
 
 void KateMainWindow::openURL (const TQString &name)
@@ -823,7 +823,7 @@ void KateMainWindow::updateCaption (Kate::Document *doc)
       m_viewManager->activeView()->getDoc()->isModified());
 }
 
-void KateMainWindow::saveProperties(KConfig *config)
+void KateMainWindow::saveProperties(TDEConfig *config)
 {
   TQString grp=config->group();
 
@@ -833,7 +833,7 @@ void KateMainWindow::saveProperties(KConfig *config)
   config->setGroup(grp);
 }
 
-void KateMainWindow::readProperties(KConfig *config)
+void KateMainWindow::readProperties(TDEConfig *config)
 {
   TQString grp=config->group();
 
@@ -844,7 +844,7 @@ void KateMainWindow::readProperties(KConfig *config)
   config->setGroup(grp);
 }
 
-void KateMainWindow::saveGlobalProperties( KConfig* sessionConfig )
+void KateMainWindow::saveGlobalProperties( TDEConfig* sessionConfig )
 {
   KateDocManager::self()->saveDocumentList (sessionConfig);
 
diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h
index 77db9999c..f6b20dfa5 100644
--- a/kate/app/katemainwindow.h
+++ b/kate/app/katemainwindow.h
@@ -58,7 +58,7 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
      * @param sconfig session config for this window, 0 if none
      * @param sgroup session config group to use
      */
-    KateMainWindow (KConfig *sconfig, const TQString &sgroup);
+    KateMainWindow (TDEConfig *sconfig, const TQString &sgroup);
 
     /**
      * Destruct the nice window
@@ -102,9 +102,9 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
     KateTabWidget *tabWidget ();
 
   public:
-    void readProperties(KConfig *config);
-    void saveProperties(KConfig *config);
-    void saveGlobalProperties( KConfig* sessionConfig );
+    void readProperties(TDEConfig *config);
+    void saveProperties(TDEConfig *config);
+    void saveGlobalProperties( TDEConfig* sessionConfig );
 
   public:
     bool queryClose_internal();
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 4220a4b15..874639652 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -167,7 +167,7 @@ void GUIClient::registerToolView (ToolView *tv)
 
   // try to read the action shortcut
   KShortcut sc;
-  KConfig *cfg = kapp->config();
+  TDEConfig *cfg = kapp->config();
   TQString _grp = cfg->group();
   cfg->setGroup("Shortcuts");
   sc = KShortcut( cfg->readEntry( aname, "" ) );
@@ -542,7 +542,7 @@ class TmpToolViewSorter
     unsigned int pos;
 };
 
-void Sidebar::restoreSession (KConfig *config)
+void Sidebar::restoreSession (TDEConfig *config)
 {
   // get the last correct placed toolview
   unsigned int firstWrong = 0;
@@ -637,7 +637,7 @@ void Sidebar::restoreSession (KConfig *config)
     m_ownSplit->hide();
 }
 
-void Sidebar::saveSession (KConfig *config)
+void Sidebar::saveSession (TDEConfig *config)
 {
   // store the own splitter sizes
   TQValueList<int> s = m_ownSplit->sizes();
@@ -847,7 +847,7 @@ bool MainWindow::hideToolView (ToolView *widget)
   return widget->sidebar()->hideWidget (widget);
 }
 
-void MainWindow::startRestore (KConfig *config, const TQString &group)
+void MainWindow::startRestore (TDEConfig *config, const TQString &group)
 {
   // first save this stuff
   m_restoreConfig = config;
@@ -929,7 +929,7 @@ void MainWindow::finishRestore ()
   m_restoreGroup = "";
 }
 
-void MainWindow::saveSession (KConfig *config, const TQString &group)
+void MainWindow::saveSession (TDEConfig *config, const TQString &group)
 {
   if (!config)
     return;
diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h
index 57ccd325f..e4649e7f4 100644
--- a/kate/app/katemdi.h
+++ b/kate/app/katemdi.h
@@ -207,13 +207,13 @@ class Sidebar : public KMultiTabBar
      * restore the current session config from given object, use current group
      * @param config config object to use
      */
-    void restoreSession (KConfig *config);
+    void restoreSession (TDEConfig *config);
 
      /**
      * save the current session config to given object, use current group
      * @param config config object to use
      */
-    void saveSession (KConfig *config);
+    void saveSession (TDEConfig *config);
 
   public slots:
     // reimplemented, to block a show() call if we have no children or if
@@ -370,7 +370,7 @@ class MainWindow : public KParts::MainWindow
      * @param config config object to use
      * @param group config group to use
      */
-    void startRestore (KConfig *config, const TQString &group);
+    void startRestore (TDEConfig *config, const TQString &group);
 
     /**
      * finish the restore
@@ -382,7 +382,7 @@ class MainWindow : public KParts::MainWindow
      * @param config config object to use
      * @param group config group to use
      */
-    void saveSession (KConfig *config, const TQString &group);
+    void saveSession (TDEConfig *config, const TQString &group);
 
   /**
    * internal data ;)
@@ -428,7 +428,7 @@ class MainWindow : public KParts::MainWindow
      * config object for session restore, only valid between
      * start and finish restore calls
      */
-    KConfig *m_restoreConfig;
+    TDEConfig *m_restoreConfig;
 
     /**
      * restore group
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index e21b9f29b..104c4abda 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -169,7 +169,7 @@ bool KateSession::rename (const TQString &name)
 
   m_sessionName = name;
 
-  KConfig config (sessionFile (), false, false);
+  TDEConfig config (sessionFile (), false, false);
   config.setGroup ("General");
   config.writeEntry ("Name", m_sessionName);
   config.sync ();
@@ -177,7 +177,7 @@ bool KateSession::rename (const TQString &name)
   return true;
 }
 
-KConfig *KateSession::configRead ()
+TDEConfig *KateSession::configRead ()
 {
   if (m_sessionFileRel.isEmpty())
     return 0;
@@ -188,7 +188,7 @@ KConfig *KateSession::configRead ()
   return m_readConfig = new KSimpleConfig (sessionFile (), true);
 }
 
-KConfig *KateSession::configWrite ()
+TDEConfig *KateSession::configWrite ()
 {
   if (m_sessionFileRel.isEmpty())
     return 0;
@@ -288,7 +288,7 @@ void KateSessionManager::activateSession (KateSession::Ptr session, bool closeLa
     // open the new session
     Kate::Document::setOpenErrorDialogsActivated (false);
 
-    KConfig *sc = activeSession()->configRead();
+    TDEConfig *sc = activeSession()->configRead();
 
     if (sc)
       KateApp::self()->documentManager()->restoreDocumentList (sc);
@@ -301,7 +301,7 @@ void KateSessionManager::activateSession (KateSession::Ptr session, bool closeLa
     // window config
     if (sc)
     {
-      KConfig *c = KateApp::self()->config();
+      TDEConfig *c = KateApp::self()->config();
       c->setGroup("General");
 
       if (c->readBoolEntry("Restore Window Configuration", true))
@@ -371,7 +371,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast)
   if (tryAsk)
   {
     // app config
-    KConfig *c = KateApp::self()->config();
+    TDEConfig *c = KateApp::self()->config();
     c->setGroup("General");
 
     TQString sesExit (c->readEntry ("Session Exit", "save"));
@@ -407,7 +407,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast)
     }
   }
 
-  KConfig *sc = activeSession()->configWrite();
+  TDEConfig *sc = activeSession()->configWrite();
 
   if (!sc)
     return false;
@@ -428,7 +428,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast)
 
   if (rememberAsLast)
   {
-    KConfig *c = KateApp::self()->config();
+    TDEConfig *c = KateApp::self()->config();
     c->setGroup("General");
     c->writeEntry ("Last Session", activeSession()->sessionFileRelative());
     c->sync ();
@@ -442,7 +442,7 @@ bool KateSessionManager::chooseSession ()
   bool success = true;
 
   // app config
-  KConfig *c = KateApp::self()->config();
+  TDEConfig *c = KateApp::self()->config();
   c->setGroup("General");
 
   // get last used session, default to default session
diff --git a/kate/app/katesession.h b/kate/app/katesession.h
index 412207b28..e636294e3 100644
--- a/kate/app/katesession.h
+++ b/kate/app/katesession.h
@@ -109,7 +109,7 @@ class KateSession  : public KShared
      * return 0 if we have no file to read config from atm
      * @return config to read from
      */
-    KConfig *configRead ();
+    TDEConfig *configRead ();
 
     /**
      * config to write
@@ -117,7 +117,7 @@ class KateSession  : public KShared
      * return 0 if we have no file to write config to atm
      * @return config to write from
      */
-    KConfig *configWrite ();
+    TDEConfig *configWrite ();
 
     /**
      * count of documents in this session
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index d77ad0c3e..296c083b2 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -463,7 +463,7 @@ void KateViewManager::setShowFullPath( bool enable )
  * session config functions
  */
 // FIXME 3.0 - make those config goups more streamlined: "objN:objN..."
-void KateViewManager::saveViewConfiguration(KConfig *config,const TQString& grp)
+void KateViewManager::saveViewConfiguration(TDEConfig *config,const TQString& grp)
 {
   // Use the same group name for view configuration as usual for sessions.
   // (When called by session manager grp is a 1-based index for the main window)
@@ -481,7 +481,7 @@ void KateViewManager::saveViewConfiguration(KConfig *config,const TQString& grp)
   }
 }
 
-void KateViewManager::restoreViewConfiguration (KConfig *config, const TQString& grp)
+void KateViewManager::restoreViewConfiguration (TDEConfig *config, const TQString& grp)
 {
   // Use the same group name for view configuration as usual for sessions.
   // (When called by session manager grp is a 1-based index for the main window)
diff --git a/kate/app/kateviewmanager.h b/kate/app/kateviewmanager.h
index 6bf1b5f77..01df13492 100644
--- a/kate/app/kateviewmanager.h
+++ b/kate/app/kateviewmanager.h
@@ -31,7 +31,7 @@
 class KateMainWindow;
 class KateViewSpaceContainer;
 
-class KConfig;
+class TDEConfig;
 class KAction;
 
 class TQToolButton;
@@ -60,10 +60,10 @@ class KateViewManager : public TQObject
 
   public:
     /* This will save the splitter configuration */
-    void saveViewConfiguration(KConfig *config,const TQString& group);
+    void saveViewConfiguration(TDEConfig *config,const TQString& group);
 
     /* restore it */
-    void restoreViewConfiguration (KConfig *config,const TQString& group);
+    void restoreViewConfiguration (TDEConfig *config,const TQString& group);
 
     uint openURL (const KURL &url, const TQString& encoding, bool activate = true, bool isTempFile=false);
 
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index 33f87e7c0..e8ba58ee5 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -233,7 +233,7 @@ void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr,
   mStatusBar->setStatus( r, c, ovr, block, mod, msg );
 }
 
-void KateViewSpace::saveConfig ( KConfig* config, int myIndex ,const TQString& viewConfGrp)
+void KateViewSpace::saveConfig ( TDEConfig* config, int myIndex ,const TQString& viewConfGrp)
 {
 //   kdDebug()<<"KateViewSpace::saveConfig("<<myIndex<<", "<<viewConfGrp<<") - currentView: "<<currentView()<<")"<<endl;
   TQString group = TQString(viewConfGrp+"-ViewSpace %1").arg( myIndex );
@@ -272,7 +272,7 @@ void KateViewSpace::modifiedOnDisc(Kate::Document *, bool, unsigned char)
     mStatusBar->updateMod( currentView()->getDoc()->isModified() );
 }
 
-void KateViewSpace::restoreConfig ( KateViewSpaceContainer *viewMan, KConfig* config, const TQString &group )
+void KateViewSpace::restoreConfig ( KateViewSpaceContainer *viewMan, TDEConfig* config, const TQString &group )
 {
   config->setGroup (group);
   TQString fn = config->readEntry( "Active View" );
diff --git a/kate/app/kateviewspace.h b/kate/app/kateviewspace.h
index 2c82332d3..0407d35fe 100644
--- a/kate/app/kateviewspace.h
+++ b/kate/app/kateviewspace.h
@@ -33,7 +33,7 @@
 
 class KVSSBSep;
 
-class KConfig;
+class TDEConfig;
 class KSqueezedTextLabel;
 class KateViewSpaceContainer;
 
@@ -88,8 +88,8 @@ class KateViewSpace : public TQVBox
     Kate::View* currentView();
     int viewCount() const { return mViewList.count(); }
 
-    void saveConfig (KConfig* config, int myIndex,const TQString& viewConfGrp);
-    void restoreConfig ( class KateViewSpaceContainer *viewMan, KConfig* config, const TQString &group );
+    void saveConfig (TDEConfig* config, int myIndex,const TQString& viewConfGrp);
+    void restoreConfig ( class KateViewSpaceContainer *viewMan, TDEConfig* config, const TQString &group );
 
 
   protected:
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index 8f4e3886c..d68c42724 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -602,7 +602,7 @@ void KateViewSpaceContainer::setShowFullPath( bool enable )
  * session config functions
  */
 
-void KateViewSpaceContainer::saveViewConfiguration(KConfig *config,const TQString& group)
+void KateViewSpaceContainer::saveViewConfiguration(TDEConfig *config,const TQString& group)
 {
   bool weHaveSplittersAlive (viewSpaceCount() > 1);
 
@@ -629,7 +629,7 @@ void KateViewSpaceContainer::saveViewConfiguration(KConfig *config,const TQStrin
   delete l;
 }
 
-void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQString& group)
+void KateViewSpaceContainer::restoreViewConfiguration (TDEConfig *config, const TQString& group)
 {
   config->setGroup(group);
   //config->setGroup ("View Configuration");
@@ -665,7 +665,7 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQ
 }
 
 
-void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, KConfig* config, const TQString& viewConfGrp )
+void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, TDEConfig* config, const TQString& viewConfGrp )
 {
   TQString grp = TQString(viewConfGrp+"-Splitter %1").arg(idx);
   config->setGroup(grp);
@@ -712,7 +712,7 @@ void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx,
   config->writeEntry("Children", childList);
 }
 
-void KateViewSpaceContainer::restoreSplitter( KConfig* config, const TQString &group, TQWidget* parent, const TQString& viewConfGrp)
+void KateViewSpaceContainer::restoreSplitter( TDEConfig* config, const TQString &group, TQWidget* parent, const TQString& viewConfGrp)
 {
   config->setGroup( group );
 
diff --git a/kate/app/kateviewspacecontainer.h b/kate/app/kateviewspacecontainer.h
index 0c6b33246..2f1fa5372 100644
--- a/kate/app/kateviewspacecontainer.h
+++ b/kate/app/kateviewspacecontainer.h
@@ -29,7 +29,7 @@
 
 #include "katemdi.h"
 
-class KConfig;
+class TDEConfig;
 class KateMainWindow;
 
 class KateViewSpaceContainer: public TQVBox
@@ -48,10 +48,10 @@ class KateViewSpaceContainer: public TQVBox
 
   public:
     /* This will save the splitter configuration */
-    void saveViewConfiguration(KConfig *config,const TQString& group);
+    void saveViewConfiguration(TDEConfig *config,const TQString& group);
 
     /* restore it */
-    void restoreViewConfiguration (KConfig *config,const TQString& group);
+    void restoreViewConfiguration (TDEConfig *config,const TQString& group);
 
   private:
     /**
@@ -69,12 +69,12 @@ class KateViewSpaceContainer: public TQVBox
      * If child splitters are found, it calls it self with those as the argument.
      * If a viewspace child is found, it is asked to save its filelist.
      */
-    void saveSplitterConfig(KateMDI::Splitter* s, int idx=0, KConfig* config=0L, const TQString& viewConfGrp="");
+    void saveSplitterConfig(KateMDI::Splitter* s, int idx=0, TDEConfig* config=0L, const TQString& viewConfGrp="");
 
     /** Restore a single splitter.
      * This is all the work is done for @see saveSplitterConfig()
      */
-    void restoreSplitter ( KConfig* config, const TQString &group, TQWidget* parent , const TQString& viewConfGrp);
+    void restoreSplitter ( TDEConfig* config, const TQString &group, TQWidget* parent , const TQString& viewConfGrp);
 
     void removeViewSpace (KateViewSpace *viewspace);
 
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 152a96b98..114cfb6a4 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -248,7 +248,7 @@ void KWrite::slotOpen( const KURL& url )
 {
   if (url.isEmpty()) return;
 
-  if (!KIO::NetAccess::exists(url, true, this))
+  if (!TDEIO::NetAccess::exists(url, true, this))
   {
     KMessageBox::error (this, i18n("The given file could not be read, check if it exists or if it is readable for the current user."));
     return;
@@ -395,7 +395,7 @@ void KWrite::slotEnableActions( bool enable )
 }
 
 //common config
-void KWrite::readConfig(KConfig *config)
+void KWrite::readConfig(TDEConfig *config)
 {
   config->setGroup("General Options");
 
@@ -413,7 +413,7 @@ void KWrite::readConfig(KConfig *config)
     statusBar()->hide();
 }
 
-void KWrite::writeConfig(KConfig *config)
+void KWrite::writeConfig(TDEConfig *config)
 {
   config->setGroup("General Options");
 
@@ -431,23 +431,23 @@ void KWrite::writeConfig(KConfig *config)
 //config file
 void KWrite::readConfig()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   readConfig(config);
 }
 
 void KWrite::writeConfig()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   writeConfig(config);
 }
 
 // session management
-void KWrite::restore(KConfig *config, int n)
+void KWrite::restore(TDEConfig *config, int n)
 {
   readPropertiesInternal(config, n);
 }
 
-void KWrite::readProperties(KConfig *config)
+void KWrite::readProperties(TDEConfig *config)
 {
   readConfig(config);
 
@@ -455,7 +455,7 @@ void KWrite::readProperties(KConfig *config)
     KTextEditor::sessionConfigInterface(m_view)->readSessionConfig(config);
 }
 
-void KWrite::saveProperties(KConfig *config)
+void KWrite::saveProperties(TDEConfig *config)
 {
   writeConfig(config);
   config->writeEntry("DocumentNumber",docList.find(m_view->document()) + 1);
@@ -464,7 +464,7 @@ void KWrite::saveProperties(KConfig *config)
     KTextEditor::sessionConfigInterface(m_view)->writeSessionConfig(config);
 }
 
-void KWrite::saveGlobalProperties(KConfig *config) //save documents
+void KWrite::saveGlobalProperties(TDEConfig *config) //save documents
 {
   config->setGroup("Number");
   config->writeEntry("NumberOfDocuments",docList.count());
@@ -492,7 +492,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents
 //restore session
 void KWrite::restore()
 {
-  KConfig *config = kapp->sessionConfig();
+  TDEConfig *config = kapp->sessionConfig();
 
   if (!config)
     return;
diff --git a/kate/app/kwritemain.h b/kate/app/kwritemain.h
index 3e2abe860..0d0ee79f0 100644
--- a/kate/app/kwritemain.h
+++ b/kate/app/kwritemain.h
@@ -91,21 +91,21 @@ class KWrite : public KParts::MainWindow
 
   //config file functions
   public:
-    void readConfig (KConfig *);
-    void writeConfig (KConfig *);
+    void readConfig (TDEConfig *);
+    void writeConfig (TDEConfig *);
 
     void readConfig ();
     void writeConfig ();
 
   //session management
   public:
-    void restore(KConfig *,int);
+    void restore(TDEConfig *,int);
     static void restore();
 
   private:
-    void readProperties(KConfig *);
-    void saveProperties(KConfig *);
-    void saveGlobalProperties(KConfig *);
+    void readProperties(TDEConfig *);
+    void saveProperties(TDEConfig *);
+    void saveGlobalProperties(TDEConfig *);
 
   private:
     KTextEditor::View * m_view;