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

19 files changed, 96 insertions, 96 deletions

diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index ef6da69c1..81b001c3c 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -114,7 +114,7 @@ KateDocumentConfig::KateDocumentConfig ()
   m_pluginsSet.fill (true);
 
   // init with defaults from config or really hardcoded ones
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("Kate Document Defaults");
   readConfig (config);
 }
@@ -149,7 +149,7 @@ KateDocumentConfig::~KateDocumentConfig ()
 {
 }
 
-void KateDocumentConfig::readConfig (KConfig *config)
+void KateDocumentConfig::readConfig (TDEConfig *config)
 {
   configStart ();
 
@@ -191,7 +191,7 @@ void KateDocumentConfig::readConfig (KConfig *config)
   configEnd ();
 }
 
-void KateDocumentConfig::writeConfig (KConfig *config)
+void KateDocumentConfig::writeConfig (TDEConfig *config)
 {
   config->writeEntry("Tab Width", tabWidth());
 
@@ -631,7 +631,7 @@ KateViewConfig::KateViewConfig ()
   s_global = this;
 
   // init with defaults from config or really hardcoded ones
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("Kate View Defaults");
   readConfig (config);
 }
@@ -660,7 +660,7 @@ KateViewConfig::~KateViewConfig ()
 {
 }
 
-void KateViewConfig::readConfig (KConfig *config)
+void KateViewConfig::readConfig (TDEConfig *config)
 {
   configStart ();
 
@@ -693,7 +693,7 @@ void KateViewConfig::readConfig (KConfig *config)
   configEnd ();
 }
 
-void KateViewConfig::writeConfig (KConfig *config)
+void KateViewConfig::writeConfig (TDEConfig *config)
 {
   config->writeEntry( "Dynamic Word Wrap", dynWordWrap() );
   config->writeEntry( "Dynamic Word Wrap Indicators", dynWordWrapIndicators() );
@@ -1022,7 +1022,7 @@ KateRendererConfig::KateRendererConfig ()
   s_global = this;
 
   // init with defaults from config or really hardcoded ones
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("Kate Renderer Defaults");
   readConfig (config);
 }
@@ -1054,7 +1054,7 @@ KateRendererConfig::~KateRendererConfig ()
   delete m_font;
 }
 
-void KateRendererConfig::readConfig (KConfig *config)
+void KateRendererConfig::readConfig (TDEConfig *config)
 {
   configStart ();
 
@@ -1067,7 +1067,7 @@ void KateRendererConfig::readConfig (KConfig *config)
   configEnd ();
 }
 
-void KateRendererConfig::writeConfig (KConfig *config)
+void KateRendererConfig::writeConfig (TDEConfig *config)
 {
   config->writeEntry ("Schema", KateFactory::self()->schemaManager()->name(schema()));
 
@@ -1125,7 +1125,7 @@ void KateRendererConfig::setSchemaInternal( int schema )
   m_schemaSet = true;
   m_schema = schema;
 
-  KConfig *config (KateFactory::self()->schemaManager()->schema(schema));
+  TDEConfig *config (KateFactory::self()->schemaManager()->schema(schema));
 
   TQColor tmp0 (TDEGlobalSettings::baseColor());
   TQColor tmp1 (TDEGlobalSettings::highlightColor());
diff --git a/kate/part/kateconfig.h b/kate/part/kateconfig.h
index 56d094cd0..4c1f7294a 100644
--- a/kate/part/kateconfig.h
+++ b/kate/part/kateconfig.h
@@ -32,7 +32,7 @@ class KateRenderer;
 class KateFontStruct;
 class KateFontMetrics;
 
-class KConfig;
+class TDEConfig;
 
 class TQFont;
 class TQTextCodec;
@@ -115,12 +115,12 @@ class KateDocumentConfig : public KateConfig
     /**
      * Read config from object
      */
-    void readConfig (KConfig *config);
+    void readConfig (TDEConfig *config);
 
     /**
      * Write config to object
      */
-    void writeConfig (KConfig *config);
+    void writeConfig (TDEConfig *config);
 
   protected:
     void updateConfig ();
@@ -304,12 +304,12 @@ class KateViewConfig : public KateConfig
     /**
      * Read config from object
      */
-    void readConfig (KConfig *config);
+    void readConfig (TDEConfig *config);
 
     /**
      * Write config to object
      */
-    void writeConfig (KConfig *config);
+    void writeConfig (TDEConfig *config);
 
   protected:
     void updateConfig ();
@@ -432,12 +432,12 @@ class KateRendererConfig : public KateConfig
     /**
      * Read config from object
      */
-    void readConfig (KConfig *config);
+    void readConfig (TDEConfig *config);
 
     /**
      * Write config to object
      */
-    void writeConfig (KConfig *config);
+    void writeConfig (TDEConfig *config);
 
   protected:
     void updateConfig ();
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index 1ae416264..aa122a7b1 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -1369,7 +1369,7 @@ void KateHlConfigPage::apply ()
   for ( TQIntDictIterator<KateHlData> it( hlDataDict ); it.current(); ++it )
     KateHlManager::self()->getHl( it.currentKey() )->setData( it.current() );
 
-  KateHlManager::self()->getKConfig()->sync ();
+  KateHlManager::self()->getTDEConfig()->sync ();
 }
 
 void KateHlConfigPage::reload ()
