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

doc/ksplashml/index.docbook

@@ -814,7 +814,7 @@ class Cfg2k: public ThemeEngineConfig
 {
   Q_OBJECT
 public:
-  Cfg2k( KConfig * );
+  Cfg2k( TDEConfig * );
 };
 
 class ObjKsTheme;
@@ -828,7 +828,7 @@ public:
   {
     return( QString("KSplash2k") );
   }
-  inline const KDialogBase *config( KConfig *kc )
+  inline const KDialogBase *config( TDEConfig *kc )
   {
     return new Cfg2k( kc );
   }
@@ -924,7 +924,7 @@ void Theme2k::readSettings()
   if( !mTheme )
     return;
 
-  KConfig *cfg = mTheme->themeConfig();
+  TDEConfig *cfg = mTheme->themeConfig();
   if( !cfg )
     return;
 
@@ -1099,7 +1099,7 @@ appropriate plugin.</para>
 
 K_EXPORT_COMPONENT_FACTORY( ksplash2k, KGenericFactory&lt;Theme2k&gt; );
 
-Cfg2k::Cfg2k( KConfig * )
+Cfg2k::Cfg2k( TDEConfig * )
 {}
 
 Theme2k::Theme2k( QWidget *parent, const char *name, const QStringList &amp;args
@@ -1164,7 +1164,7 @@ void Theme2k::readSettings()
   if( !mTheme )
     return;
 
-  KConfig *cfg = mTheme-&gt;themeConfig();
+  TDEConfig *cfg = mTheme-&gt;themeConfig();
   if( !cfg )
     return;
 

drkonqi/debugger.cpp

@@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger()
 bool KrashDebugger::performChecks( TQString* msg )
 {
   bool ret = true;
-  KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
+  TDEConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
   kdedcfg.setGroup( "General" );
   if( kdedcfg.readBoolEntry( "DelayedCheck", false ))
   {

drkonqi/krashconf.cpp

@@ -88,7 +88,7 @@ void KrashConfig :: readConfig()
     KStartupInfo::sendFinish( id );
   }
 
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("drkonqi");
 
   // maybe we should check if it's relative?
@@ -98,7 +98,7 @@ void KrashConfig :: readConfig()
   TQString debuggername = config->readEntry("Debugger",
                                            TQString::fromLatin1("gdb"));
 
-  KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername),
+  TDEConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername),
                     true, false, "appdata");
 
   debuggers.setGroup("General");
@@ -112,7 +112,7 @@ void KrashConfig :: readConfig()
   m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp");
   m_kcrashRegExp = debuggers.readEntry("KCrashRegExp");
 
-  KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
+  TDEConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
                  true, false, "appdata");
 
   preset.setGroup("ErrorDescription");

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);

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

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 )

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");

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;
 

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");
 

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;
 };

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 ) );

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

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", ',' );

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; };

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;

kate/app/katemain.h

@@ -38,7 +38,7 @@ class TQWidgetStack;
 
 class KAction;
 class KActionMenu;
-class KConfig;
+class TDEConfig;
 class KDirOperator;
 class KEditToolbar;
 class KFileViewItem;

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);
 

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();

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;

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

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

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

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)

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);
 

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" );

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:

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 );
 

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);
 

kate/app/kwritemain.cpp

@@ -248,7 +248,7 @@ void KWrite::slotOpen( const KURL& url )