@@ -1453,20 +1453,20 @@ KateHlDownloadDialog::KateHlDownloadDialog(TQWidget *parent, const char *name, b
   new TQLabel(i18n("<b>Note:</b> New versions are selected automatically."), vbox);
   actionButton (User1)->setIconSet(SmallIconSet("ok"));
 
-  transferJob = KIO::get(
+  transferJob = TDEIO::get(
     KURL(TQString(HLDOWNLOADPATH)
        + TQString("update-")
        + TQString(KATEPART_VERSION)
        + TQString(".xml")), true, true );
-  connect(transferJob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-    this, TQT_SLOT(listDataReceived(KIO::Job *, const TQByteArray &)));
-//        void data( KIO::Job *, const TQByteArray &data);
+  connect(transferJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+    this, TQT_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &)));
+//        void data( TDEIO::Job *, const TQByteArray &data);
   resize(450, 400);
 }
 
 KateHlDownloadDialog::~KateHlDownloadDialog(){}
 
-void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data)
+void KateHlDownloadDialog::listDataReceived(TDEIO::Job *, const TQByteArray &data)
 {
   if (!transferJob || transferJob->isErrorPage())
   {
@@ -1538,7 +1538,7 @@ void KateHlDownloadDialog::slotUser1()
       TQString filename=src.fileName(false);
       TQString dest = destdir+filename;
 
-      KIO::NetAccess::download(src,dest, this);
+      TDEIO::NetAccess::download(src,dest, this);
     }
   }
 
diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h
index 169ffaffc..fc9fa0a1a 100644
--- a/kate/part/katedialogs.h
+++ b/kate/part/katedialogs.h
@@ -46,7 +46,7 @@ struct syntaxContextData;
 class KateDocument;
 class KateView;
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
   class TransferJob;
@@ -350,10 +350,10 @@ class KateHlDownloadDialog: public KDialogBase
   private:
     class TQListView  *list;
     class TQString listData;
-    KIO::TransferJob *transferJob;
+    TDEIO::TransferJob *transferJob;
 
   private slots:
-    void listDataReceived(KIO::Job *, const TQByteArray &data);
+    void listDataReceived(TDEIO::Job *, const TQByteArray &data);
 
   public slots:
     void slotUser1();
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index b264e6533..f8f190c14 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -1879,7 +1879,7 @@ void KateDocument::setDontChangeHlOnSave()
 //END
 
 //BEGIN KTextEditor::ConfigInterface stuff
-void KateDocument::readConfig(KConfig *config)
+void KateDocument::readConfig(TDEConfig *config)
 {
   config->setGroup("Kate Document Defaults");
 
@@ -1895,7 +1895,7 @@ void KateDocument::readConfig(KConfig *config)
   KateRendererConfig::global()->readConfig (config);
 }
 
-void KateDocument::writeConfig(KConfig *config)
+void KateDocument::writeConfig(TDEConfig *config)
 {
   config->setGroup("Kate Document Defaults");
 
@@ -1913,18 +1913,18 @@ void KateDocument::writeConfig(KConfig *config)
 
 void KateDocument::readConfig()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   readConfig (config);
 }
 
 void KateDocument::writeConfig()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   writeConfig (config);
   config->sync();
 }
 
-void KateDocument::readSessionConfig(KConfig *kconfig)
+void KateDocument::readSessionConfig(TDEConfig *kconfig)
 {
   // restore the url
   KURL url (kconfig->readEntry("URL"));
@@ -1953,7 +1953,7 @@ void KateDocument::readSessionConfig(KConfig *kconfig)
     addMark( marks[i], KateDocument::markType01 );
 }
 
-void KateDocument::writeSessionConfig(KConfig *kconfig)
+void KateDocument::writeSessionConfig(TDEConfig *kconfig)
 {
   if ( m_url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/"))
        return;
@@ -2302,14 +2302,14 @@ bool KateDocument::openURL( const KURL &url )
     m_tempFile = new KTempFile ();
     m_file = m_tempFile->name();
 
-    m_job = KIO::get ( url, false, isProgressInfoEnabled() );
+    m_job = TDEIO::get ( url, false, isProgressInfoEnabled() );
 
     // connect to slots
-    connect( m_job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
-           TQT_SLOT( slotDataKate( KIO::Job*, const TQByteArray& ) ) );
+    connect( m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           TQT_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) );
 
-    connect( m_job, TQT_SIGNAL( result( KIO::Job* ) ),
-           TQT_SLOT( slotFinishedKate( KIO::Job* ) ) );
+    connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
+           TQT_SLOT( slotFinishedKate( TDEIO::Job* ) ) );
 
     TQWidget *w = widget ();
     if (!w && !m_views.isEmpty ())
@@ -2324,7 +2324,7 @@ bool KateDocument::openURL( const KURL &url )
   }
 }
 
-void KateDocument::slotDataKate ( KIO::Job *, const TQByteArray &data )
+void KateDocument::slotDataKate ( TDEIO::Job *, const TQByteArray &data )
 {
 //   kdDebug(13020) << "KateDocument::slotData" << endl;
 
@@ -2334,7 +2334,7 @@ void KateDocument::slotDataKate ( KIO::Job *, const TQByteArray &data )
   m_tempFile->file()->writeBlock (data);
 }
 
-void KateDocument::slotFinishedKate ( KIO::Job * job )
+void KateDocument::slotFinishedKate ( TDEIO::Job * job )
 {
 //   kdDebug(13020) << "KateDocument::slotJobFinished" << endl;
 
@@ -2373,7 +2373,7 @@ bool KateDocument::openFile()
   return openFile (0);
 }
 
-bool KateDocument::openFile(KIO::Job * job)
+bool KateDocument::openFile(TDEIO::Job * job)
 {
   m_loading = true;
   // add new m_file to dirwatch
@@ -2520,8 +2520,8 @@ bool KateDocument::save()
 
     // get the right permissions, start with safe default
     mode_t  perms = 0600;
-    KIO::UDSEntry fentry;
-    if (KIO::NetAccess::stat (url(), fentry, kapp->mainWidget()))
+    TDEIO::UDSEntry fentry;
+    if (TDEIO::NetAccess::stat (url(), fentry, kapp->mainWidget()))
     {
       kdDebug () << "stating succesfull: " << url() << endl;
       KFileItem item (fentry, url());
@@ -2530,8 +2530,8 @@ bool KateDocument::save()
 
     // first del existing file if any, than copy over the file we have
     // failure if a: the existing file could not be deleted, b: the file could not be copied
-    if ( (!KIO::NetAccess::exists( u, false, kapp->mainWidget() ) || KIO::NetAccess::del( u, kapp->mainWidget() ))
-          && KIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) )
+    if ( (!TDEIO::NetAccess::exists( u, false, kapp->mainWidget() ) || TDEIO::NetAccess::del( u, kapp->mainWidget() ))
+          && TDEIO::NetAccess::file_copy( url(), u, perms, true, false, kapp->mainWidget() ) )
     {
       kdDebug(13020)<<"backing up successfull ("<<url().prettyURL()<<" -> "<<u.prettyURL()<<")"<<endl;
     }
diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h
index d967a25ab..fec6983e4 100644
--- a/kate/part/katedocument.h
+++ b/kate/part/katedocument.h
@@ -46,7 +46,7 @@
 
 namespace KTextEditor { class Plugin; }
 
-namespace KIO { class TransferJob; }
+namespace TDEIO { class TransferJob; }
 
 class KateUndoGroup;
 class KateCmd;
@@ -439,10 +439,10 @@ class KateDocument : public Kate::Document,
   public slots:
     void readConfig ();
     void writeConfig ();
-    void readConfig (KConfig *);
-    void writeConfig (KConfig *);
-    void readSessionConfig (KConfig *);
-    void writeSessionConfig (KConfig *);
+    void readConfig (TDEConfig *);
+    void writeConfig (TDEConfig *);
+    void readSessionConfig (TDEConfig *);
+    void writeSessionConfig (TDEConfig *);
     void configDialog ();
 
   //
@@ -555,7 +555,7 @@ class KateDocument : public Kate::Document,
     /* Anders: Reimplemented to do kate specific stuff */
     bool saveAs( const KURL &url );
 
-    bool openFile (KIO::Job * job);
+    bool openFile (TDEIO::Job * job);
     bool openFile ();
 
     bool saveFile ();
@@ -565,8 +565,8 @@ class KateDocument : public Kate::Document,
     void setModified( bool m );
 
   private slots:
-    void slotDataKate ( KIO::Job* kio_job, const TQByteArray &data );
-    void slotFinishedKate ( KIO::Job * job );
+    void slotDataKate ( TDEIO::Job* kio_job, const TQByteArray &data );
+    void slotFinishedKate ( TDEIO::Job * job );
 
   private:
     void abortLoadKate();
@@ -1004,7 +1004,7 @@ class KateDocument : public Kate::Document,
     static TQRegExp kvLineMime;
     static TQRegExp kvVar;
 
-    KIO::TransferJob *m_job;
+    TDEIO::TransferJob *m_job;
     KTempFile *m_tempFile;
 
   // TemplateInterface
diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp
index 11d5e9a46..a00d39bfb 100644
--- a/kate/part/katefiletype.cpp
+++ b/kate/part/katefiletype.cpp
@@ -72,7 +72,7 @@ KateFileTypeManager::~KateFileTypeManager ()
 //
 void KateFileTypeManager::update ()
 {
-  KConfig config ("katefiletyperc", false, false);
+  TDEConfig config ("katefiletyperc", false, false);
 
   TQStringList g (config.groupList());
   g.sort ();
@@ -101,7 +101,7 @@ void KateFileTypeManager::update ()
 //
 void KateFileTypeManager::save (TQPtrList<KateFileType> *v)
 {
-  KConfig config ("katefiletyperc", false, false);
+  TDEConfig config ("katefiletyperc", false, false);
 
   TQStringList newg;
   for (uint z=0; z < v->count(); z++)
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index ca1276a6b..08da7e97f 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -1599,7 +1599,7 @@ void KateHighlighting::doHighlight ( KateTextLine *prevLine,
 
 void KateHighlighting::loadWildcards()
 {
-  KConfig *config = KateHlManager::self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->getTDEConfig();
   config->setGroup("Highlighting " + iName);
 
   TQString extensionString = config->readEntry("Wildcards", iWildcards);
@@ -1636,7 +1636,7 @@ TQStringList& KateHighlighting::getPlainExtensions()
 
 TQString KateHighlighting::getMimetypes()
 {
-  KConfig *config = KateHlManager::self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->getTDEConfig();
   config->setGroup("Highlighting " + iName);
 
   return config->readEntry("Mimetypes", iMimetypes);
@@ -1644,7 +1644,7 @@ TQString KateHighlighting::getMimetypes()
 
 int KateHighlighting::priority()
 {
-  KConfig *config = KateHlManager::self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->getTDEConfig();
   config->setGroup("Highlighting " + iName);
 
   return config->readNumEntry("Priority", m_priority);
@@ -1652,7 +1652,7 @@ int KateHighlighting::priority()
 
 KateHlData *KateHighlighting::getData()
 {
-  KConfig *config = KateHlManager::self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->getTDEConfig();
   config->setGroup("Highlighting " + iName);
 
   KateHlData *hlData = new KateHlData(
@@ -1666,7 +1666,7 @@ KateHlData *KateHighlighting::getData()
 
 void KateHighlighting::setData(KateHlData *hlData)
 {
-  KConfig *config = KateHlManager::self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->getTDEConfig();
   config->setGroup("Highlighting " + iName);
 
   config->writeEntry("Wildcards",hlData->wildcards);
@@ -1676,7 +1676,7 @@ void KateHighlighting::setData(KateHlData *hlData)
 
 void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &list)
 {
-  KConfig *config = KateHlManager::self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->getTDEConfig();
   config->setGroup("Highlighting " + iName + " - Schema " + KateFactory::self()->schemaManager()->name(schema));
 
   list.clear();
@@ -1729,7 +1729,7 @@ void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &l
  */
 void KateHighlighting::setKateHlItemDataList(uint schema, KateHlItemDataList &list)
 {
-  KConfig *config = KateHlManager::self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->getTDEConfig();
   config->setGroup("Highlighting " + iName + " - Schema "
       + KateFactory::self()->schemaManager()->name(schema));
 
@@ -3264,7 +3264,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list)
   error->setSelectedTextColor(Qt::red);
   list.append(error);
 
-  KConfig *config = KateHlManager::self()->self()->getKConfig();
+  TDEConfig *config = KateHlManager::self()->self()->getTDEConfig();
   config->setGroup("Default Item Styles - Schema " + KateFactory::self()->schemaManager()->name(schema));
 
   for (uint z = 0; z < defaultStyles(); z++)
@@ -3317,7 +3317,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list)
 
 void KateHlManager::setDefaults(uint schema, KateAttributeList &list)
 {
-  KConfig *config =  KateHlManager::self()->self()->getKConfig();
+  TDEConfig *config =  KateHlManager::self()->self()->getTDEConfig();
   config->setGroup("Default Item Styles - Schema " + KateFactory::self()->schemaManager()->name(schema));
 
   for (uint z = 0; z < defaultStyles(); z++)
diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h
index e312e4a01..1b71e454a 100644
--- a/kate/part/katehighlight.h
+++ b/kate/part/katehighlight.h
@@ -350,7 +350,7 @@ class KateHlManager : public TQObject
 
     static KateHlManager *self();
 
-    inline KConfig *getKConfig() { return &m_config; };
+    inline TDEConfig *getTDEConfig() { return &m_config; };
 
     KateHighlighting *getHl(int n);
     int nameFind(const TQString &name);
@@ -396,7 +396,7 @@ class KateHlManager : public TQObject
 
     static KateHlManager *s_self;
 
-    KConfig m_config;
+    TDEConfig m_config;
     TQStringList commonSuffixes;
 
     KateSyntaxDocument *syntax;
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index d33f26947..b7703ccdf 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -642,7 +642,7 @@ void KateJScriptManager::collectScripts (bool force)
     return;
 
   // We'll store the scripts list in this config
-  KConfig config("katepartjscriptrc", false, false);
+  TDEConfig config("katepartjscriptrc", false, false);
 
   // figure out if the kate install is too new
   config.setGroup ("General");
@@ -685,7 +685,7 @@ void KateJScriptManager::collectScripts (bool force)
 
       if (dfi.exists())
       {
-        KConfig df (desktopFile, true, false);
+        TDEConfig df (desktopFile, true, false);
         df.setDesktopGroup ();
 
         // get cmdname, fallback to baseName, if it is empty, therefor not use the kconfig fallback
@@ -778,7 +778,7 @@ bool KateJScriptManager::help( Kate::View *, const TQString &cmd, TQString &msg
   if (!m_scripts[cmd] || !m_scripts[cmd]->desktopFileExists)
     return false;
 
-  KConfig df (m_scripts[cmd]->desktopFilename(), true, false);
+  TDEConfig df (m_scripts[cmd]->desktopFilename(), true, false);
   df.setDesktopGroup ();
 
   msg = df.readEntry ("X-Kate-Help");
@@ -1016,7 +1016,7 @@ void KateIndentJScriptManager::collectScripts (bool force)
 
 
   // We'll store the scripts list in this config
-  KConfig config("katepartindentjscriptrc", false, false);
+  TDEConfig config("katepartindentjscriptrc", false, false);
 #if 0
   // figure out if the kate install is too new
   config.setGroup ("General");
diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp
index 178831f69..c06f3864e 100644
--- a/kate/part/kateluaindentscript.cpp
+++ b/kate/part/kateluaindentscript.cpp
@@ -371,7 +371,7 @@ void KateLUAIndentScriptManager::collectScripts (bool force)
       <<"================================================="<<endl;
 
   // We'll store the scripts list in this config
-  KConfig config("katepartluaindentscriptrc", false, false);
+  TDEConfig config("katepartluaindentscriptrc", false, false);
 #if 0
   // figure out if the kate install is too new
   config.setGroup ("General");
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index bb3aa2866..fa8b21f64 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -194,7 +194,7 @@ void KateSchemaManager::update (bool readfromfile)
 // get the right group
 // special handling of the default schemas ;)
 //
-KConfig *KateSchemaManager::schema (uint number)
+TDEConfig *KateSchemaManager::schema (uint number)
 {
   if ((number>1) && (number < m_schemas.count()))
     m_config.setGroup (m_schemas[number]);
@@ -440,7 +440,7 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
     mark[6] = Qt::red;
 
     SchemaColors c;
-    KConfig *config = KateFactory::self()->schemaManager()->schema(newSchema);
+    TDEConfig *config = KateFactory::self()->schemaManager()->schema(newSchema);
 
     c.back= config->readColorEntry("Color Background", &tmp0);
     c.selected = config->readColorEntry("Color Selection", &tmp1);
@@ -493,7 +493,7 @@ void KateSchemaConfigColorTab::apply ()
   for ( it =  m_schemas.begin(); it !=  m_schemas.end(); ++it )
   {
     kdDebug(13030)<<"APPLY scheme = "<<it.key()<<endl;
-    KConfig *config = KateFactory::self()->schemaManager()->schema( it.key() );
+    TDEConfig *config = KateFactory::self()->schemaManager()->schema( it.key() );
     kdDebug(13030)<<"Using config group "<<config->group()<<endl;
     SchemaColors c = it.data();
 
@@ -759,7 +759,7 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema)
 
   // Set listview colors
   // We do that now, because we can now get the "normal text" color.
-  // TODO this reads of the KConfig object, which should be changed when
+  // TODO this reads of the TDEConfig object, which should be changed when
   // the color tab is fixed.
   TQPalette p ( m_styles->palette() );
   TQColor _c ( TDEGlobalSettings::baseColor() );
@@ -905,7 +905,7 @@ void KateSchemaConfigPage::apply()
   KateRendererConfig::global()->reloadSchema();
 
   // sync the hl config for real
-  KateHlManager::self()->getKConfig()->sync ();
+  KateHlManager::self()->getTDEConfig()->sync ();
 }
 
 void KateSchemaConfigPage::reload()
diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h
index 566b6ea27..f6eb8ef60 100644
--- a/kate/part/kateschema.h
+++ b/kate/part/kateschema.h
@@ -55,7 +55,7 @@ class KateSchemaManager
     /**
      * return kconfig with right group set or set to Normal if not there
      */
-    KConfig *schema (uint number);
+    TDEConfig *schema (uint number);
 
     void addSchema (const TQString &t);
 
@@ -85,7 +85,7 @@ class KateSchemaManager
     static TQString printingSchema ();
 
   private:
-    KConfig m_config;
+    TDEConfig m_config;
     TQStringList m_schemas;
 };
 
@@ -216,7 +216,7 @@ class KateSchemaConfigFontTab : public TQWidget
     ~KateSchemaConfigFontTab();
 
   public:
-    void readConfig (KConfig *config);
+    void readConfig (TDEConfig *config);
 
   public slots:
     void apply();
diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp
index 34f44bf66..4093f8722 100644
--- a/kate/part/katesyntaxdocument.cpp
+++ b/kate/part/katesyntaxdocument.cpp
@@ -335,7 +335,7 @@ void KateSyntaxDocument::setupModeList (bool force)
     return;
 
   // We'll store the ModeList in katesyntaxhighlightingrc
-  KConfig config("katesyntaxhighlightingrc", false, false);
+  TDEConfig config("katesyntaxhighlightingrc", false, false);
 
   // figure our if the kate install is too new
   config.setGroup ("General");
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index 50f186c8c..ca457acaa 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -930,12 +930,12 @@ void KateView::joinLines()
   m_doc->joinLines( first, last );
 }
 
-void KateView::readSessionConfig(KConfig *config)
+void KateView::readSessionConfig(TDEConfig *config)
 {
   setCursorPositionInternal (config->readNumEntry("CursorLine"), config->readNumEntry("CursorColumn"), 1);
 }
 
-void KateView::writeSessionConfig(KConfig *config)
+void KateView::writeSessionConfig(TDEConfig *config)
 {
   config->writeEntry("CursorLine",m_viewInternal->cursor.line());
   config->writeEntry("CursorColumn",m_viewInternal->cursor.col());
@@ -1839,7 +1839,7 @@ void KateView::exportAsHTML ()
   if ( url.isLocalFile() )
       return;
 
-  KIO::NetAccess::upload( filename, url, 0 );
+  TDEIO::NetAccess::upload( filename, url, 0 );
 }
 //END
 
diff --git a/kate/part/kateview.h b/kate/part/kateview.h
index aa428096d..f4ec54801 100644
--- a/kate/part/kateview.h
+++ b/kate/part/kateview.h
@@ -370,8 +370,8 @@ class KateView : public Kate::View,
 
   // config file / session management functions
   public:
-    void readSessionConfig(KConfig *);
-    void writeSessionConfig(KConfig *);
+    void readSessionConfig(TDEConfig *);
+    void writeSessionConfig(TDEConfig *);
 
   public slots:
     int getEol();
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index a7a88b945..eca6716c4 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -1151,7 +1151,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos )
   {
      KateViewConfig::global()->setDefaultMarkType (vec[result-100]);
      // flush config, otherwise it isn't nessecarily done
-     KConfig *config = kapp->config();
+     TDEConfig *config = kapp->config();
      config->setGroup("Kate View Defaults");
      KateViewConfig::global()->writeConfig( config );
   }
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index c996b216e..109a3c8b1 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -650,7 +650,7 @@ int main(int argc, char *argv[])
 
 RegressionTest *RegressionTest::curr = 0;
 
-RegressionTest::RegressionTest(KateDocument *part, KConfig *baseConfig,
+RegressionTest::RegressionTest(KateDocument *part, TDEConfig *baseConfig,
                                const TQString &baseDir,
                                const TQString &outputDir, bool _genOutput)
   : TQObject(part)
@@ -723,14 +723,14 @@ RegressionTest::~RegressionTest()
     delete m_failureSave;
 }
 
-void RegressionTest::setFailureSnapshotConfig(KConfig *cfg, const TQString &sname)
+void RegressionTest::setFailureSnapshotConfig(TDEConfig *cfg, const TQString &sname)
 {
     Q_ASSERT(cfg);
     m_failureComp = cfg;
     m_failureComp->setGroup(sname);
 }
 
-void RegressionTest::setFailureSnapshotSaver(KConfig *cfg, const TQString &sname)
+void RegressionTest::setFailureSnapshotSaver(TDEConfig *cfg, const TQString &sname)
 {
     Q_ASSERT(cfg);
     m_failureSave = cfg;
diff --git a/kate/part/test_regression.h b/kate/part/test_regression.h
index 0bc717714..2128ce25d 100644
--- a/kate/part/test_regression.h
+++ b/kate/part/test_regression.h
@@ -165,7 +165,7 @@ class RegressionTest : public TQObject
   Q_OBJECT
 public:
 
-    RegressionTest(KateDocument *part, KConfig *baseConfig,
+    RegressionTest(KateDocument *part, TDEConfig *baseConfig,
                    const TQString &baseDir, const TQString &outputDir,
                    bool _genOutput);
     ~RegressionTest();
@@ -181,21 +181,21 @@ public:
     void rereadConfig();
     static void createMissingDirs(const TQString &path);
 
-    void setFailureSnapshotConfig(KConfig *cfg, const TQString &snapshotname);
-    void setFailureSnapshotSaver(KConfig *cfg, const TQString &snapshotname);
+    void setFailureSnapshotConfig(TDEConfig *cfg, const TQString &snapshotname);
+    void setFailureSnapshotSaver(TDEConfig *cfg, const TQString &snapshotname);
 
     void createLink( const TQString& test, int failures );
     void doFailureReport( const TQString& test, int failures );
 
     KateDocument *m_part;
     KateView *m_view;
-    KConfig *m_baseConfig;
+    TDEConfig *m_baseConfig;
     TQString m_baseDir;
     TQString m_outputDir;
     bool m_genOutput;
     TQString m_currentBase;
-    KConfig *m_failureComp;
-    KConfig *m_failureSave;
+    TDEConfig *m_failureComp;
+    TDEConfig *m_failureSave;
 
     TQString m_currentOutput;
     TQString m_currentCategory;