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

157 files changed, 709 insertions, 709 deletions

diff --git a/ChangeLog b/ChangeLog
index 023108a2..e63071e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -175,7 +175,7 @@
  * Implemented a fix for BR 91757 which also removes the silly runtime dependency we had on tdebase
 
 2005-01-28  Richard Dale  <[email protected]>
- * Added a Ruby KConfig XT project template
+ * Added a Ruby TDEConfig XT project template
 
 2005-01-25 Jens Dagerbo <[email protected]>
  * Reimplemented "Forward" for source navigation history
@@ -445,7 +445,7 @@
     * Added MimeWarningDialog - KDevelop will now ask the user what to do when an unknown mimetype is encountered.
 
 2004-04-15 Jens Dagerbo <[email protected]>
-    * Added Thomas Nagy's KConfig XT based apptemplate.
+    * Added Thomas Nagy's TDEConfig XT based apptemplate.
 
 2004-04-14 Jens Dagerbo <[email protected]>
     * Rewrote and documented the KDevPartController interface to reduce the duplication of a lot of common but
@@ -1139,7 +1139,7 @@
 * Made the "C++ new class dialog" a little bit nicer
 
 2003-02-27 F@lk Brettschneider <[email protected]>
-        * make-outputview: now context menu allows to disable line wrapping, to set a short and smart compiler output (good for novices) and to suppress directory navigation messages. (TODO: save this to KConfig)
+        * make-outputview: now context menu allows to disable line wrapping, to set a short and smart compiler output (good for novices) and to suppress directory navigation messages. (TODO: save this to TDEConfig)
 
 2003-02-26  Eray Ozkural (exa) <[email protected]>
         * parts/cppsupport: fix nasty inner class bug (part of bug 45998). Determine
@@ -2465,7 +2465,7 @@
 2001-07-17  Bernd Gehrmann  <[email protected]>
         * Added kdoc-generated Qt/KDE index to index dialog
         * Destroy compiled-in factories at exit. Otherwise
-          their KConfig's don't get sync()ed
+          their TDEConfig's don't get sync()ed
 2001-07-16  Bernd Gehrmann  <[email protected]>
         * Made doxygen config widget more KDE compliant, i.e.
           KDE icons, KFileDialog instead of QFileDialog,
diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp
index 48493adb..33e432cf 100644
--- a/buildtools/ada/adaglobaloptionsdlg.cpp
+++ b/buildtools/ada/adaglobaloptionsdlg.cpp
@@ -98,7 +98,7 @@ void AdaGlobalOptionsDlg::readCompilerOpts( TQString compiler )
     TQString settings = configCache[compiler];
     if (settings.isEmpty())
     {
-        KConfig *config = TDEGlobal::config();
+        TDEConfig *config = TDEGlobal::config();
         config->setGroup("Ada Compiler");
         settings = config->readPathEntry(compiler);
     }
@@ -108,7 +108,7 @@ void AdaGlobalOptionsDlg::readCompilerOpts( TQString compiler )
 
 void AdaGlobalOptionsDlg::readConfigCache( )
 {
-/*    KConfig *config = TDEGlobal::config();
+/*    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Ada Compiler");
 
     TQMap<TQString, TQString> settings = config->entryMap("Ada Compiler");
@@ -117,7 +117,7 @@ void AdaGlobalOptionsDlg::readConfigCache( )
 
 void AdaGlobalOptionsDlg::saveConfigCache( )
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Ada Compiler");
 
     for (TQMap<TQString, TQString>::iterator it = configCache.begin(); it != configCache.end(); ++it)
diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index 02c894cd..96b01a51 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -443,7 +443,7 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
 
 TQString AdaProjectPart::defaultOptions( const TQString compiler )
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Ada Compiler");
     return config->readPathEntry(compiler);
 }
diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp
index 2dfd4c63..181f7c5b 100644
--- a/buildtools/autotools/addexistingdirectoriesdlg.cpp
+++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp
@@ -141,7 +141,7 @@ void AddExistingDirectoriesDialog::importItems()
 	{
         KURL amURL = itemList.current()->url();
         amURL.addPath("Makefile.am");
-        if (KIO::NetAccess::exists(amURL))
+        if (TDEIO::NetAccess::exists(amURL))
 		{
 			importView->insertItem ( ( *itemList ) );
 		}
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index 279102e4..0375c6f2 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -509,7 +509,7 @@ TQString AutoProjectPart::makeEnvironment() const
         environstr += " ";
     }
 
-    KConfigGroup grp( kapp->config(), "MakeOutputView" );
+    TDEConfigGroup grp( kapp->config(), "MakeOutputView" );
     if( grp.readBoolEntry( "ForceCLocale", true ) )
         environstr += "LC_MESSAGES="+EnvVarTools::quote("C")+" "+"LC_CTYPE="+EnvVarTools::quote("C")+" ";
 
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 29a08f0e..9e9459fd 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -304,7 +304,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con
 	collapseAction->plug( &popup );
 	expandAction->plug( &popup );
 
-	KConfig *config = m_part->instance()->config();
+	TDEConfig *config = m_part->instance()->config();
 	bool separate = true;
 	TQMap<TQString,TQString> customBuildCommands = config->entryMap("CustomCommands");
 	for (TQMap<TQString,TQString>::const_iterator it = customBuildCommands.constBegin();
@@ -1013,7 +1013,7 @@ void AutoSubprojectView::focusOutEvent( TQFocusEvent */* e*/ )
 
 void AutoSubprojectView::slotManageBuildCommands( )
 {
-	KConfig *config = m_part->instance()->config();
+	TDEConfig *config = m_part->instance()->config();
 	//menu item name <-> command
 	TQMap<TQString, TQString> customBuildCommands = config->entryMap("CustomCommands");
 
diff --git a/buildtools/autotools/kfilednddetailview.cpp b/buildtools/autotools/kfilednddetailview.cpp
index 745c65b0..915891dc 100644
--- a/buildtools/autotools/kfilednddetailview.cpp
+++ b/buildtools/autotools/kfilednddetailview.cpp
@@ -46,15 +46,15 @@ KFileDnDDetailView::KFileDnDDetailView(TQWidget *parent, const char *name )
 KFileDnDDetailView::~KFileDnDDetailView(){
 }
 //-----------------------------------------------
-void KFileDnDDetailView::readConfig( KConfig* config, const TQString& group ) {
-	KConfigGroupSaver cs( config, group );
+void KFileDnDDetailView::readConfig( TDEConfig* config, const TQString& group ) {
+	TDEConfigGroupSaver cs( config, group );
 	bool dnd = config->readBoolEntry("DragAndDrop", true );
 	setDnDEnabled( dnd );
 	KFileDetailView::readConfig( config, group );
 }
 //-----------------------------------------------
-void KFileDnDDetailView::writeConfig( KConfig* config, const TQString& group ) {
-	KConfigGroupSaver cs( config, group );
+void KFileDnDDetailView::writeConfig( TDEConfig* config, const TQString& group ) {
+	TDEConfigGroupSaver cs( config, group );
 	config->writeEntry("DragAndDrop", m_dndEnabled );
 	KFileDetailView::writeConfig( config, group );
 }
diff --git a/buildtools/autotools/kfilednddetailview.h b/buildtools/autotools/kfilednddetailview.h
index 839accf7..a6dd87c0 100644
--- a/buildtools/autotools/kfilednddetailview.h
+++ b/buildtools/autotools/kfilednddetailview.h
@@ -79,9 +79,9 @@ public:
 		return m_useAutoOpenTimer;
 	}
 	/** */
-	virtual void readConfig( KConfig*, const TQString& group = TQString() );
+	virtual void readConfig( TDEConfig*, const TQString& group = TQString() );
 	/** */
-	virtual void writeConfig( KConfig*, const TQString& group = TQString() );
+	virtual void writeConfig( TDEConfig*, const TQString& group = TQString() );
 signals:  // Signals
 	/**
 	* Emitted whenever an decodable item is dropped in the view.
diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp
index 7bf8a852..c68a1f58 100644
--- a/buildtools/autotools/kfiledndiconview.cpp
+++ b/buildtools/autotools/kfiledndiconview.cpp
@@ -46,15 +46,15 @@ KFileDnDIconView::KFileDnDIconView( TQWidget *parent, const char *name )
 KFileDnDIconView::~KFileDnDIconView(){
 }
 //-----------------------------------------------
-void KFileDnDIconView::readConfig( KConfig* config, const TQString& group ) {
-	KConfigGroupSaver cs( config, group );
+void KFileDnDIconView::readConfig( TDEConfig* config, const TQString& group ) {
+	TDEConfigGroupSaver cs( config, group );
 	bool dnd = config->readBoolEntry("EnableDND", true );
 	setDnDEnabled( dnd );
 	KFileIconView::readConfig( config, group );
 }
 //-----------------------------------------------
-void KFileDnDIconView::writeConfig( KConfig* config, const TQString& group ) {
-	KConfigGroupSaver cs( config, group );
+void KFileDnDIconView::writeConfig( TDEConfig* config, const TQString& group ) {
+	TDEConfigGroupSaver cs( config, group );
 	config->writeEntry("EnableDND", m_dndEnabled );
 	KFileIconView::writeConfig( config, group );
 }
diff --git a/buildtools/autotools/kfiledndiconview.h b/buildtools/autotools/kfiledndiconview.h
index b92e8e32..0e45d174 100644
--- a/buildtools/autotools/kfiledndiconview.h
+++ b/buildtools/autotools/kfiledndiconview.h
@@ -78,8 +78,8 @@ public:  // Public methods
 		return m_useAutoOpenTimer;
 	}
 
-	virtual void readConfig( KConfig*, const TQString& group = TQString() );
-	virtual void writeConfig( KConfig*, const TQString& group = TQString() );
+	virtual void readConfig( TDEConfig*, const TQString& group = TQString() );
+	virtual void writeConfig( TDEConfig*, const TQString& group = TQString() );
 signals:
 	
 	/**
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index 09996b05..e7883961 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -884,7 +884,7 @@ TQString CustomProjectPart::makeEnvironment() const
         environstr += " ";
     }
 
-    KConfigGroup grp( kapp->config(), "MakeOutputView" );
+    TDEConfigGroup grp( kapp->config(), "MakeOutputView" );
     if( grp.readBoolEntry( "ForceCLocale", true ) )
         environstr += "LC_MESSAGES=" + EnvVarTools::quote( "C" )+" "+" "+"LC_CTYPE="+EnvVarTools::quote("C")+" ";
 
diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp
index 5a1de34c..a9620598 100644
--- a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp
+++ b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp
@@ -58,9 +58,9 @@ int Driver::parseFile(KURL fileName, ProjectAST **ast)
 {
 	TQString tmpFile;
 	int ret = 0;
-	if (KIO::NetAccess::download(fileName, tmpFile, 0))
+	if (TDEIO::NetAccess::download(fileName, tmpFile, 0))
 		ret = parseFile(tmpFile, ast);
-	KIO::NetAccess::removeTempFile(tmpFile);
+	TDEIO::NetAccess::removeTempFile(tmpFile);
 	return ret;
 }
 
diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp
index 21023017..e5a8f994 100644
--- a/buildtools/lib/parsers/qmake/qmakedriver.cpp
+++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp
@@ -75,9 +75,9 @@ int Driver::parseFile(KURL fileName, ProjectAST **ast, int debug)
 {
     TQString tmpFile;
     int ret = 0;
-    if (KIO::NetAccess::download(fileName, tmpFile, 0))
+    if (TDEIO::NetAccess::download(fileName, tmpFile, 0))
         ret = parseFile(tmpFile, ast, debug);
-    KIO::NetAccess::removeTempFile(tmpFile);
+    TDEIO::NetAccess::removeTempFile(tmpFile);
     return ret;
 }
 
diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp
index f5a1fa92..2a83c5d1 100644
--- a/buildtools/lib/widgets/addfilesdialog.cpp
+++ b/buildtools/lib/widgets/addfilesdialog.cpp
@@ -28,7 +28,7 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter,
     TQWidget *parent, const char *name, bool modal):
     KFileDialog(startDir, filter, parent, name, modal)
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Add Files Dialog");
 
     m_extraWidget = new TQComboBox(false, this);
@@ -48,7 +48,7 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter,
     TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget):
     KFileDialog(startDir, filter, parent, name, modal, extraWidget), m_extraWidget(extraWidget)
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Add Files Dialog");
 
     m_extraWidget->insertItem(i18n("Copy File(s)"), 0);
@@ -72,7 +72,7 @@ AddFilesDialog::Mode AddFilesDialog::mode( )
 
 void AddFilesDialog::storePreferred( int index )
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Add Files Dialog");
     config->writeEntry("Mode", index);
 }
diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp
index 327ecc67..62facc8d 100644
--- a/buildtools/pascal/pascalglobaloptionsdlg.cpp
+++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp
@@ -101,7 +101,7 @@ void PascalGlobalOptionsDlg::readCompilerOpts( TQString compiler )
     TQString settings = configCache[compiler];
     if (settings.isEmpty())
     {
-        KConfig *config = TDEGlobal::config();
+        TDEConfig *config = TDEGlobal::config();
         config->setGroup("Pascal Compiler");
         settings = config->readPathEntry(compiler);
     }
@@ -111,7 +111,7 @@ void PascalGlobalOptionsDlg::readCompilerOpts( TQString compiler )
 
 void PascalGlobalOptionsDlg::readConfigCache( )
 {
-/*    KConfig *config = TDEGlobal::config();
+/*    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Pascal Compiler");
 
     TQMap<TQString, TQString> settings = config->entryMap("Pascal Compiler");
@@ -120,7 +120,7 @@ void PascalGlobalOptionsDlg::readConfigCache( )
 
 void PascalGlobalOptionsDlg::saveConfigCache( )
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Pascal Compiler");
 
     for (TQMap<TQString, TQString>::iterator it = configCache.begin(); it != configCache.end(); ++it)
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index e8fd8a65..a2cb5723 100644
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@@ -471,7 +471,7 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na
 
 TQString PascalProjectPart::defaultOptions( const TQString compiler ) const
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Pascal Compiler");
     return config->readPathEntry(compiler);
 }
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index e83ed8a9..7086ae1e 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -260,7 +260,7 @@ TQString TrollProjectPart::makeEnvironment()
          environstr += TQString( "QTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " );
     }
 
-    KConfigGroup grp( kapp->config(), "MakeOutputView" );
+    TDEConfigGroup grp( kapp->config(), "MakeOutputView" );
     if( grp.readBoolEntry( "ForceCLocale", true ) )
         environstr += "LC_MESSAGES="+EnvVarTools::quote("C")+" "+" "+"LC_CTYPE="+EnvVarTools::quote("C")+" ";
 
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 3c17a951..86a485f6 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -1287,7 +1287,7 @@ void TrollProjectWidget::slotAddFiles()
                     // Copy selected files to current subproject folder
                     // and add them to the filelist
                     TQString filename = KURL( files[ i ] ).fileName();
-                    KIO::NetAccess::file_copy( files[ i ], cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this );
+                    TDEIO::NetAccess::file_copy( files[ i ], cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this );
                     TQFile testExist( cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename );
 
                     if ( testExist.exists() )
@@ -1631,7 +1631,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
                             // Copy selected files to current subproject folder
                             // and add them to the filelist
                             TQString filename = KURL( files[ i ] ).fileName();
-                            KIO::NetAccess::file_copy( files[ i ], cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this );
+                            TDEIO::NetAccess::file_copy( files[ i ], cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename, -1, false, false, this );
                             TQFile testExist( cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename );
 
                             if ( testExist.exists() )
@@ -1943,7 +1943,7 @@ void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem )
     }else
     {
         kdDebug(9024) << "Deleting file as the user wished: " << spitem->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + realfilename << endl;
-        KIO::NetAccess::del( KURL::fromPathOrURL( spitem->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + realfilename ), 0 );
+        TDEIO::NetAccess::del( KURL::fromPathOrURL( spitem->scope->projectDir() + TQString( TQChar( TQDir::separator() ) ) + realfilename ), 0 );
     }
 
     if ( gitem->groupType != GroupItem::InstallObject )
diff --git a/doc/api/HowToAddPlugins.dox b/doc/api/HowToAddPlugins.dox
index c4fc2f96..fa7f74e2 100644
--- a/doc/api/HowToAddPlugins.dox
+++ b/doc/api/HowToAddPlugins.dox
@@ -195,7 +195,7 @@ void GDBBreakpointWidget::savePartialProjectSession(QDomElement* el)
 </pre></code>
 
 Note that the .kdevses is related to a project. User settings equal for all projects don't
-belong to here. You save them to ~/.trinity/share/config/tdeveloprc via class KConfig of the
+belong to here. You save them to ~/.trinity/share/config/tdeveloprc via class TDEConfig of the
 tdecore library.
 
 Document your part in the way described at \ref howToDocument (doc/api/HowToDocument.dox file).
diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook
index a3579f9d..e5942974 100644
--- a/doc/kdearch/index.docbook
+++ b/doc/kdearch/index.docbook
@@ -143,7 +143,7 @@ database, global settings and application resources.
 
 <itemizedlist>
 
-<listitem><formalpara><title><ulink url="kdeapi:tdecore/KConfig">KConfig</ulink></title>
+<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEConfig">TDEConfig</ulink></title>
 <para>
 Provides access to KDE's configuration database.
 </para>
@@ -2385,7 +2385,7 @@ contents of a local file. For remote files, there is a further possibility:
 
 <programlisting>
 KURL url("http://developer.kde.org/favicon.ico");
-QString type = KIO::NetAccess::mimetype(url);
+QString type = TDEIO::NetAccess::mimetype(url);
 if (type == KMimeType::defaultMimeType())
     cout &lt;&lt; "Could not find out type" &lt;&lt; endl;
 else
@@ -2408,17 +2408,17 @@ explicitly start the KIO job and connect to some of its signals:
 void FooClass::findType()
 {
     KURL url("http://developer.kde.org/favicon.ico");
-    KIO::MimetypeJob *job = KIO::mimetype(url);
-    connect( job, SIGNAL(result(KIO::Job*)),
-             this, SLOT(mimeResult(KIO::Job*)) );
+    TDEIO::MimetypeJob *job = TDEIO::mimetype(url);
+    connect( job, SIGNAL(result(TDEIO::Job*)),
+             this, SLOT(mimeResult(TDEIO::Job*)) );
 }
 
-void FooClass::mimeResult(KIO::Job *job)
+void FooClass::mimeResult(TDEIO::Job *job)
 {
     if (job->error())
         job->showErrorDialog();
     else
-        cout &lt;&lt; "MIME type: " &lt;&lt; ((KIO::MimetypeJob *)job)->mimetype() &lt;&lt; endl;
+        cout &lt;&lt; "MIME type: " &lt;&lt; ((TDEIO::MimetypeJob *)job)->mimetype() &lt;&lt; endl;
 }
 </programlisting>
 
@@ -2595,19 +2595,19 @@ http://www-com.physik.hu-berlin.de/~bernd/article.tgz#tar:/paper.tex
 In most cases, jobs are created by calling functions in the KIO namespace.
 These functions take one or two URLs as arguments, and possible other
 necessary parameters. When the job is finished, it emits the signal
-<literal>result(KIO::Job*)</literal>. After this signal has been emitted, the job
+<literal>result(TDEIO::Job*)</literal>. After this signal has been emitted, the job
 deletes itself. Thus, a typical use case will look like this:
 </para>
 
 <programlisting>
 void FooClass::makeDirectory()
 {
-    SimpleJob *job = KIO::mkdir(KURL("file:/home/bernd/kiodir"));
-    connect( job, SIGNAL(result(KIO::Job*)), 
-             this, SLOT(mkdirResult(KIO::Job*)) );
+    SimpleJob *job = TDEIO::mkdir(KURL("file:/home/bernd/kiodir"));
+    connect( job, SIGNAL(result(TDEIO::Job*)), 
+             this, SLOT(mkdirResult(TDEIO::Job*)) );
 }
 
-void FooClass::mkdirResult(KIO::Job *job)
+void FooClass::mkdirResult(TDEIO::Job *job)
 {
     if (job->error())
         job->showErrorDialog();
@@ -2627,118 +2627,118 @@ Here is an overview over the possible functions:
 
 <variablelist>
 
-<varlistentry><term>KIO::mkdir(const KURL &amp;url, int permission)</term>
+<varlistentry><term>TDEIO::mkdir(const KURL &amp;url, int permission)</term>
 <listitem><para>
 Creates a directory, optionally with certain permissions.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::rmdir(const KURL &amp;url)</term>
+<varlistentry><term>TDEIO::rmdir(const KURL &amp;url)</term>
 <listitem><para>
 Removes a directory.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::chmod(const KURL &amp;url, int permissions)</term>
+<varlistentry><term>TDEIO::chmod(const KURL &amp;url, int permissions)</term>
 <listitem><para>
 Changes the permissions of a file.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::rename(const KURL &amp;src, const KURL &amp;dest, 
+<varlistentry><term>TDEIO::rename(const KURL &amp;src, const KURL &amp;dest, 
                                 bool overwrite)</term>
 <listitem><para>
 Renames a file.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::symlink(const QString &amp;target, const KURL &amp;dest, 
+<varlistentry><term>TDEIO::symlink(const QString &amp;target, const KURL &amp;dest, 
                                  bool overwrite, bool showProgressInfo)</term>
 <listitem><para>
 Creates a symbolic link.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::stat(const KURL &amp;url, bool showProgressInfo)</term>
+<varlistentry><term>TDEIO::stat(const KURL &amp;url, bool showProgressInfo)</term>
 <listitem><para>
 Finds out certain information about the file, such as size, modification 
 time and permissions. The information can be obtained from 
-KIO::StatJob::statResult() after the job has finished.
+TDEIO::StatJob::statResult() after the job has finished.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::get(const KURL &amp;url, bool reload, bool showProgressInfo)</term>
+<varlistentry><term>TDEIO::get(const KURL &amp;url, bool reload, bool showProgressInfo)</term>
 <listitem><para>
 Transfers data from a URL.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::put(const KURL &amp;url, int permissions, bool overwrite, 
+<varlistentry><term>TDEIO::put(const KURL &amp;url, int permissions, bool overwrite, 
                              bool resume, bool showProgressInfo)</term>
 <listitem><para>
 Transfers data to a URL.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::http_post(const KURL &amp;url, const QByteArray &amp;data, 
+<varlistentry><term>TDEIO::http_post(const KURL &amp;url, const QByteArray &amp;data, 
                                     bool showProgressInfo)</term>
 <listitem><para>Posts data. Special for HTTP.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::mimetype(const KURL &amp;url, bool showProgressInfo)</term>
+<varlistentry><term>TDEIO::mimetype(const KURL &amp;url, bool showProgressInfo)</term>
 <listitem><para>
 Tries to find the MIME type of the URL. The type can be obtained from 
-KIO::MimetypeJob::mimetype() after the job has finished.
+TDEIO::MimetypeJob::mimetype() after the job has finished.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::file_copy(const KURL &amp;src, const KURL &amp;dest, int permissions,
+<varlistentry><term>TDEIO::file_copy(const KURL &amp;src, const KURL &amp;dest, int permissions,
                                    bool overwrite, bool resume, bool showProgressInfo)</term>
 <listitem><para>
 Copies a single file.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::file_move(const KURL &amp;src, const KURL &amp;dest, int permissions,
+<varlistentry><term>TDEIO::file_move(const KURL &amp;src, const KURL &amp;dest, int permissions,
                                    bool overwrite, bool resume, bool showProgressInfo)</term>
 <listitem><para>
 Renames or moves a single file.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::file_delete(const KURL &amp;url, bool showProgressInfo)</term>
+<varlistentry><term>TDEIO::file_delete(const KURL &amp;url, bool showProgressInfo)</term>
 <listitem><para>
 Deletes a single file.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::listDir(const KURL &amp;url, bool showProgressInfo)</term>
+<varlistentry><term>TDEIO::listDir(const KURL &amp;url, bool showProgressInfo)</term>
 <listitem><para>
 Lists the contents of a directory. Each time some new entries are known, the
-signal KIO::ListJob::entries() is emitted.
+signal TDEIO::ListJob::entries() is emitted.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::listRecursive(const KURL &amp;url, bool showProgressInfo)</term>
+<varlistentry><term>TDEIO::listRecursive(const KURL &amp;url, bool showProgressInfo)</term>
 <listitem><para>
 Similar to the listDir() function, but this one is recursive.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::copy(const KURL &amp;src, const KURL &amp;dest, bool showProgressInfo)</term>
+<varlistentry><term>TDEIO::copy(const KURL &amp;src, const KURL &amp;dest, bool showProgressInfo)</term>
 <listitem><para>
 Copies a file or directory. Directories are copied recursively.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::move(const KURL &amp;src, const KURL &amp;dest, bool showProgressInfo)</term>
+<varlistentry><term>TDEIO::move(const KURL &amp;src, const KURL &amp;dest, bool showProgressInfo)</term>
 <listitem><para>
 Moves or renames a file or directory.
 </para></listitem>
 </varlistentry>
 
-<varlistentry><term>KIO::del(const KURL &amp;src, bool shred, bool showProgressInfo)</term>
+<varlistentry><term>TDEIO::del(const KURL &amp;src, bool shred, bool showProgressInfo)</term>
 <listitem><para>
 Deletes a file or directory.
 </para></listitem>
@@ -2753,7 +2753,7 @@ Deletes a file or directory.
 <title>Directory entries</title>
 
 <para>
-Both the KIO::stat() and KIO::listDir() jobs return their results as a type
+Both the TDEIO::stat() and TDEIO::listDir() jobs return their results as a type
 UDSEntry, UDSEntryList resp. The latter is defined as QValueList&lt;UDSEntry&gt;.
 The acronym UDS stands for "Universal directory service". The principle behind 
 it is that the a directory entry only carries the information which an ioslave
@@ -2860,14 +2860,14 @@ implementing full asynchronicity is not a priority. For example, in a program
 that can only handle one document file at a time, there is little that can be
 done while the program is downloading a file anyway. For these simple cases, 
 there is a mucher simpler API in the form of a set of static functions in
-KIO::NetAccess. For example, in order to copy a file, use
+TDEIO::NetAccess. For example, in order to copy a file, use
 </para>
 
 <programlisting>
 KURL source, target;
 source = ...;
 target = ...
-KIO::NetAccess::copy(source, target);
+TDEIO::NetAccess::copy(source, target);
 </programlisting>
 
 <para>
@@ -2893,9 +2893,9 @@ files regardless of their location is the following code snippet:
 KURL url;
 url = ...;
 QString tempFile;
-if (KIO::NetAccess::download(url, tempFile) {
+if (TDEIO::NetAccess::download(url, tempFile) {
     // load the file with the name tempFile
-    KIO::NetAccess::removeTempFile(tempFile);
+    TDEIO::NetAccess::removeTempFile(tempFile);
 }
 </programlisting>
 
@@ -2921,7 +2921,7 @@ cache, you can use:
 void FooClass::reloadPage()
 {
     KURL url("http://www.kdevelop.org/index.html");
-    KIO::TransferJob *job = KIO::get(url, true, false);
+    TDEIO::TransferJob *job = TDEIO::get(url, true, false);
     job->addMetaData("cache", "reload");
     ...
 }
@@ -2941,18 +2941,18 @@ is the following:
 void FooClass::printModifiedDate()
 {
     KURL url("http://developer.kde.org/documentation/kde2arch/index.html");
-    KIO::TransferJob *job = KIO::get(url, true, false);
-    connect( job, SIGNAL(result(KIO::Job*)),
-             this, SLOT(transferResult(KIO::Job*)) );
+    TDEIO::TransferJob *job = TDEIO::get(url, true, false);
+    connect( job, SIGNAL(result(TDEIO::Job*)),
+             this, SLOT(transferResult(TDEIO::Job*)) );
 }
 
-void FooClass::transferResult(KIO::Job *job)
+void FooClass::transferResult(TDEIO::Job *job)
 {
     QString mimetype;
     if (job->error())
         job->showErrorDialog();
     else {
-        KIO::TransferJob *transferJob = (KIO::TransferJob*) job;
+        TDEIO::TransferJob *transferJob = (TDEIO::TransferJob*) job;
         QString modified = transferJob->queryMetaData("modified");
         cout &lt;&lt; "Last modified: " &lt;&lt; modified &lt;&lt; endl;
 }
@@ -3004,8 +3004,8 @@ follows:
 
 <programlisting>
 KURL url("http://developer.kde.org/documentation/kde2arch/index.html");
-KIO::TransferJob *job = KIO::get(url, true, false);
-KIO::Scheduler::scheduleJob(job);
+TDEIO::TransferJob *job = TDEIO::get(url, true, false);
+TDEIO::Scheduler::scheduleJob(job);
 </programlisting>
 
 <para>
@@ -3015,22 +3015,22 @@ the same server. Only one IMAP connection at a time should be enforced. In
 this case, the application must explicitly deal with the notion of a slave. It
 has to deallocate a slave for a certain connection and then assign all jobs
 which should go through the same connection to the same slave. This can again
-be easily achieved by using the KIO::Scheduler:
+be easily achieved by using the TDEIO::Scheduler:
 </para>
 
 <programlisting>
 KURL baseUrl("imap://[email protected]");
-KIO::Slave *slave = KIO::Scheduler::getConnectedSlave(baseUrl);
+TDEIO::Slave *slave = TDEIO::Scheduler::getConnectedSlave(baseUrl);
 
-KIO::TransferJob *job1 = KIO::get(KURL(baseUrl, "/INBOX;UID=79374"));
-KIO::Scheduler::assignJobToSlave(slave, job1);
+TDEIO::TransferJob *job1 = TDEIO::get(KURL(baseUrl, "/INBOX;UID=79374"));
+TDEIO::Scheduler::assignJobToSlave(slave, job1);
 
-KIO::TransferJob *job2 = KIO::get(KURL(baseUrl, "/INBOX;UID=86793"));
-KIO::Scheduler::assignJobToSlave(slave, job2);
+TDEIO::TransferJob *job2 = TDEIO::get(KURL(baseUrl, "/INBOX;UID=86793"));
+TDEIO::Scheduler::assignJobToSlave(slave, job2);
 
 ...
 
-KIO::Scheduler::disconnectSlave(slave);
+TDEIO::Scheduler::disconnectSlave(slave);
 </programlisting>
 
 <para>
@@ -3142,10 +3142,10 @@ int kdemain(int argc, char **argv)
 <title>Implementing an ioslave</title>
 
 <para>
-Slaves are implemented as subclasses of <classname>KIO::SlaveBase</classname>
+Slaves are implemented as subclasses of <classname>TDEIO::SlaveBase</classname>
 (FtpSlave in the above example). Thus, the actions listed in the
 <literal>.protocol</literal> correspond to certain virtual functions in
-<classname>KIO::SlaveBase</classname> the slave implementation must
+<classname>TDEIO::SlaveBase</classname> the slave implementation must
 reimplement. Here is a list of possible actions and the corresponding virtual
 functions:
 </para>
@@ -3202,8 +3202,8 @@ All these implementation should end with one of two calls: If the operation
 was successful, they should call <literal>finished()</literal>. If an error has occurred,
 <literal>error()</literal> should be called with an error code as first argument and a
 string in the second. Possible error codes are listed as enum
-<type>KIO::Error</type>. The second argument is usually the URL in
-question. It is used e.g. in <function>KIO::Job::showErrorDialog()</function>
+<type>TDEIO::Error</type>. The second argument is usually the URL in
+question. It is used e.g. in <function>TDEIO::Job::showErrorDialog()</function>
 in order to parameterize the human-readable error message.
 </para>
 
@@ -3242,7 +3242,7 @@ the transfer is finished.
 <listitem><para>
 <function>listDir()</function> reports information about the entries of a
 directory. For this purpose, call <function>listEntries()</function> with a
-<classname>KIO::UDSEntryList</classname> as argument. Analogously to
+<classname>TDEIO::UDSEntryList</classname> as argument. Analogously to
 <function>data()</function>, you can call this several times. When you are
 finished, call <function>listEntry()</function> with the second argument set
 to true. You may also call <function>totalSize()</function> to report the
@@ -3252,7 +3252,7 @@ total number of directory entries, if known.
 <listitem><para>
 <function>stat()</function> reports information about a file like size, MIME
 type, etc. Such information is packaged in a
-<classname>KIO::UDSEntry</classname>, which will be discussed below. Use
+<classname>TDEIO::UDSEntry</classname>, which will be discussed below. Use
 <function>statEntry()</function> to send such an item to the application.
 </para></listitem>
 
@@ -3295,7 +3295,7 @@ to be overwritten.
 as the message "Retrieving data from &lt;host&gt;" from the http slave, which
 is often displayed in the status bar of the program. On the application side,
 this method corresponds to the signal
-<function>KIO::Job::infoMessage()</function>.
+<function>TDEIO::Job::infoMessage()</function>.
 </para></listitem>
 
 <listitem><para>
diff --git a/editors/editor-chooser/editorchooser_widget.cpp b/editors/editor-chooser/editorchooser_widget.cpp
index bb377d22..fc3a041a 100644
--- a/editors/editor-chooser/editorchooser_widget.cpp
+++ b/editors/editor-chooser/editorchooser_widget.cpp
@@ -41,7 +41,7 @@ void EditorChooserWidget::load()
     EditorPart->clear();
 
     // find the editor to use
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Editor");
     TQString editor = config->readPathEntry("EmbeddedKTextEditor");
 
@@ -78,7 +78,7 @@ void EditorChooserWidget::load()
 
 void EditorChooserWidget::save()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Editor");
 
     KTrader::OfferList::Iterator it;
diff --git a/kdevdesigner/src/kdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp
index 26ee9ccf..6d1d5270 100644
--- a/kdevdesigner/src/kdevdesigner.cpp
+++ b/kdevdesigner/src/kdevdesigner.cpp
@@ -111,14 +111,14 @@ void KDevDesigner::setupActions()
     KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 }
 
-void KDevDesigner::saveProperties(KConfig* /*config*/)
+void KDevDesigner::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 KDevDesigner::readProperties(KConfig* /*config*/)
+void KDevDesigner::readProperties(TDEConfig* /*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/kdevdesigner/src/kdevdesigner.h b/kdevdesigner/src/kdevdesigner.h
index 49c696ff..5930cf2a 100644
--- a/kdevdesigner/src/kdevdesigner.h
+++ b/kdevdesigner/src/kdevdesigner.h
@@ -64,14 +64,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/languages/ada/configproblemreporter.ui.h b/languages/ada/configproblemreporter.ui.h
index 20932393..9c586fa4 100644
--- a/languages/ada/configproblemreporter.ui.h
+++ b/languages/ada/configproblemreporter.ui.h
@@ -11,7 +11,7 @@
 
 void ConfigureProblemReporter::init()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup( "General Options" );
     bgParserCheckbox->setChecked( config->readBoolEntry("EnableAdaBgParser", true) );
     delaySlider->setEnabled( bgParserCheckbox->isChecked() );
@@ -24,7 +24,7 @@ void ConfigureProblemReporter::destroy()
 
 void ConfigureProblemReporter::accept()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup( "General Options" );
     config->writeEntry( "EnableAdaBgParser", bgParserCheckbox->isChecked() );
     if( bgParserCheckbox->isChecked() )
diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp
index 39bbd91d..d27d0796 100644
--- a/languages/ada/problemreporter.cpp
+++ b/languages/ada/problemreporter.cpp
@@ -244,7 +244,7 @@ void ProblemReporter::reportMessage( TQString message,
 void ProblemReporter::configure()
 {
     kdDebug() << "ProblemReporter::configure()" << endl;
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup( "General Options" );
     m_active = config->readBoolEntry( "EnableAdaBgParser", TRUE );
     m_delay = config->readNumEntry( "BgParserDelay", 500 );
diff --git a/languages/cpp/app_templates/kapp/README b/languages/cpp/app_templates/kapp/README
index a94ee3db..1db7896b 100644
--- a/languages/cpp/app_templates/kapp/README
+++ b/languages/cpp/app_templates/kapp/README
@@ -42,7 +42,7 @@ For more details, consult :
 http://devel-home.kde.org/~larrosa/tutorial/p9.html
 http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 
-* Use KConfig XT to create your configuration dialogs and make 
+* Use TDEConfig XT to create your configuration dialogs and make 
 them more maintainable.
 
 For more details, consult :
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp
index f3872d04..cc77371d 100644
--- a/languages/cpp/app_templates/kapp/app.cpp
+++ b/languages/cpp/app_templates/kapp/app.cpp
@@ -69,7 +69,7 @@ void %{APPNAME}::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);
@@ -78,7 +78,7 @@ void %{APPNAME}::load(const KURL& url)
         loadFile(target);
 
         // and remove the temp file
-        KIO::NetAccess::removeTempFile(target);
+        TDEIO::NetAccess::removeTempFile(target);
     }
     #endif
 
@@ -104,7 +104,7 @@ void %{APPNAME}::setupActions()
                                   actionCollection(), "custom_action");
 }
 
-void %{APPNAME}::saveProperties(KConfig *config)
+void %{APPNAME}::saveProperties(TDEConfig *config)
 {
     // the 'config' object points to the session managed
     // config file.  anything you write here will be available
@@ -119,7 +119,7 @@ void %{APPNAME}::saveProperties(KConfig *config)
     }
 }
 
-void %{APPNAME}::readProperties(KConfig *config)
+void %{APPNAME}::readProperties(TDEConfig *config)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h
index 8c40e1fc..2085e6e6 100644
--- a/languages/cpp/app_templates/kapp/app.h
+++ b/languages/cpp/app_templates/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/languages/cpp/app_templates/kcmodule/module.cpp b/languages/cpp/app_templates/kcmodule/module.cpp
index bb15b923..2c8d9271 100644
--- a/languages/cpp/app_templates/kcmodule/module.cpp
+++ b/languages/cpp/app_templates/kcmodule/module.cpp
@@ -12,7 +12,7 @@ typedef KGenericFactory<%{APPNAME}, TQWidget> %{APPNAME}Factory;
 K_EXPORT_COMPONENT_FACTORY( kcm_%{APPNAME}, %{APPNAME}Factory("kcm%{APPNAMELC}"))
 
 %{APPNAME}::%{APPNAME}(TQWidget *parent, const char *name, const TQStringList&)
-    : KCModule(parent, name), myAboutData(0)
+    : TDECModule(parent, name), myAboutData(0)
 {
     // place widgets here
     load();
@@ -46,7 +46,7 @@ void %{APPNAME}::save()
 
 int %{APPNAME}::buttons()
 {
-    return KCModule::Default|KCModule::Apply|KCModule::Help;
+    return TDECModule::Default|TDECModule::Apply|TDECModule::Help;
 }
 
 
diff --git a/languages/cpp/app_templates/kcmodule/module.h b/languages/cpp/app_templates/kcmodule/module.h
index e9b97c38..169ff030 100644
--- a/languages/cpp/app_templates/kcmodule/module.h
+++ b/languages/cpp/app_templates/kcmodule/module.h
@@ -6,7 +6,7 @@
 #include <kcmodule.h>
 #include <kaboutdata.h>
 
-class %{APPNAME}: public KCModule
+class %{APPNAME}: public TDECModule
 {
     Q_OBJECT
   
diff --git a/languages/cpp/app_templates/kconfig35/README b/languages/cpp/app_templates/kconfig35/README
index 4047745e..6f91629b 100644
--- a/languages/cpp/app_templates/kconfig35/README
+++ b/languages/cpp/app_templates/kconfig35/README
@@ -46,7 +46,7 @@ For more details, consult :
 http://devel-home.kde.org/~larrosa/tutorial/p9.html
 http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 
-* Use KConfig XT to create your configuration dialogs and make 
+* Use TDEConfig XT to create your configuration dialogs and make 
 them more maintainable.
 
 For that, you will need to write two simple configuration files 
diff --git a/languages/cpp/app_templates/kconfig35/app.cpp b/languages/cpp/app_templates/kconfig35/app.cpp
index e18b4148..0fb99ee1 100644
--- a/languages/cpp/app_templates/kconfig35/app.cpp
+++ b/languages/cpp/app_templates/kconfig35/app.cpp
@@ -73,7 +73,7 @@ void %{APPNAMELC}::optionsPreferences()
 	//
 	// compare the names of the widgets in the .ui file 
 	// to the names of the variables in the .kcfg file
-        KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
+        TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
         dialog->addPage(new Prefs(), i18n("General"), "package_settings");
         connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged()));
         dialog->show();
diff --git a/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate b/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate
index 5786904e..3f5a2a81 100644
--- a/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate
+++ b/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate
@@ -1,26 +1,26 @@
 # TDE Config File
 [General]
-Name=KConfig XT for TDE 3.5
-Name[ca]=KConfig XT per a TDE 3.5
-Name[de]=KConfigXT-Anwendung für TDE 3.5
-Name[el]=Εφαρμογή KConfig XT για το TDE 3.5
-Name[es]=KConfig XT para TDE 3.5
-Name[et]=KConfig XT TDE 3.5 jaoks
-Name[fr]=Application KConfig XT pour TDE 3.5
-Name[hu]=KConfig XT a TDE 3.5-höz
-Name[it]=KConfig XT per TDE 3.5
-Name[ja]=TDE 3.5 用 KConfig XT
-Name[nds]=KConfig-XT-Programm för TDE 3.5
-Name[nl]=KConfig XT voor TDE 3.5
-Name[pl]=Program KConfig XT dla TDE 3.5
-Name[pt]=Aplicação do KConfig XT para o TDE 3.5
-Name[pt_BR]=Aplicação do KConfig XT para o TDE 3.5
-Name[ru]=Приложение TDE 3.5 с KConfig XT
-Name[sk]=KConfig XT pre TDE 3.5
-Name[sr]=KConfig XT програм за TDE 3.5
-Name[sr@Latn]=KConfig XT program za TDE 3.5
-Name[sv]=KConfig XT för TDE 3.5
-Name[zh_TW]=TDE 3.5 的 KConfig XT 應用程式
+Name=TDEConfig XT for TDE 3.5
+Name[ca]=TDEConfig XT per a TDE 3.5
+Name[de]=TDEConfigXT-Anwendung für TDE 3.5
+Name[el]=Εφαρμογή TDEConfig XT για το TDE 3.5
+Name[es]=TDEConfig XT para TDE 3.5
+Name[et]=TDEConfig XT TDE 3.5 jaoks
+Name[fr]=Application TDEConfig XT pour TDE 3.5
+Name[hu]=TDEConfig XT a TDE 3.5-höz
+Name[it]=TDEConfig XT per TDE 3.5
+Name[ja]=TDE 3.5 用 TDEConfig XT
+Name[nds]=TDEConfig-XT-Programm för TDE 3.5
+Name[nl]=TDEConfig XT voor TDE 3.5
+Name[pl]=Program TDEConfig XT dla TDE 3.5
+Name[pt]=Aplicação do TDEConfig XT para o TDE 3.5
+Name[pt_BR]=Aplicação do TDEConfig XT para o TDE 3.5
+Name[ru]=Приложение TDE 3.5 с TDEConfig XT
+Name[sk]=TDEConfig XT pre TDE 3.5
+Name[sr]=TDEConfig XT програм за TDE 3.5
+Name[sr@Latn]=TDEConfig XT program za TDE 3.5
+Name[sv]=TDEConfig XT för TDE 3.5
+Name[zh_TW]=TDE 3.5 的 TDEConfig XT 應用程式
 Category=C++/TDE
 Icon=kxt.png
 Comment=Generates a simple TDE application with one widget and a configuration dialog compatible with TDE 3.5 only
@@ -221,25 +221,25 @@ Dest=%{dest}/configure.in.in
 
 [MSG]
 Type=message
-Comment=A TDE 3.5 KConfig XT application was created in %{dest}
-Comment[ca]=Una aplicació KConfig XT per al TDE ha estat creada en %{dest}
-Comment[da]=Et TDE 3.5 KConfig XT-program blev oprettet i %{dest}
-Comment[de]=Eine KConfig-XT-Anwendung für TDE 3.5 wurde in %{dest} erstellt.
-Comment[el]=Μια εφαρμογή KConfig XT του TDE 3.5 δημιουργήθηκε στο %{dest}
-Comment[es]=Una aplicación KConfig XT para TDE 3.5 ha sido creada en %{dest}
-Comment[et]=TDE 3.5 KConfig XT rakendus loodi asukohta %{dest}
-Comment[fr]=Une application KConfig XT pour TDE 3.5 a été créée dans %{dest}
-Comment[hu]=Létrejött egy KConfig XT-alapú TDE 3.5-alkalmazás itt: %{dest}
-Comment[it]=È stata creata un'applicazione KConfig XT per TDE 3.5 in %{dest}
-Comment[ja]=TDE 3.5 用 KConfig XT アプリケーションを %{dest} に作成しました
-Comment[nds]=In %{dest} wöör en KConfig-XT-Programm för TDE 3.5 opstellt
-Comment[nl]=Een TDE 3.5 KConfig XT-toepassing is aangemaakt in %{dest}
-Comment[pl]=Program KConfig XT dla TDE 3.5 został utworzony w %{dest}
-Comment[pt]=Foi criada uma aplicação do KConfig XT para o TDE 3.5 em %{dest}
-Comment[pt_BR]=Foi criada uma aplicação do KConfig XT para o TDE 3.5 em %{dest}
-Comment[ru]=Приложение TDE с KConfig XT создано в %{dest}
-Comment[sk]=KConfig XT pre TDE 3.5 bola vytvorená v %{dest}
-Comment[sr]=KConfig XT програм за TDE 3.5 направљен је у %{dest}
-Comment[sr@Latn]=KConfig XT program za TDE 3.5 napravljen je u %{dest}
-Comment[sv]=Ett TDE 3.5 KConfig XT-program skapades i %{dest}
-Comment[zh_TW]=一個 TDE 3.5 上的 KConfig XT 應用程式已建立於 %{dest}
+Comment=A TDE 3.5 TDEConfig XT application was created in %{dest}
+Comment[ca]=Una aplicació TDEConfig XT per al TDE ha estat creada en %{dest}
+Comment[da]=Et TDE 3.5 TDEConfig XT-program blev oprettet i %{dest}
+Comment[de]=Eine TDEConfig-XT-Anwendung für TDE 3.5 wurde in %{dest} erstellt.
+Comment[el]=Μια εφαρμογή TDEConfig XT του TDE 3.5 δημιουργήθηκε στο %{dest}
+Comment[es]=Una aplicación TDEConfig XT para TDE 3.5 ha sido creada en %{dest}
+Comment[et]=TDE 3.5 TDEConfig XT rakendus loodi asukohta %{dest}
+Comment[fr]=Une application TDEConfig XT pour TDE 3.5 a été créée dans %{dest}
+Comment[hu]=Létrejött egy TDEConfig XT-alapú TDE 3.5-alkalmazás itt: %{dest}
+Comment[it]=È stata creata un'applicazione TDEConfig XT per TDE 3.5 in %{dest}
+Comment[ja]=TDE 3.5 用 TDEConfig XT アプリケーションを %{dest} に作成しました
+Comment[nds]=In %{dest} wöör en TDEConfig-XT-Programm för TDE 3.5 opstellt
+Comment[nl]=Een TDE 3.5 TDEConfig XT-toepassing is aangemaakt in %{dest}
+Comment[pl]=Program TDEConfig XT dla TDE 3.5 został utworzony w %{dest}
+Comment[pt]=Foi criada uma aplicação do TDEConfig XT para o TDE 3.5 em %{dest}
+Comment[pt_BR]=Foi criada uma aplicação do TDEConfig XT para o TDE 3.5 em %{dest}
+Comment[ru]=Приложение TDE с TDEConfig XT создано в %{dest}
+Comment[sk]=TDEConfig XT pre TDE 3.5 bola vytvorená v %{dest}
+Comment[sr]=TDEConfig XT програм за TDE 3.5 направљен је у %{dest}
+Comment[sr@Latn]=TDEConfig XT program za TDE 3.5 napravljen je u %{dest}
+Comment[sv]=Ett TDE 3.5 TDEConfig XT-program skapades i %{dest}
+Comment[zh_TW]=一個 TDE 3.5 上的 TDEConfig XT 應用程式已建立於 %{dest}
diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp
index bb91d42e..d2e09025 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.cpp
+++ b/languages/cpp/app_templates/kde4app/kapp4.cpp
@@ -75,10 +75,10 @@ void %{APPNAME}::optionsPreferences()
     // compare the names of the widgets in the .ui file
     // to the names of the variables in the .kcfg file
     //avoid to have 2 dialogs shown
-    if ( KConfigDialog::showDialog( "settings" ) )  {
+    if ( TDEConfigDialog::showDialog( "settings" ) )  {
         return;
     }
-    KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self());
+    TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self());
     TQWidget *generalSettingsDlg = new TQWidget;
     ui_prefs_base.setupUi(generalSettingsDlg);
     dialog->addPage(generalSettingsDlg, i18n("General"), "package_setting");
diff --git a/languages/cpp/app_templates/kicker/applet.h b/languages/cpp/app_templates/kicker/applet.h
index 4266f8eb..ba7157a3 100644
--- a/languages/cpp/app_templates/kicker/applet.h
+++ b/languages/cpp/app_templates/kicker/applet.h
@@ -101,7 +101,7 @@ protected:
     void resizeEvent(TQResizeEvent *);
 
 private:
-    KConfig *ksConfig;
+    TDEConfig *ksConfig;
     TQWidget *mainView;
 };
 
diff --git a/languages/cpp/app_templates/kioslave/slave.cpp b/languages/cpp/app_templates/kioslave/slave.cpp
index 3dbd8cac..3c780e7f 100644
--- a/languages/cpp/app_templates/kioslave/slave.cpp
+++ b/languages/cpp/app_templates/kioslave/slave.cpp
@@ -23,7 +23,7 @@
 
 #include "%{APPNAMELC}.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
 
 kio_%{APPNAMELC}Protocol::kio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket)
diff --git a/languages/cpp/app_templates/kioslave/slave.h b/languages/cpp/app_templates/kioslave/slave.h
index bdfef93c..07bf9c6e 100644
--- a/languages/cpp/app_templates/kioslave/slave.h
+++ b/languages/cpp/app_templates/kioslave/slave.h
@@ -11,7 +11,7 @@
 
 class TQCString;
 
-class kio_%{APPNAMELC}Protocol : public KIO::SlaveBase
+class kio_%{APPNAMELC}Protocol : public TDEIO::SlaveBase
 {
 public:
     kio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket);
diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp
index 1a306aee..c5d30f14 100644
--- a/languages/cpp/app_templates/kpartapp/app.cpp
+++ b/languages/cpp/app_templates/kpartapp/app.cpp
@@ -88,14 +88,14 @@ void %{APPNAME}::setupActions()
     KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 }
 
-void %{APPNAME}::saveProperties(KConfig* /*config*/)
+void %{APPNAME}::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 %{APPNAME}::readProperties(KConfig* /*config*/)
+void %{APPNAME}::readProperties(TDEConfig* /*config*/)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h
index f2dd9bb3..91207694 100644
--- a/languages/cpp/app_templates/kpartapp/app.h
+++ b/languages/cpp/app_templates/kpartapp/app.h
@@ -44,14 +44,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/languages/cpp/app_templates/kscons_kmdi/README b/languages/cpp/app_templates/kscons_kmdi/README
index a8de4e35..bf4edf71 100644
--- a/languages/cpp/app_templates/kscons_kmdi/README
+++ b/languages/cpp/app_templates/kscons_kmdi/README
@@ -67,7 +67,7 @@ For more details, consult :
 http://devel-home.kde.org/~larrosa/tutorial/p9.html
 http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 
-* Use KConfig XT to create your configuration dialogs and make 
+* Use TDEConfig XT to create your configuration dialogs and make 
 them more maintainable.
 
 For that, you will need to write two simple configuration files 
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
index dd297ed7..30e6647c 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
@@ -103,7 +103,7 @@
 	setAutoSaveSettings();
 
 	// Read the dock config only if the app was started at least only once - kmdi is tricky
-        KConfig *cfg = new KConfig("%{APPNAMELC}_dockposrc");
+        TDEConfig *cfg = new TDEConfig("%{APPNAMELC}_dockposrc");
         if (cfg->readNumEntry("%{APPNAMELC}_main_dock_settings", 0) == 1) manager()->readConfig(cfg);
         cfg->writeEntry("%{APPNAMELC}_main_dock_settings", 1);
         delete cfg;
@@ -114,7 +114,7 @@
 %{APPNAMELC}kmdi::~%{APPNAMELC}kmdi()
 {
 	// Write the dock config on exit
-        KConfig *cfg = new KConfig("%{APPNAMELC}_dockposrc");
+        TDEConfig *cfg = new TDEConfig("%{APPNAMELC}_dockposrc");
         manager()->writeConfig(cfg);
         delete cfg;
 	delete m_console;
@@ -315,10 +315,10 @@ void %{APPNAMELC}kmdi::optionsPreferences()
 	//
 	// compare the names of the widgets in the .ui file 
 	// to the names of the variables in the .kcfg file
-	if (KConfigDialog::showDialog("settings"))
+	if (TDEConfigDialog::showDialog("settings"))
 		return;	
 
-	KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
+	TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
 	dialog->addPage(new prefs(), i18n("General"), "package_settings");
 	connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged()));
 	dialog->show();
diff --git a/languages/cpp/app_templates/kscons_kxt/README b/languages/cpp/app_templates/kscons_kxt/README
index a8de4e35..bf4edf71 100644
--- a/languages/cpp/app_templates/kscons_kxt/README
+++ b/languages/cpp/app_templates/kscons_kxt/README
@@ -67,7 +67,7 @@ For more details, consult :
 http://devel-home.kde.org/~larrosa/tutorial/p9.html
 http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 
-* Use KConfig XT to create your configuration dialogs and make 
+* Use TDEConfig XT to create your configuration dialogs and make 
 them more maintainable.
 
 For that, you will need to write two simple configuration files 
diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp
index 750fd94c..bbf648ea 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/app.cpp
@@ -138,7 +138,7 @@ void %{APPNAME}::optionsPreferences()
 	//
 	// compare the names of the widgets in the .ui file 
 	// to the names of the variables in the .kcfg file
-        KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
+        TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
         dialog->addPage(new Prefs(), i18n("General"), "package_settings");
         connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged()));
         dialog->show();
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
index 569c69a3..12699c32 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
+++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
@@ -48,7 +48,7 @@ extern "C"
 //! read settings from config file
 void %{APPNAME}Setup::readSettings()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup( "Settings" );
     /// @todo
     // Add your config options here...
@@ -59,7 +59,7 @@ void %{APPNAME}Setup::readSettings()
 //! Ok pressed - save settings and exit
 void %{APPNAME}Setup::slotOkPressed()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup( "Settings" );
     /// @todo
     // Add your config options here.
@@ -89,7 +89,7 @@ void %{APPNAME}Setup::slotCancelPressed()
 //! read configuration settings from config file
 void %{APPNAME}::readSettings()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup( "Settings" );
     /// @todo
     // Add your config options here...
diff --git a/languages/cpp/app_templates/kxt/README b/languages/cpp/app_templates/kxt/README
index 3c887a42..a7775d6a 100644
--- a/languages/cpp/app_templates/kxt/README
+++ b/languages/cpp/app_templates/kxt/README
@@ -42,7 +42,7 @@ For more details, consult :
 http://devel-home.kde.org/~larrosa/tutorial/p9.html
 http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 
-* Use KConfig XT to create your configuration dialogs and make 
+* Use TDEConfig XT to create your configuration dialogs and make 
 them more maintainable.
 
 For that, you will need to write two simple configuration files 
diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp
index 81a1118c..ef50718c 100644
--- a/languages/cpp/app_templates/kxt/app.cpp
+++ b/languages/cpp/app_templates/kxt/app.cpp
@@ -133,7 +133,7 @@ void %{APPNAMELC}::optionsPreferences()
 	//
 	// compare the names of the widgets in the .ui file 
 	// to the names of the variables in the .kcfg file
-        KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
+        TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow);
         dialog->addPage(new Prefs(), i18n("General"), "package_settings");
         connect(dialog, TQT_SIGNAL(settingsChanged()), m_view, TQT_SLOT(settingsChanged()));
         dialog->show();
diff --git a/languages/cpp/app_templates/kxt/kxt.kdevtemplate b/languages/cpp/app_templates/kxt/kxt.kdevtemplate
index 4f82fa17..159affe6 100644
--- a/languages/cpp/app_templates/kxt/kxt.kdevtemplate
+++ b/languages/cpp/app_templates/kxt/kxt.kdevtemplate
@@ -1,34 +1,34 @@
 # TDE Config File
 [General]
-Name=KConfig XT application
-Name[ca]=Aplicació KConfig XT
-Name[da]=KConfig XT program
-Name[de]=KConfigXT-Anwendung
-Name[el]=Εφαρμογή KConfig XT
-Name[es]=Aplicación KConfig XT
-Name[et]=KConfig XT rakendus
-Name[eu]=KConfig XT aplikazioa
-Name[fa]=کاربرد KConfig XT
-Name[fr]=Application KConfig XT
-Name[ga]=Feidhmchlár XT KConfig
-Name[gl]=Aplicación KConfig XT
-Name[hu]=KConfig XT-alapú alkalmazás
-Name[it]=Applicazione KConfig XT
-Name[ja]=KConfig XT アプリケーション
-Name[nds]=KConfig-XT-Programm
-Name[ne]=KConfig XT अनुप्रयोग
-Name[nl]=KConfig XT-toepassing
-Name[pl]=Program KConfig XT
-Name[pt]=Aplicação do KConfig XT
-Name[pt_BR]=Aplicação do KConfig XT
-Name[ru]=Приложение TDE с KConfig XT
-Name[sk]=KConfig XT aplikácia
-Name[sr]=KConfig XT програм
-Name[sr@Latn]=KConfig XT program
-Name[sv]=KConfig XT-program
-Name[tr]=KConfig XT uygulaması
-Name[zh_CN]=KConfig XT 应用程序
-Name[zh_TW]=KConfig XT 應用程式
+Name=TDEConfig XT application
+Name[ca]=Aplicació TDEConfig XT
+Name[da]=TDEConfig XT program
+Name[de]=TDEConfigXT-Anwendung
+Name[el]=Εφαρμογή TDEConfig XT
+Name[es]=Aplicación TDEConfig XT
+Name[et]=TDEConfig XT rakendus
+Name[eu]=TDEConfig XT aplikazioa
+Name[fa]=کاربرد TDEConfig XT
+Name[fr]=Application TDEConfig XT
+Name[ga]=Feidhmchlár XT TDEConfig
+Name[gl]=Aplicación TDEConfig XT
+Name[hu]=TDEConfig XT-alapú alkalmazás
+Name[it]=Applicazione TDEConfig XT
+Name[ja]=TDEConfig XT アプリケーション
+Name[nds]=TDEConfig-XT-Programm
+Name[ne]=TDEConfig XT अनुप्रयोग
+Name[nl]=TDEConfig XT-toepassing
+Name[pl]=Program TDEConfig XT
+Name[pt]=Aplicação do TDEConfig XT
+Name[pt_BR]=Aplicação do TDEConfig XT
+Name[ru]=Приложение TDE с TDEConfig XT
+Name[sk]=TDEConfig XT aplikácia
+Name[sr]=TDEConfig XT програм
+Name[sr@Latn]=TDEConfig XT program
+Name[sv]=TDEConfig XT-program
+Name[tr]=TDEConfig XT uygulaması
+Name[zh_CN]=TDEConfig XT 应用程序
+Name[zh_TW]=TDEConfig XT 應用程式
 Category=C++/TDE
 Icon=kxt.png
 Comment=Generates a simple TDE application with one widget and a configuration dialog
@@ -238,32 +238,32 @@ Dest=%{dest}/configure.in.in
 
 [MSG]
 Type=message
-Comment=A KConfig XT application was created in %{dest}
-Comment[ca]=Una aplicació KConfig XT ha estat creada en %{dest}
-Comment[da]=Et KConfig XT-program blev oprettet i %{dest}
-Comment[de]=Eine KConfig-XT-Anwendung wurde in %{dest} erstellt
-Comment[el]=Μια εφαρμογή KConfig XT δημιουργήθηκε στο %{dest}
-Comment[es]=Una aplicación KConfig XT ha sido creada en %{dest}
-Comment[et]=A KConfig XT rakendus loodi asukohta %{dest}
-Comment[eu]=KConfig XT aplikazio bat sortu da hemen: %{dest}
-Comment[fa]=یک کاربرد KConfig XT در %{dest} ایجاد شد
-Comment[fr]=Une application KConfig XT a été créée dans %{dest}
-Comment[ga]=Cruthaíodh feidhmchlár XT KConfig i %{dest}
-Comment[gl]=Creouse unha aplicación KConfig XT en %{dest}
-Comment[hu]=Létrejött egy KConfig XT-alapú alkalmazás itt: %{dest}
-Comment[it]=È stata creata un'applicazione KConfig XT in %{dest}
-Comment[ja]=KConfig XT アプリケーションを %{dest} に作成しました
-Comment[nds]=In %{dest} wöör en KConfig-XT-Programm opstellt
-Comment[ne]=KConfig XT अनुप्रयोग %{dest} मा सिर्जना गरियो
-Comment[nl]=Een KConfig XT-toepassing is aangemaakt in %{dest}
-Comment[pl]=Program KConfig XT został utworzony w %{dest}
-Comment[pt]=Foi criada uma aplicação do KConfig XT em %{dest}
-Comment[pt_BR]=Foi criada uma aplicação do KConfig XT em %{dest}
-Comment[ru]=Приложение TDE с KConfig XT создано в %{dest}
-Comment[sk]=KConfig XT aplikácia bola vytvorená v %{dest}
-Comment[sr]=KConfig XT програм је направљен у %{dest}
-Comment[sr@Latn]=KConfig XT program je napravljen u %{dest}
-Comment[sv]=Ett KConfig XT-program skapades i %{dest}
-Comment[tr]=Bir KConfig XT uygulaması %{dest} içinde yaratıldı.
-Comment[zh_CN]=在 %{dest} 中创建了 KConfig XT 应用程序
-Comment[zh_TW]=一個 KConfig XT 應用程式已建立於 %{dest}
+Comment=A TDEConfig XT application was created in %{dest}
+Comment[ca]=Una aplicació TDEConfig XT ha estat creada en %{dest}
+Comment[da]=Et TDEConfig XT-program blev oprettet i %{dest}
+Comment[de]=Eine TDEConfig-XT-Anwendung wurde in %{dest} erstellt
+Comment[el]=Μια εφαρμογή TDEConfig XT δημιουργήθηκε στο %{dest}
+Comment[es]=Una aplicación TDEConfig XT ha sido creada en %{dest}
+Comment[et]=A TDEConfig XT rakendus loodi asukohta %{dest}
+Comment[eu]=TDEConfig XT aplikazio bat sortu da hemen: %{dest}
+Comment[fa]=یک کاربرد TDEConfig XT در %{dest} ایجاد شد
+Comment[fr]=Une application TDEConfig XT a été créée dans %{dest}
+Comment[ga]=Cruthaíodh feidhmchlár XT TDEConfig i %{dest}
+Comment[gl]=Creouse unha aplicación TDEConfig XT en %{dest}
+Comment[hu]=Létrejött egy TDEConfig XT-alapú alkalmazás itt: %{dest}
+Comment[it]=È stata creata un'applicazione TDEConfig XT in %{dest}
+Comment[ja]=TDEConfig XT アプリケーションを %{dest} に作成しました
+Comment[nds]=In %{dest} wöör en TDEConfig-XT-Programm opstellt
+Comment[ne]=TDEConfig XT अनुप्रयोग %{dest} मा सिर्जना गरियो
+Comment[nl]=Een TDEConfig XT-toepassing is aangemaakt in %{dest}
+Comment[pl]=Program TDEConfig XT został utworzony w %{dest}
+Comment[pt]=Foi criada uma aplicação do TDEConfig XT em %{dest}
+Comment[pt_BR]=Foi criada uma aplicação do TDEConfig XT em %{dest}
+Comment[ru]=Приложение TDE с TDEConfig XT создано в %{dest}
+Comment[sk]=TDEConfig XT aplikácia bola vytvorená v %{dest}
+Comment[sr]=TDEConfig XT програм је направљен у %{dest}
+Comment[sr@Latn]=TDEConfig XT program je napravljen u %{dest}
+Comment[sv]=Ett TDEConfig XT-program skapades i %{dest}
+Comment[tr]=Bir TDEConfig XT uygulaması %{dest} içinde yaratıldı.
+Comment[zh_CN]=在 %{dest} 中创建了 TDEConfig XT 应用程序
+Comment[zh_TW]=一個 TDEConfig XT 應用程式已建立於 %{dest}
diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp
index d1e0d0c6..140bb46b 100644
--- a/languages/cpp/ccconfigwidget.cpp
+++ b/languages/cpp/ccconfigwidget.cpp
@@ -89,7 +89,7 @@ void CCConfigWidget::initGeneralTab( )
 	interface_suffix->setText( DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/interfacesuffix", ".h" ) );
 	implementation_suffix->setText( DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/implementationsuffix", ".cpp" ) );
 
-	KConfig *config = CppSupportFactory::instance() ->config();
+	TDEConfig *config = CppSupportFactory::instance() ->config();
 	if ( config )
 	{
 		config->setGroup( "General" );
@@ -116,7 +116,7 @@ void CCConfigWidget::saveFileTemplatesTab( )
 	DomUtil::writeEntry( dom, "/cppsupportpart/filetemplates/interfacesuffix", interface_suffix->text() );
 	DomUtil::writeEntry( dom, "/cppsupportpart/filetemplates/implementationsuffix", implementation_suffix->text() );
 
-	KConfig *config = CppSupportFactory::instance() ->config();
+	TDEConfig *config = CppSupportFactory::instance() ->config();
 	if ( config )
 	{
 		config->setGroup( "General" );
diff --git a/languages/cpp/classgeneratorconfig.cpp b/languages/cpp/classgeneratorconfig.cpp
index 70ad5d10..2ed3ba0a 100644
--- a/languages/cpp/classgeneratorconfig.cpp
+++ b/languages/cpp/classgeneratorconfig.cpp
@@ -151,7 +151,7 @@ TQString *ClassGeneratorConfig::identifyTemplate( int value )
 
 void ClassGeneratorConfig::readConfig()
 {
-	KConfig * config = CppSupportFactory::instance() ->config();
+	TDEConfig * config = CppSupportFactory::instance() ->config();
 	if ( config )
 	{
 		config->setGroup( "Class Generator" );
@@ -197,7 +197,7 @@ TQString ClassGeneratorConfig::templateText( TQString path )
 
 void ClassGeneratorConfig::storeConfig()
 {
-	KConfig * config = CppSupportFactory::instance() ->config();
+	TDEConfig * config = CppSupportFactory::instance() ->config();
 	if ( config )
 	{
 		config->setGroup( "Class Generator" );
diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h
index 275420ab..9b9b59fb 100644
--- a/languages/cpp/configproblemreporter.ui.h
+++ b/languages/cpp/configproblemreporter.ui.h
@@ -21,7 +21,7 @@
 void ConfigureProblemReporter::init()
 {
 	m_part = 0;
-	KConfig* config = kapp->config();
+	TDEConfig* config = kapp->config();
 	config->setGroup( "General Options" );
 	problemReporterCheckbox->setChecked( config->readBoolEntry( "EnableProblemReporter", true ) );
 	bgParserCheckbox->setChecked( config->readBoolEntry( "EnableCppBgParser", true ) );
@@ -54,7 +54,7 @@ void ConfigureProblemReporter::setPart( CppSupportPart* part )
 
 void ConfigureProblemReporter::accept()
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "General Options" );
 	config->writeEntry( "EnableProblemReporter", problemReporterCheckbox->isChecked() );
 	config->writeEntry( "EnableCppBgParser", bgParserCheckbox->isChecked() );
diff --git a/languages/cpp/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp
index 338fa724..85148c30 100644
--- a/languages/cpp/cppsupport_utils.cpp
+++ b/languages/cpp/cppsupport_utils.cpp
@@ -120,7 +120,7 @@ static void typedefMap( TQMap<TQString, TQString> & map, ClassDom klass )
 
 TQString formattedOpeningParenthesis(bool suppressSpace)
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup("AStyle");
 	bool use_spaces = config->readBoolEntry("PadParentheses", false);
 	if (not use_spaces or suppressSpace) return "(";
@@ -129,7 +129,7 @@ TQString formattedOpeningParenthesis(bool suppressSpace)
 
 TQString formattedClosingParenthesis(bool suppressSpace)
 {
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup("AStyle");
 	bool use_spaces = config->readBoolEntry("PadParentheses", false);
 	if (not use_spaces or suppressSpace) return ")";
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 4f0f19d6..94eab619 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -178,7 +178,7 @@ class BackgroundParserConfig
 public:
 	void readConfig()
 	{
-		KConfig* config = kapp->config();
+		TDEConfig* config = kapp->config();
 		config->setGroup( "General Options" );
 		m_useProblemReporter = config->readBoolEntry( "EnableProblemReporter", true );
 		m_useBackgroundParser = config->readBoolEntry( "EnableCppBgParser", true );
@@ -696,7 +696,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 
 		bool showContextMenuExplosion = false;
 		bool showContextTypeEvaluation = false;
-		KConfig *config = CppSupportFactory::instance() ->config();
+		TDEConfig *config = CppSupportFactory::instance() ->config();
 		if ( config )
 		{
 			config->setGroup( "General" );
@@ -1108,7 +1108,7 @@ void CppSupportPart::slotSaveMemory() {
 void CppSupportPart::slotSwitchHeader( bool scrollOnly )
 {
 	bool attemptMatch = true;
-	KConfig *config = CppSupportFactory::instance() ->config();
+	TDEConfig *config = CppSupportFactory::instance() ->config();
 	if ( config )
 	{
 		config->setGroup( "General" );
@@ -2014,15 +2014,15 @@ KMimeType::List CppSupportPart::mimeTypes( )
 
 int CppSupportPart::pcsVersion()
 {
-	KConfig * config = CppSupportFactory::instance() ->config();
-	KConfigGroupSaver cgs( config, "PCS" );
+	TDEConfig * config = CppSupportFactory::instance() ->config();
+	TDEConfigGroupSaver cgs( config, "PCS" );
 	return config->readNumEntry( "Version", 0 );
 }
 
 void CppSupportPart::setPcsVersion( int version )
 {
-	KConfig * config = CppSupportFactory::instance() ->config();
-	KConfigGroupSaver cgs( config, "PCS" );
+	TDEConfig * config = CppSupportFactory::instance() ->config();
+	TDEConfigGroupSaver cgs( config, "PCS" );
 	config->writeEntry( "Version", version );
 	config->sync();
 }
diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h
index bbf20ec0..b7ac8267 100644
--- a/languages/cpp/cppsupportpart.h
+++ b/languages/cpp/cppsupportpart.h
@@ -229,7 +229,7 @@ public:
 
 
 	KTextEditor::Document* findDocument( const KURL& url );
-	static KConfig *config();
+	static TDEConfig *config();
 
 	virtual TQString formatTag( const Tag& tag );
 	virtual TQString formatModelItem( const CodeModelItem *item, bool shortDescription = false );
diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc
index 115f0ee9..e0b4db61 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/kde2book.toc
@@ -680,7 +680,7 @@
 <entry name="debuggers" url="ch02.html"/>
 <entry name="declaring, widget classes, kabdemo.h class declaration" url="ch10lev1sec4.html"/>
 <entry name="declaring, widget classes, KChildren example" url="ch04lev1sec3.html"/>
-<entry name="declaring widget classes, KConfigDemo widget" url="ch07lev1sec2.html"/>
+<entry name="declaring widget classes, TDEConfigDemo widget" url="ch07lev1sec2.html"/>
 <entry name="declaring widget classes, KCustomActions widget" url="ch05.html"/>
 <entry name="declaring, widget classes, KDialogApp" url="ch11.html"/>
 <entry name="declaring, widget classes, KDisc example" url="ch04lev1sec4.html"/>
@@ -704,7 +704,7 @@
 <entry name="defiing, widget classes, KChildren example" url="ch04lev1sec3.html"/>
 <entry name="defining, streams" url="ch14lev1sec3.html"/>
 <entry name="defining, widget classes, KabDemo" url="ch10lev1sec4.html"/>
-<entry name="defining widget classes, KConfigDemo widget" url="ch07lev1sec2.html"/>
+<entry name="defining widget classes, TDEConfigDemo widget" url="ch07lev1sec2.html"/>
 <entry name="defining widget classes, KCustomActions widget" url="ch05.html"/>
 <entry name="defining, widget classes, KDialogApp" url="ch11.html"/>
 <entry name="defining, widget classes, KDisc example" url="ch04lev1sec4.html"/>
@@ -1033,7 +1033,7 @@
 <entry name="functions, i18n()" url="ch07lev1sec4.html"/>
 <entry name="functions, information()" url="ch05lev1sec3.html"/>
 <entry name="functions, kingioRegister()" url="ch07lev1sec4.html"/>
-<entry name="functions, main(), KConfigDemo widget" url="ch07lev1sec2.html"/>
+<entry name="functions, main(), TDEConfigDemo widget" url="ch07lev1sec2.html"/>
 <entry name="functions, main(), KCustomActions widget" url="ch05.html"/>
 <entry name="functions, main(), KDragDemo widget" url="ch07.html"/>
 <entry name="functions, main(), KDropDemo widget" url="ch07.html"/>
@@ -1284,11 +1284,11 @@
 <entry name="KChildren sample widget (child widget), kchildren.h class declaration" url="ch04lev1sec3.html"/>
 <entry name="KChildren sample widget (child widget), main() method" url="ch04lev1sec3.html"/>
 <entry name="KChildren sample widget (child widget)" url="ch04lev1sec3.html"/>
-<entry name="kconfigdemo.cpp file (KConfigDemo widget)" url="ch07lev1sec2.html"/>
-<entry name="kconfigdemo.h file (KConfigDemo widget)" url="ch07lev1sec2.html"/>
-<entry name="KConfigDemo widget, kconfigdemo.cpp class definition" url="ch07lev1sec2.html"/>
-<entry name="KConfigDemo widget, kconfigdemo.h class declaration" url="ch07lev1sec2.html"/>
-<entry name="KConfigDemo widget, main() function" url="ch07lev1sec2.html"/>
+<entry name="kconfigdemo.cpp file (TDEConfigDemo widget)" url="ch07lev1sec2.html"/>
+<entry name="kconfigdemo.h file (TDEConfigDemo widget)" url="ch07lev1sec2.html"/>
+<entry name="TDEConfigDemo widget, kconfigdemo.cpp class definition" url="ch07lev1sec2.html"/>
+<entry name="TDEConfigDemo widget, kconfigdemo.h class declaration" url="ch07lev1sec2.html"/>
+<entry name="TDEConfigDemo widget, main() function" url="ch07lev1sec2.html"/>
 <entry name="kcustomactions.cpp file (KCustomActions widget)" url="ch05.html"/>
 <entry name="kcustomactions.h file (KCustomActions widget)" url="ch05.html"/>
 <entry name="KCustomActions widget, kcustomactions.cpp class definition" url="ch05.html"/>
@@ -1675,9 +1675,9 @@
 <entry name="listings, KChildren widget, kchildren.cpp class definition" url="ch04lev1sec3.html"/>
 <entry name="listings, KChildren widget, kchildren.h class declaration" url="ch04lev1sec3.html"/>
 <entry name="listings, KChildren widget, main() method" url="ch04lev1sec3.html"/>
-<entry name="listings, KConfigDemo widget, kconfigdemo.cpp class definition" url="ch07lev1sec2.html"/>
-<entry name="listings, KConfigDemo widget, kconfigdemo.h class declaration" url="ch07lev1sec2.html"/>
-<entry name="listings, KConfigDemo widget, main() function" url="ch07lev1sec2.html"/>
+<entry name="listings, TDEConfigDemo widget, kconfigdemo.cpp class definition" url="ch07lev1sec2.html"/>
+<entry name="listings, TDEConfigDemo widget, kconfigdemo.h class declaration" url="ch07lev1sec2.html"/>
+<entry name="listings, TDEConfigDemo widget, main() function" url="ch07lev1sec2.html"/>
 <entry name="listings, KCustomActions widget, kcustomactions.cpp class definition" url="ch05.html"/>
 <entry name="listings, KCustomActions widget, kcustomactions.h class declaration" url="ch05.html"/>
 <entry name="listings, KCustomActions widget, kcustomactions.h class definition" url="ch05.html"/>
@@ -1792,7 +1792,7 @@
 <entry name="mail action" url="ch06.html"/>
 <entry name="mailing lists" url="ch01lev1sec3.html"/>
 <entry name="main.cpp file (KstaqndardDialogs)" url="ch05lev1sec3.html"/>
-<entry name="main() function, KConfigDemo widget" url="ch07lev1sec2.html"/>
+<entry name="main() function, TDEConfigDemo widget" url="ch07lev1sec2.html"/>
 <entry name="main() function, KCustomActions widget" url="ch05.html"/>
 <entry name="main() function, KDragDemo widget" url="ch07.html"/>
 <entry name="main() function, KDropDemo widget" url="ch07.html"/>
diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp
index f4fd085e..0db80fa8 100644
--- a/languages/cpp/subclassingdlg.cpp
+++ b/languages/cpp/subclassingdlg.cpp
@@ -104,7 +104,7 @@ m_newFileNames(newFileNames), m_cppSupport( cppSupport )
 	readUiFile();
 	m_creatingNewSubclass = true;
 
-	KConfig *config = CppSupportFactory::instance()->config();
+	TDEConfig *config = CppSupportFactory::instance()->config();
 	if (config)
 	{
 		config->setGroup("Subclassing");
@@ -126,7 +126,7 @@ m_newFileNames(dummy), m_cppSupport( cppSupport )
 	m_creatingNewSubclass = false;
 	m_filename = filename;
 
-	KConfig *config = CppSupportFactory::instance()->config();
+	TDEConfig *config = CppSupportFactory::instance()->config();
 	if (config)
 	{
 		config->setGroup("Subclassing");
@@ -342,7 +342,7 @@ bool SubclassingDlg::saveBuffer(TQString &buffer, const TQString& filename)
 
 void SubclassingDlg::accept()
 {
-	KConfig *config = CppSupportFactory::instance()->config();
+	TDEConfig *config = CppSupportFactory::instance()->config();
 	if (config)
 	{
 		config->setGroup("Subclassing");
diff --git a/languages/csharp/csharpdoc.cpp b/languages/csharp/csharpdoc.cpp
index c0ee2ed5..1657d268 100644
--- a/languages/csharp/csharpdoc.cpp
+++ b/languages/csharp/csharpdoc.cpp
@@ -14,7 +14,7 @@
 #include <tdeversion.h>
 #include <kglobal.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 
 CSharpdocProtocol::CSharpdocProtocol(const TQCString &pool, const TQCString &app)
@@ -95,7 +95,7 @@ TQCString CSharpdocProtocol::errorMessage()
 void CSharpdocProtocol::stat(const KURL &/*url*/)
 {
     UDSAtom uds_atom;
-    uds_atom.m_uds = KIO::UDS_FILE_TYPE;
+    uds_atom.m_uds = TDEIO::UDS_FILE_TYPE;
     uds_atom.m_long = S_IFREG | S_IRWXU | S_IRWXG | S_IRWXO;
 
     UDSEntry uds_entry;
@@ -108,7 +108,7 @@ void CSharpdocProtocol::stat(const KURL &/*url*/)
 
 void CSharpdocProtocol::listDir(const KURL &url)
 {
-    error( KIO::ERR_CANNOT_ENTER_DIRECTORY, url.path() );
+    error( TDEIO::ERR_CANNOT_ENTER_DIRECTORY, url.path() );
 }
 
 
diff --git a/languages/csharp/csharpdoc.h b/languages/csharp/csharpdoc.h
index caf8392d..7abaac1e 100644
--- a/languages/csharp/csharpdoc.h
+++ b/languages/csharp/csharpdoc.h
@@ -5,7 +5,7 @@
 #include <kio/slavebase.h>
 
 
-class CSharpdocProtocol : public KIO::SlaveBase
+class CSharpdocProtocol : public TDEIO::SlaveBase
 {
 public:
     CSharpdocProtocol(const TQCString &pool, const TQCString &app);
diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java
index 5822f563..d6424f73 100644
--- a/languages/java/app_templates/kappjava/app.java
+++ b/languages/java/app_templates/kappjava/app.java
@@ -93,7 +93,7 @@ public void setupActions()
                                   actionCollection(), "custom_action");
 }
 
-protected void saveProperties(KConfig config)
+protected void saveProperties(TDEConfig config)
 {
     // the 'config' object points to the session managed
     // config file.  anything you write here will be available
@@ -103,7 +103,7 @@ protected void saveProperties(KConfig config)
         config.writeEntry("lastURL", m_view.currentURL());
 }
 
-protected void readProperties(KConfig config)
+protected void readProperties(TDEConfig config)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h
index 6d289931..9534cc2f 100644
--- a/languages/java/configproblemreporter.ui.h
+++ b/languages/java/configproblemreporter.ui.h
@@ -11,7 +11,7 @@
 
 void ConfigureProblemReporter::init()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup( "General Options" );
     bgParserCheckbox->setChecked( config->readBoolEntry("EnableJavaBgParser", true) );
     delaySlider->setEnabled( bgParserCheckbox->isChecked() );
@@ -25,7 +25,7 @@ void ConfigureProblemReporter::destroy()
 
 void ConfigureProblemReporter::accept()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup( "General Options" );
     config->writeEntry( "EnableJavaBgParser", bgParserCheckbox->isChecked() );
     if( bgParserCheckbox->isChecked() )
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index 4d7025e8..c1e45273 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -754,15 +754,15 @@ KMimeType::List JavaSupportPart::mimeTypes( )
 
 int JavaSupportPart::pcsVersion()
 {
-    KConfig* config = JavaSupportFactory::instance()->config();
-    KConfigGroupSaver cgs( config, "PCS" );
+    TDEConfig* config = JavaSupportFactory::instance()->config();
+    TDEConfigGroupSaver cgs( config, "PCS" );
     return config->readNumEntry( "Version", 0 );
 }
 
 void JavaSupportPart::setPcsVersion( int version )
 {
-    KConfig* config = JavaSupportFactory::instance()->config();
-    KConfigGroupSaver cgs( config, "PCS" );
+    TDEConfig* config = JavaSupportFactory::instance()->config();
+    TDEConfigGroupSaver cgs( config, "PCS" );
     config->writeEntry( "Version", version );
     config->sync();
 }
diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h
index fb5e3ebb..54e1d57f 100644
--- a/languages/java/javasupportpart.h
+++ b/languages/java/javasupportpart.h
@@ -72,7 +72,7 @@ public:
 
     KTextEditor::Document* findDocument( const KURL& url );
 
-    static KConfig *config();
+    static TDEConfig *config();
 
     virtual TQString formatTag( const Tag& tag );
     virtual TQString formatModelItem( const CodeModelItem *item, bool shortDescription=false );
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index a3206595..43aefed0 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -227,7 +227,7 @@ void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p
 void ProblemReporter::configure()
 {
     kdDebug(9013) << "ProblemReporter::configure()" << endl;
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup( "General Options" );
     m_active = config->readBoolEntry( "EnableJavaBgParser", TRUE );
     m_delay = config->readNumEntry( "BgParserDelay", 500 );
diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp
index 274cba8e..33568735 100644
--- a/languages/kjssupport/subclassingdlg.cpp
+++ b/languages/kjssupport/subclassingdlg.cpp
@@ -103,7 +103,7 @@ m_newFileNames(newFileNames), m_kjsSupport( kjsSupport )
   readUiFile();
   m_creatingNewSubclass = true;
 
-/*  KConfig *config = kjsSupportFactory::instance()->config();
+/*  TDEConfig *config = kjsSupportFactory::instance()->config();
   if (config)
   {
     config->setGroup("Subclassing");
@@ -125,7 +125,7 @@ m_newFileNames(dummy), m_kjsSupport( kjsSupport )
   m_creatingNewSubclass = false;
   m_filename = filename;
 
-  KConfig *config = kjsSupportFactory::instance()->config();
+  TDEConfig *config = kjsSupportFactory::instance()->config();
   if (config)
   {
     config->setGroup("Subclassing");
@@ -363,7 +363,7 @@ bool SubclassingDlg::saveBuffer(TQString &buffer, const TQString& filename)
 void SubclassingDlg::accept()
 //===========================
 {
-/*  KConfig *config = kjsSupportFactory::instance()->config();
+/*  TDEConfig *config = kjsSupportFactory::instance()->config();
   if (config)
   {
     config->setGroup("Subclassing");
diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp
index cc3c44ce..1618ba11 100644
--- a/languages/pascal/problemreporter.cpp
+++ b/languages/pascal/problemreporter.cpp
@@ -250,7 +250,7 @@ void ProblemReporter::reportMessage( TQString message,
 void ProblemReporter::configure()
 {
     kdDebug(9007) << "ProblemReporter::configure()" << endl;
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup( "General Options" );
     m_active = config->readBoolEntry( "EnablePascalBgParser", TRUE );
     m_delay = config->readNumEntry( "BgParserDelay", 500 );
diff --git a/languages/perl/perldoc.cpp b/languages/perl/perldoc.cpp
index bbb2fa2d..dee9b6d0 100644
--- a/languages/perl/perldoc.cpp
+++ b/languages/perl/perldoc.cpp
@@ -14,7 +14,7 @@
 #include <tdeversion.h>
 #include <kglobal.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 
 PerldocProtocol::PerldocProtocol(const TQCString &pool, const TQCString &app)
@@ -95,7 +95,7 @@ TQCString PerldocProtocol::errorMessage()
 void PerldocProtocol::stat(const KURL &/*url*/)
 {
     UDSAtom uds_atom;
-    uds_atom.m_uds = KIO::UDS_FILE_TYPE;
+    uds_atom.m_uds = TDEIO::UDS_FILE_TYPE;
     uds_atom.m_long = S_IFREG | S_IRWXU | S_IRWXG | S_IRWXO;
 
     UDSEntry uds_entry;
@@ -108,7 +108,7 @@ void PerldocProtocol::stat(const KURL &/*url*/)
 
 void PerldocProtocol::listDir(const KURL &url)
 {
-    error( KIO::ERR_CANNOT_ENTER_DIRECTORY, url.path() );
+    error( TDEIO::ERR_CANNOT_ENTER_DIRECTORY, url.path() );
 }
 
 
diff --git a/languages/perl/perldoc.h b/languages/perl/perldoc.h
index 4540c045..0ea1bf3a 100644
--- a/languages/perl/perldoc.h
+++ b/languages/perl/perldoc.h
@@ -5,7 +5,7 @@
 #include <kio/slavebase.h>
 
 
-class PerldocProtocol : public KIO::SlaveBase
+class PerldocProtocol : public TDEIO::SlaveBase
 {
 public:
     PerldocProtocol(const TQCString &pool, const TQCString &app);
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index db3aeed7..9435c274 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -116,8 +116,8 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin
 
    m_htmlView = new PHPHTMLView(this);
    mainWindow()->embedOutputView(m_htmlView->view(), i18n("PHP"), i18n("PHP"));
-   connect( m_htmlView,  TQT_SIGNAL(started(KIO::Job*)),
-            this, TQT_SLOT(slotWebJobStarted(KIO::Job*)));
+   connect( m_htmlView,  TQT_SIGNAL(started(TDEIO::Job*)),
+            this, TQT_SLOT(slotWebJobStarted(TDEIO::Job*)));
 
    configData = new PHPConfigData(projectDom());
    connect( configData,  TQT_SIGNAL(configStored()),
@@ -294,24 +294,24 @@ TQString PHPSupportPart::getExecuteFile() {
    return file;
 }
 
-void PHPSupportPart::slotWebJobStarted(KIO::Job* job) {
-   if (job && job->className() == TQString("KIO::TransferJob")) {
+void PHPSupportPart::slotWebJobStarted(TDEIO::Job* job) {
+   if (job && job->className() == TQString("TDEIO::TransferJob")) {
       kdDebug(9018) << endl << "job started" << job->progressId();
-      KIO::TransferJob *tjob = static_cast<KIO::TransferJob*>(job);
-      connect( tjob,  TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
-               this, TQT_SLOT(slotWebData(KIO::Job*, const TQByteArray&)));
-      connect( tjob,  TQT_SIGNAL(result(KIO::Job*)),
-               this, TQT_SLOT(slotWebResult(KIO::Job*)));
+      TDEIO::TransferJob *tjob = static_cast<TDEIO::TransferJob*>(job);
+      connect( tjob,  TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+               this, TQT_SLOT(slotWebData(TDEIO::Job*, const TQByteArray&)));
+      connect( tjob,  TQT_SIGNAL(result(TDEIO::Job*)),
+               this, TQT_SLOT(slotWebResult(TDEIO::Job*)));
    }
 }
 
-void PHPSupportPart::slotWebData(KIO::Job* /*job*/,const TQByteArray& data) {
+void PHPSupportPart::slotWebData(TDEIO::Job* /*job*/,const TQByteArray& data) {
    kdDebug(9018) << "slotWebData()" << endl;
    TQString strData(data);
    m_phpExeOutput += strData;
 }
 
-void PHPSupportPart::slotWebResult(KIO::Job* /*job*/) {
+void PHPSupportPart::slotWebResult(TDEIO::Job* /*job*/) {
    kdDebug(9018) << "slotWebResult()" << endl;
    TQString file = getExecuteFile();
    PHPFile *pfile = new PHPFile(this, file);
diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h
index d89c3277..f7d13122 100644
--- a/languages/php/phpsupportpart.h
+++ b/languages/php/phpsupportpart.h
@@ -75,9 +75,9 @@ private slots:
    void slotReceivedPHPExeStderr (TDEProcess* proc, char* buffer, int buflen);
    void slotReceivedPHPExeStdout (TDEProcess* proc, char* buffer, int buflen);
    void slotPHPExeExited (TDEProcess* proc);
-   void slotWebData(KIO::Job* job,const TQByteArray& data);
-   void slotWebResult(KIO::Job* job);
-   void slotWebJobStarted(KIO::Job* job);
+   void slotWebData(TDEIO::Job* job,const TQByteArray& data);
+   void slotWebResult(TDEIO::Job* job);
+   void slotWebJobStarted(TDEIO::Job* job);
 
    // Internal
    void initialParse();
diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp
index 1c07b404..760728c7 100644
--- a/languages/python/pydoc.cpp
+++ b/languages/python/pydoc.cpp
@@ -13,7 +13,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 
 PydocProtocol::PydocProtocol(const TQCString &pool, const TQCString &app)
@@ -75,7 +75,7 @@ TQCString PydocProtocol::errorMessage()
 void PydocProtocol::stat(const KURL &/*url*/)
 {
     UDSAtom uds_atom;
-    uds_atom.m_uds = KIO::UDS_FILE_TYPE;
+    uds_atom.m_uds = TDEIO::UDS_FILE_TYPE;
     uds_atom.m_long = S_IFREG | S_IRWXU | S_IRWXG | S_IRWXO;
 
     UDSEntry uds_entry;
@@ -88,7 +88,7 @@ void PydocProtocol::stat(const KURL &/*url*/)
 
 void PydocProtocol::listDir(const KURL &url)
 {
-    error( KIO::ERR_CANNOT_ENTER_DIRECTORY, url.path() );
+    error( TDEIO::ERR_CANNOT_ENTER_DIRECTORY, url.path() );
 }
 
 
diff --git a/languages/python/pydoc.h b/languages/python/pydoc.h
index 9e848a04..f5e639d7 100644
--- a/languages/python/pydoc.h
+++ b/languages/python/pydoc.h
@@ -5,7 +5,7 @@
 #include <kio/slavebase.h>
 
 
-class PydocProtocol : public KIO::SlaveBase
+class PydocProtocol : public TDEIO::SlaveBase
 {
 public:
     PydocProtocol(const TQCString &pool, const TQCString &app);
diff --git a/languages/ruby/app_templates/kapp/README b/languages/ruby/app_templates/kapp/README
index 318bd727..69e9ac5f 100644
--- a/languages/ruby/app_templates/kapp/README
+++ b/languages/ruby/app_templates/kapp/README
@@ -42,7 +42,7 @@ For more details, consult :
 http://devel-home.kde.org/~larrosa/tutorial/p9.html
 http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 
-* Use KConfig XT to create your configuration dialogs and make 
+* Use TDEConfig XT to create your configuration dialogs and make 
 them more maintainable.
 
 For more details, consult :
diff --git a/languages/ruby/app_templates/kapp/app.rb b/languages/ruby/app_templates/kapp/app.rb
index 9bc2ba03..61531be2 100644
--- a/languages/ruby/app_templates/kapp/app.rb
+++ b/languages/ruby/app_templates/kapp/app.rb
@@ -57,7 +57,7 @@ class %{APPNAMESC} < KDE::MainWindow
     
         if false
         # download the contents
-        if KIO::NetAccess.download(url, target, self)
+        if TDEIO::NetAccess.download(url, target, self)
             # set our caption
             setCaption(url.url)
     
@@ -65,7 +65,7 @@ class %{APPNAMESC} < KDE::MainWindow
             @view.openURL(KDE::URL.new(target))
     
             # and remove the temp file
-            KIO::NetAccess.removeTempFile(target)
+            TDEIO::NetAccess.removeTempFile(target)
         end
         end
     
diff --git a/languages/ruby/app_templates/kxt/README b/languages/ruby/app_templates/kxt/README
index 0e9ea0a3..27c63634 100644
--- a/languages/ruby/app_templates/kxt/README
+++ b/languages/ruby/app_templates/kxt/README
@@ -1,10 +1,10 @@
-KConfig XT Ruby template quick start
+TDEConfig XT Ruby template quick start
 Author: Anne-Marie Mahfouf
 Date: 2006-12-12
 -----------------------------------------------
 
 This README file explains you some basic things for starting with
-this application template, a KConfig XT Ruby template.
+this application template, a TDEConfig XT Ruby template.
 -----------------------------------------------
 
 -- REQUIREMENTS --
diff --git a/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate b/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate
index c88c5073..b413b3e5 100644
--- a/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate
+++ b/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate
@@ -1,35 +1,35 @@
 # KDE Config File
 [General]
 
-Name=KConfig XT application
-Name[ca]=Aplicació KConfig XT
-Name[da]=KConfig XT program
-Name[de]=KConfigXT-Anwendung
-Name[el]=Εφαρμογή KConfig XT
-Name[es]=Aplicación KConfig XT
-Name[et]=KConfig XT rakendus
-Name[eu]=KConfig XT aplikazioa
-Name[fa]=کاربرد KConfig XT
-Name[fr]=Application KConfig XT
-Name[ga]=Feidhmchlár XT KConfig
-Name[gl]=Aplicación KConfig XT
-Name[hu]=KConfig XT-alapú alkalmazás
-Name[it]=Applicazione KConfig XT
-Name[ja]=KConfig XT アプリケーション
-Name[nds]=KConfig-XT-Programm
-Name[ne]=KConfig XT अनुप्रयोग
-Name[nl]=KConfig XT-toepassing
-Name[pl]=Program KConfig XT
-Name[pt]=Aplicação do KConfig XT
-Name[pt_BR]=Aplicação do KConfig XT
-Name[ru]=Приложение KDE с KConfig XT
-Name[sk]=KConfig XT aplikácia
-Name[sr]=KConfig XT програм
-Name[sr@Latn]=KConfig XT program
-Name[sv]=KConfig XT-program
-Name[tr]=KConfig XT uygulaması
-Name[zh_CN]=KConfig XT 应用程序
-Name[zh_TW]=KConfig XT 應用程式
+Name=TDEConfig XT application
+Name[ca]=Aplicació TDEConfig XT
+Name[da]=TDEConfig XT program
+Name[de]=TDEConfigXT-Anwendung
+Name[el]=Εφαρμογή TDEConfig XT
+Name[es]=Aplicación TDEConfig XT
+Name[et]=TDEConfig XT rakendus
+Name[eu]=TDEConfig XT aplikazioa
+Name[fa]=کاربرد TDEConfig XT
+Name[fr]=Application TDEConfig XT
+Name[ga]=Feidhmchlár XT TDEConfig
+Name[gl]=Aplicación TDEConfig XT
+Name[hu]=TDEConfig XT-alapú alkalmazás
+Name[it]=Applicazione TDEConfig XT
+Name[ja]=TDEConfig XT アプリケーション
+Name[nds]=TDEConfig-XT-Programm
+Name[ne]=TDEConfig XT अनुप्रयोग
+Name[nl]=TDEConfig XT-toepassing
+Name[pl]=Program TDEConfig XT
+Name[pt]=Aplicação do TDEConfig XT
+Name[pt_BR]=Aplicação do TDEConfig XT
+Name[ru]=Приложение KDE с TDEConfig XT
+Name[sk]=TDEConfig XT aplikácia
+Name[sr]=TDEConfig XT програм
+Name[sr@Latn]=TDEConfig XT program
+Name[sv]=TDEConfig XT-program
+Name[tr]=TDEConfig XT uygulaması
+Name[zh_CN]=TDEConfig XT 应用程序
+Name[zh_TW]=TDEConfig XT 應用程式
 Category=Ruby/KDE
 Icon=kxtruby.png
 Comment=Generates a simple KDE application with one widget and a configuration dialog
@@ -221,31 +221,31 @@ Dest=%{dest}/src/settings.kcfgc
 
 [MSG]
 Type=message
-Comment=A Korundum KConfig XT Application was created at %{dest}
-Comment[ca]=Una aplicació Korundum amb KConfig XT ha estat creada a %{dest}
-Comment[da]=Et Korundum KConfig XT program blev oprettet i %{dest}
-Comment[de]=Eine Korundum-KConfig-XT-Anwendung wurde in %{dest} erstellt.
-Comment[el]=Μια εφαρμογή Korundum KConfig XT δημιουργήθηκε στο %{dest}
-Comment[es]=Una aplicación Korundum con KConfig XT ha sido creada en %{dest}
-Comment[et]=Korundumi KConfig XT rakendus loodi asukohta %{dest}
-Comment[eu]=Korundum KConfig XT aplikazio bat sortu da hemen: %{dest}
-Comment[fa]=یک کاربرد Korundum KConfig XT در %{dest} ایجاد شد
-Comment[fr]=Une application KConfig XT Korundum a été créée dans %{dest}
-Comment[ga]=Cruthaíodh Feidhmchlár Korundum KConfig XT ag %{dest}
-Comment[gl]=Creouse unha aplicación KConfig XT con Korundum en %{dest}
-Comment[hu]=Létrejött egy Korundum-alapú KConfig XT-s alkalmazás itt: %{dest}
-Comment[it]=È stata creata un'applicazione Korundum KConfig XT in %{dest}
-Comment[ja]=Korundum KConfig XT アプリケーションを %{dest} に作成しました
-Comment[nds]=In %{dest} wöör en Korundum/KConfig-XT-Programm opstellt.
-Comment[ne]=Korundum KConfig XT अनुप्रयोग %{dest} मा सिर्जना गरियो
-Comment[nl]=Een Korundum KConfig XT-toepassing is aangemaakt in %{dest}
-Comment[pl]=Program Korundum KConfig XT został utworzony w %{dest}
-Comment[pt]=Foi criada uma aplicação Korundum com KConfig XT em %{dest}
-Comment[pt_BR]=Foi criada uma aplicação Korundum com KConfig XT em %{dest}
-Comment[ru]=Приложение Korundum с KConfig XT создано в %{dest}
-Comment[sk]=Korundim KConfig XT aplikácia bola vytvorená v %{dest}
-Comment[sr]=Korundum KConfig XT програм направљен је у %{dest}
-Comment[sr@Latn]=Korundum KConfig XT program napravljen je u %{dest}
-Comment[sv]=Ett Korundum KConfig XT-program skapades i %{dest}
-Comment[tr]=Bir Korundum KConfig XT uygulaması %{dest} içinde yaratıldı.
-Comment[zh_TW]=一個 Korundum KConfig XT 應用程式已建立於 %{dest}
+Comment=A Korundum TDEConfig XT Application was created at %{dest}
+Comment[ca]=Una aplicació Korundum amb TDEConfig XT ha estat creada a %{dest}
+Comment[da]=Et Korundum TDEConfig XT program blev oprettet i %{dest}
+Comment[de]=Eine Korundum-TDEConfig-XT-Anwendung wurde in %{dest} erstellt.
+Comment[el]=Μια εφαρμογή Korundum TDEConfig XT δημιουργήθηκε στο %{dest}
+Comment[es]=Una aplicación Korundum con TDEConfig XT ha sido creada en %{dest}
+Comment[et]=Korundumi TDEConfig XT rakendus loodi asukohta %{dest}
+Comment[eu]=Korundum TDEConfig XT aplikazio bat sortu da hemen: %{dest}
+Comment[fa]=یک کاربرد Korundum TDEConfig XT در %{dest} ایجاد شد
+Comment[fr]=Une application TDEConfig XT Korundum a été créée dans %{dest}
+Comment[ga]=Cruthaíodh Feidhmchlár Korundum TDEConfig XT ag %{dest}
+Comment[gl]=Creouse unha aplicación TDEConfig XT con Korundum en %{dest}
+Comment[hu]=Létrejött egy Korundum-alapú TDEConfig XT-s alkalmazás itt: %{dest}
+Comment[it]=È stata creata un'applicazione Korundum TDEConfig XT in %{dest}
+Comment[ja]=Korundum TDEConfig XT アプリケーションを %{dest} に作成しました
+Comment[nds]=In %{dest} wöör en Korundum/TDEConfig-XT-Programm opstellt.
+Comment[ne]=Korundum TDEConfig XT अनुप्रयोग %{dest} मा सिर्जना गरियो
+Comment[nl]=Een Korundum TDEConfig XT-toepassing is aangemaakt in %{dest}
+Comment[pl]=Program Korundum TDEConfig XT został utworzony w %{dest}
+Comment[pt]=Foi criada uma aplicação Korundum com TDEConfig XT em %{dest}
+Comment[pt_BR]=Foi criada uma aplicação Korundum com TDEConfig XT em %{dest}
+Comment[ru]=Приложение Korundum с TDEConfig XT создано в %{dest}
+Comment[sk]=Korundim TDEConfig XT aplikácia bola vytvorená v %{dest}
+Comment[sr]=Korundum TDEConfig XT програм направљен је у %{dest}
+Comment[sr@Latn]=Korundum TDEConfig XT program napravljen je u %{dest}
+Comment[sv]=Ett Korundum TDEConfig XT-program skapades i %{dest}
+Comment[tr]=Bir Korundum TDEConfig XT uygulaması %{dest} içinde yaratıldı.
+Comment[zh_TW]=一個 Korundum TDEConfig XT 應用程式已建立於 %{dest}
diff --git a/lib/interfaces/extensions/kdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h
index 702312c8..640db77f 100644
--- a/lib/interfaces/extensions/kdevmakefrontend.h
+++ b/lib/interfaces/extensions/kdevmakefrontend.h
@@ -89,7 +89,7 @@ public:
     /**@return Whether the application is currently running.*/
     virtual bool isRunning() = 0;
     
-    /**Advices to synchronize the settings from KConfig because they were changed externally.*/
+    /**Advices to synchronize the settings from TDEConfig because they were changed externally.*/
     virtual void updateSettingsFromConfig() = 0;
 
 signals:
diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp
index 90af2b1c..f7895145 100644
--- a/lib/util/settings.cpp
+++ b/lib/util/settings.cpp
@@ -15,7 +15,7 @@
 
 #include "settings.h"
 
-TQString Settings::terminalEmulatorName( KConfig & config )
+TQString Settings::terminalEmulatorName( TDEConfig & config )
 {
 	config.setGroup("TerminalEmulator");
 	bool useKDESetting = config.readBoolEntry( "UseKDESetting", true );
@@ -23,7 +23,7 @@ TQString Settings::terminalEmulatorName( KConfig & config )
 
 	if ( useKDESetting )
 	{
-		KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
+		TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
 		terminal = confGroup.readEntry("TerminalApplication", TQString::fromLatin1("konsole"));
 	}
 	else
@@ -35,7 +35,7 @@ TQString Settings::terminalEmulatorName( KConfig & config )
 
 TQString Settings::profileByAttributes(const TQString &language, const TQStringList &keywords)
 {
-    KConfig config(locate("data", "tdevelop/profiles/projectprofiles"));
+    TDEConfig config(locate("data", "tdevelop/profiles/projectprofiles"));
     config.setGroup(language);
 
     TQStringList profileKeywords = TQStringList::split("/", "Empty");
diff --git a/lib/util/settings.h b/lib/util/settings.h
index ad92805d..65888357 100644
--- a/lib/util/settings.h
+++ b/lib/util/settings.h
@@ -12,13 +12,13 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-class KConfig;
+class TDEConfig;
 
 /// Utility functions for settings
 class Settings
 {
 public:
-	static TQString terminalEmulatorName( KConfig & config );
+	static TQString terminalEmulatorName( TDEConfig & config );
 	static TQString profileByAttributes(const TQString &language, const TQStringList &keywords);
 
 };
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index 323c2cc7..abbeebbc 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -27,7 +27,7 @@ KDevHTMLPart::KDevHTMLPart()
   connect(browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)),
           this, TQT_SLOT(openURLRequest(const KURL &)) );
 
-  connect(this, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(slotStarted(KIO::Job* )));
+  connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* )));
   connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()));
   connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &)));
 
@@ -78,7 +78,7 @@ KDevHTMLPart::KDevHTMLPart()
 //END documentation history stuff  
   
   //settings:
-  KConfig *appConfig = TDEGlobal::config();
+  TDEConfig *appConfig = TDEGlobal::config();
   appConfig->setGroup("KHTMLPart");
   setStandardFont(appConfig->readEntry("StandardFont",
       settings()->stdFontName()));
@@ -354,7 +354,7 @@ void KDevHTMLPart::slotStop( )
     closeURL();
 }
 
-void KDevHTMLPart::slotStarted( KIO::Job * )
+void KDevHTMLPart::slotStarted( TDEIO::Job * )
 {
     stopAction->setEnabled(true);
 }
diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h
index c9520d7f..805134a0 100644
--- a/lib/widgets/kdevhtmlpart.h
+++ b/lib/widgets/kdevhtmlpart.h
@@ -64,7 +64,7 @@ signals:
 
 protected slots:
 
-    void slotStarted(KIO::Job *);
+    void slotStarted(TDEIO::Job *);
     void slotCompleted();
     void slotCancelled(const TQString &errMsg);
     
diff --git a/lib/widgets/klistviewaction.cpp b/lib/widgets/klistviewaction.cpp
index adedc5a4..b4110375 100644
--- a/lib/widgets/klistviewaction.cpp
+++ b/lib/widgets/klistviewaction.cpp
@@ -28,7 +28,7 @@
 
 KListViewAction::~KListViewAction()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     if (config && m_view->name())
     {
         config->setGroup("KListViewAction");
@@ -76,7 +76,7 @@ void KListViewAction::setWhatsThis( const TQString & str )
 
 void KListViewAction::loadComboWidth( )
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     if (config && m_view->name())
     {
         config->setGroup("KListViewAction");
diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp
index 11f3a4d3..5aeeb62c 100644
--- a/parts/abbrev/abbrevpart.cpp
+++ b/parts/abbrev/abbrevpart.cpp
@@ -101,8 +101,8 @@ AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &)
     m_prevColumn = -1;
     m_sequenceLength = 0;
 
-    KConfig* config = AbbrevFactory::instance()->config();
-    KConfigGroupSaver group( config, "General" );
+    TDEConfig* config = AbbrevFactory::instance()->config();
+    TDEConfigGroupSaver group( config, "General" );
     m_autoWordCompletionEnabled = config->readBoolEntry( "AutoWordCompletion", false );
 
     updateActions();
@@ -126,8 +126,8 @@ void AbbrevPart::setAutoWordCompletionEnabled( bool enabled )
     if( enabled == m_autoWordCompletionEnabled )
 	return;
 
-    KConfig* config = AbbrevFactory::instance()->config();
-    KConfigGroupSaver group( config, "General" );
+    TDEConfig* config = AbbrevFactory::instance()->config();
+    TDEConfigGroupSaver group( config, "General" );
 
     m_autoWordCompletionEnabled = enabled;
     config->writeEntry( "AutoWordCompletion", m_autoWordCompletionEnabled );
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 67e97361..d9725ba4 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -116,7 +116,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
     m_appsInfo.setAutoDelete(true);
     m_tempFiles.setAutoDelete(true);
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
 
 	//config->setGroup("AppWizard");
 	//templates_tabwidget->setCurrentPage(config->readNumEntry("CurrentTab", 0));
@@ -139,7 +139,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
 		info->templateFile = TDEGlobal::dirs()->findResource("apptemplates", *it);
         info->templateName = (*it);
 
-		KConfig templateConfig(info->templateFile);
+		TDEConfig templateConfig(info->templateFile);
         templateConfig.setGroup("General");
 
         info->name = templateConfig.readEntry("Name");
@@ -186,7 +186,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
 			if( !(*include).isEmpty() )
 			{
 				TQString file = KMacroExpander::expandMacros( ( *include ), info->subMap);
-				KConfig tmpCfg( file );
+				TDEConfig tmpCfg( file );
 				tmpCfg.copyTo( "", &templateConfig);
 				kdDebug(9010) << "Merging: " << tmpCfg.name() << endl;
 			}
@@ -643,7 +643,7 @@ void AppWizardDialog::accept()
 		kdDebug( 9010 ) << "Process dir " << (*dirIt).dir  << endl;
 		if( m_pCurrentAppInfo->subMap[(*dirIt).option] != "false" )
 		{
-			if( ! KIO::NetAccess::mkdir( (*dirIt).dir, this ) )
+			if( ! TDEIO::NetAccess::mkdir( (*dirIt).dir, this ) )
 			{
 				KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").arg( (*dirIt).dir ) );
 				return;
@@ -786,14 +786,14 @@ bool AppWizardDialog::copyFile( const TQString &source, const TQString &dest, bo
 	else
 	{
 		// Copy the source file to the destFile.
-		return KIO::NetAccess::copy( source, dest, this );
+		return TDEIO::NetAccess::copy( source, dest, this );
 	}
 	return true;
 }
 
 void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const TQString &dest, bool process )
 {
-	KIO::NetAccess::mkdir( dest , this );
+	TDEIO::NetAccess::mkdir( dest , this );
 	kdDebug(9010) << "Dir : " << dir->name() << " at " << dest << endl;
 	TQStringList entries = dir->entries();
 	kdDebug(9010) << "Entries : " << entries.join(",") << endl;
@@ -913,7 +913,7 @@ void AppWizardDialog::destButtonClicked(const TQString& dir)
     if(!dir.isEmpty()) {
 
         // set new location as default project dir?
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         config->setGroup("General Options");
         TQDir defPrjDir( config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()) );
         TQDir newDir (dir);
@@ -1158,7 +1158,7 @@ void AppWizardDialog::removeFavourite()
 
 void AppWizardDialog::populateFavourites()
 {
-	KConfig* config = kapp->config();
+	TDEConfig* config = kapp->config();
 	config->setGroup("AppWizard");
 
 	//favourites are stored in config as a list of templates and a seperate
@@ -1204,7 +1204,7 @@ void AppWizardDialog::done(int r)
 		}
 	}
 
-	KConfig* config = kapp->config();
+	TDEConfig* config = kapp->config();
 	config->setGroup("AppWizard");
 	config->writePathEntry("FavTemplates", templatesList);
 	config->writeEntry("FavNames", iconNamesList);
@@ -1234,14 +1234,14 @@ void AppWizardDialog::setPermissions(const KArchiveFile *source, TQString dest)
 	if (source->permissions() & 00100)
 	{
 		kdDebug(9010) << "source is executable" << endl;
-		KIO::UDSEntry entry;
+		TDEIO::UDSEntry entry;
 		KURL kurl = KURL::fromPathOrURL(dest);
-		if (KIO::NetAccess::stat(kurl, entry, 0))
+		if (TDEIO::NetAccess::stat(kurl, entry, 0))
 		{
 			KFileItem it(entry, kurl);
 			int mode = it.permissions();
 			kdDebug(9010) << "stat shows permissions: " << mode << endl;
-			KIO::chmod(KURL::fromPathOrURL(dest), mode | 00100 );
+			TDEIO::chmod(KURL::fromPathOrURL(dest), mode | 00100 );
 		}
 	}
 }
@@ -1251,23 +1251,23 @@ void AppWizardDialog::setPermissions(const installFile &file)
 	kdDebug(9010) << "AppWizardDialog::setPermissions(const installFile &file)" << endl;
 	kdDebug(9010) << "	dest: " << file.dest << endl;
 
-	KIO::UDSEntry sourceentry;
+	TDEIO::UDSEntry sourceentry;
 	KURL sourceurl = KURL::fromPathOrURL(file.source);
-	if (KIO::NetAccess::stat(sourceurl, sourceentry, 0))
+	if (TDEIO::NetAccess::stat(sourceurl, sourceentry, 0))
 	{
 		KFileItem sourceit(sourceentry, sourceurl);
 		int sourcemode = sourceit.permissions();
 		if (sourcemode & 00100)
 		{
 			kdDebug(9010) << "source is executable" << endl;
-			KIO::UDSEntry entry;
+			TDEIO::UDSEntry entry;
 			KURL kurl = KURL::fromPathOrURL(file.dest);
-			if (KIO::NetAccess::stat(kurl, entry, 0))
+			if (TDEIO::NetAccess::stat(kurl, entry, 0))
 			{
 				KFileItem it(entry, kurl);
 				int mode = it.permissions();
 				kdDebug(9010) << "stat shows permissions: " << mode << endl;
-				KIO::chmod(KURL::fromPathOrURL(file.dest), mode | 00100 );
+				TDEIO::chmod(KURL::fromPathOrURL(file.dest), mode | 00100 );
 			}
 		}
 	}
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 75a4487f..c0d05a77 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -67,7 +67,7 @@ ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *na
 
     TQStringList::ConstIterator it;
     for (it = importNames.begin(); it != importNames.end(); ++it) {
-        KConfig config(TDEGlobal::dirs()->findResource("appimports", *it));
+        TDEConfig config(TDEGlobal::dirs()->findResource("appimports", *it));
         config.setGroup("General");
         TQString type = config.readEntry("Comment");
         project_combo->insertItem(type);
diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp
index 40f3ba3b..3d5fcff2 100644
--- a/parts/appwizard/profilesupport.cpp
+++ b/parts/appwizard/profilesupport.cpp
@@ -32,7 +32,7 @@ ProfileSupport::ProfileSupport(KDevPlugin *parent)
     
     for (KURL::List::const_iterator it = resources.constBegin(); it != resources.constEnd(); ++it)
     {
-        KConfig config((*it).path());
+        TDEConfig config((*it).path());
         config.setGroup("General");
         m_templateList += config.readListEntry("List");
     }
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
index eef40e98..620315d3 100644
--- a/parts/astyle/astyle_part.cpp
+++ b/parts/astyle/astyle_part.cpp
@@ -88,7 +88,7 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &)
 void AStylePart::loadGlobal()
 {
 //   kdDebug(9009) << "Load global"<<endl;
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("AStyle");
   TQString options = config->readEntry("Options","BlockBreak=0,BlockBreakAll=0,BlockIfElse=0,Brackets=Break,BracketsCloseHeaders=0,FStyle=UserDefined,Fill=Tabs,FillCount=4,FillEmptyLines=0,FillForce=0,IndentBlocks=0,IndentBrackets=0,IndentCases=0,IndentClasses=1,IndentLabels=1,IndentNamespaces=1,IndentPreprocessors=0,IndentSwitches=1,KeepBlocks=1,KeepStatements=1,MaxStatement=40,MinConditional=-1,PadOperators=0,PadParenthesesIn=1,PadParenthesesOut=1,PadParenthesesUn=1,");
   m_globalExtensions=TQStringList::split(",",config->readEntry("Extensions",defaultFormatExtensions));
@@ -123,7 +123,7 @@ void AStylePart::saveGlobal()
 //               kdDebug(9009) << "project before: "  <<iter.key() << "="<< iter.data()  << endl;
 // 		}
 
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("AStyle");
   config->writeEntry("Options",options);
   config->writeEntry("Extensions",m_globalExtensions.join(","));
diff --git a/parts/bookmarks/bookmarks_config.cpp b/parts/bookmarks/bookmarks_config.cpp
index 939dc6c2..f2164fd8 100644
--- a/parts/bookmarks/bookmarks_config.cpp
+++ b/parts/bookmarks/bookmarks_config.cpp
@@ -32,7 +32,7 @@ BookmarksConfig::~BookmarksConfig()
  */
 void BookmarksConfig::writeConfig()
 {
-	KConfig *config = kapp->config();   
+	TDEConfig *config = kapp->config();   
 	config->setGroup("Bookmarks");
 	
 	config->writeEntry("Context", _context );
@@ -49,7 +49,7 @@ void BookmarksConfig::writeConfig()
  */
 void BookmarksConfig::readConfig()
 {
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("Bookmarks");
 	
 	_context = config->readPropertyEntry( "Context", 5 ).toInt();
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 95c2ae2c..1f047168 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -94,7 +94,7 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part )
 
 	m_actionFollowEditor = new KToggleAction( i18n("Follow Editor"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" );
 
-    KConfig* config = m_part->instance()->config();
+    TDEConfig* config = m_part->instance()->config();
     config->setGroup( "General" );
     setViewMode( config->readNumEntry( "ViewMode", KDevelop3ViewMode ) );
     m_doFollowEditor = config->readBoolEntry( "FollowEditor", false );
@@ -102,7 +102,7 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part )
 
 ClassViewWidget::~ClassViewWidget( )
 {
-    KConfig* config = m_part->instance()->config();
+    TDEConfig* config = m_part->instance()->config();
     config->setGroup( "General" );
     config->writeEntry( "ViewMode", viewMode() );
     config->writeEntry( "FollowEditor", m_doFollowEditor );
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index 0d9d6a7a..5379119c 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -198,7 +198,7 @@ void Navigator::slotCursorPositionChanged()
     //FIXME: we assume that background parser delay is set globally in tdeveloprc file
     //for all available language supports
     //this is reasonable assumption because problem reporter should be the same for all languages
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup( "General Options" );
     int m_delay = config->readNumEntry( "BgParserDelay", 500 );
 
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index dc0c834d..3b9d2768 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -147,7 +147,7 @@ bool CTags2Part::createTagsFile(const TQString& tagFile, const TQString& dir)
 */
 
 	// get name of the ctags binary
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "CTAGS" );
 	TQString ctagsBinary = config->readEntry( "ctags binary" ).stripWhiteSpace();
 	if ( ctagsBinary.isEmpty() )
@@ -180,7 +180,7 @@ void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context)
 	if (ident.isEmpty())
 		return;
 
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "CTAGS" );
 	bool showDeclaration = config->readBoolEntry( "ShowDeclaration", true );
 	bool showDefinition = config->readBoolEntry( "ShowDefinition", true );
@@ -223,7 +223,7 @@ void CTags2Part::gotoTagForTypes( TQStringList const & types )
 
 	if ( list.count() < 1 ) return;
 
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup("CTAGS");
 	bool jumpToFirst = config->readBoolEntry( "JumpToFirst", false );
 
diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp
index d7458a85..1cdbc187 100644
--- a/parts/ctags2/ctags2_settingswidget.cpp
+++ b/parts/ctags2/ctags2_settingswidget.cpp
@@ -73,7 +73,7 @@ void CTags2SettingsWidget::loadSettings()
 
 	TQStringList activeTagsFiles = DomUtil::readListEntry(dom, "/ctagspart/activeTagsFiles", "file");
 
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "CTAGS" );
 	showDeclarationBox->setChecked( config->readBoolEntry( "ShowDeclaration", true ) );
 	showDefinitionBox->setChecked( config->readBoolEntry( "ShowDefinition", true ) );
@@ -102,7 +102,7 @@ void CTags2SettingsWidget::storeSettings()
 	DomUtil::writeEntry( dom, "/ctagspart/customArguments", tagfileCustomEdit->text() );
 	DomUtil::writeEntry( dom, "/ctagspart/customTagfilePath", tagfilePath->url() );
 
-	KConfig * config = kapp->config();
+	TDEConfig * config = kapp->config();
 	config->setGroup( "CTAGS" );
 	config->writeEntry( "ShowDeclaration", showDeclarationBox->isChecked() );
 	config->writeEntry( "ShowDefinition", showDefinitionBox->isChecked() );
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 88a716c8..681c09d1 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -44,7 +44,7 @@ TQStringList KDiffTextEdit::extPartsTranslated;
 
 KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name )
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup( "Diff" );
   _highlight = config->readBoolEntry( "Highlight", true );
 
@@ -53,7 +53,7 @@ KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit(
 
 KDiffTextEdit::~KDiffTextEdit()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
 
   config->setGroup( "Diff" );
   config->writeEntry( "Highlight", _highlight );
@@ -256,7 +256,7 @@ void DiffWidget::slotAppend( const TQString& str )
 }
 
 // internally for the TextEdit only!
-void DiffWidget::slotAppend( KIO::Job*, const TQByteArray& ba )
+void DiffWidget::slotAppend( TDEIO::Job*, const TQByteArray& ba )
 {
   slotAppend( TQString( ba ) );
 }
@@ -305,13 +305,13 @@ void DiffWidget::openURL( const KURL& url )
   if ( job )
     job->kill();
 
-  KIO::TransferJob* job = KIO::get( url );
+  TDEIO::TransferJob* job = TDEIO::get( url );
   if ( !job )
     return;
 
-  connect( job, TQT_SIGNAL(data( KIO::Job *, const TQByteArray & )),
-           this, TQT_SLOT(slotAppend( KIO::Job*, const TQByteArray& )) );
-  connect( job, TQT_SIGNAL(result( KIO::Job * )),
+  connect( job, TQT_SIGNAL(data( TDEIO::Job *, const TQByteArray & )),
+           this, TQT_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) );
+  connect( job, TQT_SIGNAL(result( TDEIO::Job * )),
            this, TQT_SLOT(slotFinished()) );
 }
 
diff --git a/parts/diff/diffwidget.h b/parts/diff/diffwidget.h
index 2b159e3f..b948fae1 100644
--- a/parts/diff/diffwidget.h
+++ b/parts/diff/diffwidget.h
@@ -21,7 +21,7 @@
 class KTempFile;
 class DiffPart;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -80,7 +80,7 @@ private slots:
     /** appends a piece of "diff" */
     void slotAppend( const TQString& str );
     /** overloaded for convenience */
-    void slotAppend( KIO::Job*, const TQByteArray& ba );
+    void slotAppend( TDEIO::Job*, const TQByteArray& ba );
     /** call this when the whole "diff" has been sent.
      *  Don't call slotAppend afterwards!
      */
@@ -100,7 +100,7 @@ private:
 private:
     DiffPart * m_part;
     KDiffTextEdit* te;
-    KIO::Job* job;
+    TDEIO::Job* job;
     KParts::ReadOnlyPart* extPart;
     KTempFile* tempFile;
     TQString rawDiff;
diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp
index 24e37cdb..90f66120 100644
--- a/parts/distpart/distpart_widget.cpp
+++ b/parts/distpart/distpart_widget.cpp
@@ -191,7 +191,7 @@ void DistpartDialog::slotuploadSubmitPushButtonPressed() {
         kdDebug() << "Implement ftp.kde.org & apps.kde.com ftp transfer" << endl;
     else {
         for(unsigned int i=0; i< uploadFileListBox->count(); i++)
-	    KIO::NetAccess::copy(KURL::fromPathOrURL( uploadFileListBox->text(i) ),
+	    TDEIO::NetAccess::copy(KURL::fromPathOrURL( uploadFileListBox->text(i) ),
                     KURL::fromPathOrURL( getuploadURLLineEditText() +  uploadFileListBox->text(i).replace(TQRegExp("[^/]*/"),"") ));
     }
 }
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index 712a57fa..0b04548d 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -63,7 +63,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
         (*it)->loadCatalogConfiguration( m_View );
     }
 
-    KConfig *config = m_part->config();
+    TDEConfig *config = m_part->config();
     //read full text search settings
     config->setGroup("htdig");
     TQString databaseDir = kapp->dirs()->saveLocation("data",
@@ -105,7 +105,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
 
     //font sizes and zoom levels
     KHTMLPart htmlpart;
-    KConfig *appConfig = TDEGlobal::config();
+    TDEConfig *appConfig = TDEGlobal::config();
     appConfig->setGroup("KHTMLPart");
     standardFont_combo->setCurrentText(appConfig->readEntry("StandardFont",
         htmlpart.settings()->stdFontName()));
@@ -173,7 +173,7 @@ void DocGlobalConfigWidget::accept()
 		(*it)->reinit(m_widget->contents(), m_widget->index(), TQStringList());
 	}
 
-    KConfig *config = m_part->config();
+    TDEConfig *config = m_part->config();
     //write full text search settings
     config->setGroup("htdig");
     config->writePathEntry("databaseDir", DocUtils::envURL(databaseDirEdit));
@@ -214,7 +214,7 @@ void DocGlobalConfigWidget::accept()
     m_part->setAssistantUsed(useAssistant_box->isChecked());
 
     //font sizes and zoom levels
-    KConfig *appConfig = TDEGlobal::config();
+    TDEConfig *appConfig = TDEGlobal::config();
     appConfig->setGroup("KHTMLPart");
     appConfig->writeEntry("StandardFont", standardFont_combo->currentText());
     appConfig->writeEntry("FixedFont", fixedFont_combo->currentText());
@@ -241,7 +241,7 @@ void DocGlobalConfigWidget::updateConfigForHTMLParts()
         KHTMLPart *htmlPart = dynamic_cast<KHTMLPart*>(m_part->partController()->partForURL(*it));
         if (htmlPart)
         {
-            KConfig *appConfig = TDEGlobal::config();
+            TDEConfig *appConfig = TDEGlobal::config();
             appConfig->setGroup("KHTMLPart");
             htmlPart->setStandardFont(appConfig->readEntry("StandardFont"));
             htmlPart->setFixedFont(appConfig->readEntry("FixedFont"));
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 23fd0e14..32b08323 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -183,7 +183,7 @@ void DocumentationPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *pag
     }
 }
 
-KConfig *DocumentationPart::config()
+TDEConfig *DocumentationPart::config()
 {
     return DocumentationFactory::instance()->config();
 }
@@ -508,7 +508,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
 
 bool DocumentationPart::hasContextFeature(ContextFeature feature)
 {
-    KConfig *config = DocumentationFactory::instance()->config();
+    TDEConfig *config = DocumentationFactory::instance()->config();
     TQString group = config->group();
     config->setGroup("Context Features");
     switch (feature)
@@ -535,7 +535,7 @@ bool DocumentationPart::hasContextFeature(ContextFeature feature)
 
 void DocumentationPart::setContextFeature(ContextFeature feature, bool b)
 {
-    KConfig *config = DocumentationFactory::instance()->config();
+    TDEConfig *config = DocumentationFactory::instance()->config();
     TQString group = config->group();
     config->setGroup("Context Features");
     TQString key;
@@ -687,7 +687,7 @@ void DocumentationPart::setAssistantUsed(bool b)
 {
     m_assistantUsed = b;
     //use global config to store different settings for kdevassistant and tdevelop
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Documentation");
     config->writeEntry("UseAssistant", isAssistantUsed());
 }
@@ -735,7 +735,7 @@ void DocumentationPart::callAssistant(const TQCString &interface, const TQCStrin
 
 void DocumentationPart::loadSettings()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Documentation");
     m_assistantUsed = config->readBoolEntry("UseAssistant", false);
     
diff --git a/parts/documentation/documentation_part.h b/parts/documentation/documentation_part.h
index d6bdacd2..722ad4bd 100644
--- a/parts/documentation/documentation_part.h
+++ b/parts/documentation/documentation_part.h
@@ -27,7 +27,7 @@
 class FindDocumentation;
 class DocumentationWidget;
 class IndexBox;
-class KConfig;
+class TDEConfig;
 class KDialogBase;
 class ConfigWidgetProxy;
 class DocumentationPlugin;
@@ -84,7 +84,7 @@ signals:
     
 protected:
     void loadDocumentationPlugins();
-    KConfig *config();
+    TDEConfig *config();
     void setupActions();
     void loadSettings();
     void saveProjectDocumentationInfo();
diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp
index 90cd6234..84d8eada 100644
--- a/parts/documentation/documentation_widget.cpp
+++ b/parts/documentation/documentation_widget.cpp
@@ -69,7 +69,7 @@ DocumentationWidget::DocumentationWidget(DocumentationPart *part)
 
 DocumentationWidget::~DocumentationWidget()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Documentation");
     config->writeEntry("LastPage", m_tab->currentIndex());
 }
diff --git a/parts/documentation/find_documentation_options.h b/parts/documentation/find_documentation_options.h
index 65f852ba..ab1a3cc9 100644
--- a/parts/documentation/find_documentation_options.h
+++ b/parts/documentation/find_documentation_options.h
@@ -24,7 +24,7 @@
 #include "find_documentation_optionsbase.h"
 
 class TQCheckListItem;
-class KConfig;
+class TDEConfig;
 
 class FindDocumentationOptions : public FindDocumentationOptionsBase
 {
@@ -60,7 +60,7 @@ private:
     TQCheckListItem *m_google_item;
     TQCheckListItem *m_contents_item;
     
-    KConfig* config;    
+    TDEConfig* config;    
 };
 
 #endif
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
index 15d0d0a9..5c261c4c 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
@@ -253,7 +253,7 @@ int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int
 
 //class DocumentationPlugin
 
-DocumentationPlugin::DocumentationPlugin(KConfig *pluginConfig, TQObject *parent, const char *name)
+DocumentationPlugin::DocumentationPlugin(TDEConfig *pluginConfig, TQObject *parent, const char *name)
     :TQObject(parent, name), config(pluginConfig), m_indexCreated(false)
 {
 }
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h
index 545b101a..aa329ac5 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.h
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.h
@@ -234,7 +234,7 @@ public:
     setCapabilities(Index | FullTextSearch);
     @endcode
     */
-    DocumentationPlugin(KConfig *pluginConfig, TQObject *parent =0, const char *name =0);
+    DocumentationPlugin(TDEConfig *pluginConfig, TQObject *parent =0, const char *name =0);
     virtual ~DocumentationPlugin();
 
     /**Returns the i18n name of the plugin.*/
@@ -298,8 +298,8 @@ public:
     /**Loads catalog configuration and fills configurationView with ConfigurationItem objects.*/
     virtual void loadCatalogConfiguration(KListView *configurationView);
     /**Saves catalog configuration basing on configurationView and
-    deletedConfigurationItems contents. If you use KConfig to store configuration,
-    it is important that you call KConfig::sync() method after saving.*/
+    deletedConfigurationItems contents. If you use TDEConfig to store configuration,
+    it is important that you call TDEConfig::sync() method after saving.*/
     virtual void saveCatalogConfiguration(KListView *configurationView);
     /**Adds new catalog to a configuration.*/
     virtual void addCatalogConfiguration(KListView *configurationView,
@@ -366,7 +366,7 @@ protected:
     TQStringList deletedConfigurationItems;
 
     /**Configuration object used by a plugin.*/
-    KConfig *config;
+    TDEConfig *config;
 
 private:
     /**Adds catalog item to catalogs, namedCatalogs and indexes lists and maps.*/
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index 09b81d72..7293d985 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -82,7 +82,7 @@ TQString DocCHMPlugin::getSpecialData(const TQString& name, KURL url) {
     
     url.addPath("/:" + name);
     TQString tmpFile;
-    if( KIO::NetAccess::download( url, tmpFile, 0 ) )
+    if( TDEIO::NetAccess::download( url, tmpFile, 0 ) )
     {
         std::filebuf fb;
         fb.open (tmpFile.ascii(), std::ios::in);
@@ -93,7 +93,7 @@ TQString DocCHMPlugin::getSpecialData(const TQString& name, KURL url) {
             ret += buf; ret += "\n";
         }
         fb.close();
-        KIO::NetAccess::removeTempFile( tmpFile );
+        TDEIO::NetAccess::removeTempFile( tmpFile );
     } else {
         kdDebug(9002) << "DocCHMPlugin::getSpecialData could not download data from " << url.url() << endl;
     }
diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h
index 4712dc14..53dd6740 100644
--- a/parts/documentation/plugins/qt/docqtplugin.h
+++ b/parts/documentation/plugins/qt/docqtplugin.h
@@ -23,7 +23,7 @@
 #include <kdevdocumentationplugin.h>
 #include <tqdom.h>
 
-class KConfig;
+class TDEConfig;
 
 class DocQtPlugin : public DocumentationPlugin
 {
diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp
index 3f0fbc54..7c8421a8 100644
--- a/parts/documentation/protocols/chm/chm.cpp
+++ b/parts/documentation/protocols/chm/chm.cpp
@@ -35,7 +35,7 @@
 #include "chm.h"
 
 
-using namespace KIO;
+using namespace TDEIO;
 
 extern "C"
 {
@@ -100,13 +100,13 @@ void ChmProtocol::get( const KURL& url )
     
     TQString path;
     if ( !checkNewFile( bigpath, path ) ) {
-            error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() );
+            error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL() );
             return;
     }
     
 
     if (m_dirMap.find(path) == m_dirMap.end()) {
-        error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() );
+        error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL() );
         return;
     }
 
diff --git a/parts/documentation/protocols/chm/chm.h b/parts/documentation/protocols/chm/chm.h
index feb075dc..333b5ca3 100644
--- a/parts/documentation/protocols/chm/chm.h
+++ b/parts/documentation/protocols/chm/chm.h
@@ -26,7 +26,7 @@
 
 class TQCString;
 
-class ChmProtocol : public KIO::SlaveBase
+class ChmProtocol : public TDEIO::SlaveBase
 {
 public:
     ChmProtocol( const TQCString&, const TQCString& );
diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp
index c9c5f58e..11e5e93e 100644
--- a/parts/documentation/protocols/chm/kchmpart.cpp
+++ b/parts/documentation/protocols/chm/kchmpart.cpp
@@ -100,18 +100,18 @@ bool KChmPart::openFile()
 
    m_htmlData.truncate(0);
 
-   m_job = KIO::get( TQString("chm:")+m_file+"/", true, false );
-   connect( m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( KIO::Job *, const TQByteArray &) ) );
-   connect( m_job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( jobDone( KIO::Job * ) ) );
+   m_job = TDEIO::get( TQString("chm:")+m_file+"/", true, false );
+   connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) );
+   connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( jobDone( TDEIO::Job * ) ) );
    return true;
 }
 
-void KChmPart::readData(KIO::Job * , const TQByteArray & data)
+void KChmPart::readData(TDEIO::Job * , const TQByteArray & data)
 {
     m_htmlData += data;
 }
 
-void KChmPart::jobDone( KIO::Job *)
+void KChmPart::jobDone( TDEIO::Job *)
 {
    m_job=0;
    begin();
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h
index 3ed054fe..1ec2eaf8 100644
--- a/parts/documentation/protocols/chm/kchmpart.h
+++ b/parts/documentation/protocols/chm/kchmpart.h
@@ -64,14 +64,14 @@ class KChmPart : public KDevHTMLPart
       virtual bool openURL( const KURL & );
 /*
    protected slots:
-      void readData(KIO::Job * , const TQByteArray & data);
-      void jobDone( KIO::Job *);
+      void readData(TDEIO::Job * , const TQByteArray & data);
+      void jobDone( TDEIO::Job *);
 */
    protected:
       //virtual bool openFile();
       TDEInstance *m_instance;
       KParts::BrowserExtension *m_extension;
-      KIO::TransferJob *m_job;
+      TDEIO::TransferJob *m_job;
       TQCString m_htmlData;
 
    protected slots:
diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp
index 69a91a6e..16f71171 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -123,7 +123,7 @@ void SearchView::updateConfig()
 void SearchView::updateIndex()
 {
     runHtdig("-i");
-    KConfig *config = m_part->config();
+    TDEConfig *config = m_part->config();
     config->setGroup("htdig");
     config->writeEntry("IsSetup", true);
     config->sync();
@@ -141,7 +141,7 @@ void tqt_leave_modal(TQWidget *widget);
 
 void SearchView::search()
 {
-    KConfig *config = m_part->config();
+    TDEConfig *config = m_part->config();
     config->setGroup("htdig");
     if (config->readBoolEntry("IsSetup", false) == false)
     {
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index 4c0dfa99..b7b56304 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -48,7 +48,7 @@ ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name)
     indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
     TQDir d; d.mkdir(indexdir);
 
-    KConfig config("kdevdocumentation", true);
+    TDEConfig config("kdevdocumentation", true);
     config.setGroup("htdig");
     databaseDir = config.readPathEntry("databaseDir", indexdir);
 
@@ -300,7 +300,7 @@ bool ProgressDialog::generateIndex()
     setState(1);
     procdone = false;
     // run htdig
-    KConfig config("kdevdocumentation", true);
+    TDEConfig config("kdevdocumentation", true);
     config.setGroup("htdig");
     exe = config.readPathEntry("htdigbin", kapp->dirs()->findExe("htdig"));
     if (exe.isEmpty())
@@ -365,7 +365,7 @@ void ProgressDialog::htdigExited(TDEProcess *proc)
         setFilesDigged(filesToDig);
         setState(2);
 
-        KConfig config("kdevdocumentation", true);
+        TDEConfig config("kdevdocumentation", true);
         config.setGroup("htdig");
         // run htmerge -----------------------------------------------------
         exe = config.readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge"));
diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp
index d703197c..45721e17 100644
--- a/parts/filecreate/fcconfigwidget.cpp
+++ b/parts/filecreate/fcconfigwidget.cpp
@@ -352,13 +352,13 @@ void FCConfigWidget::copyTemplate(TQString templateUrl, TQString dest, TQString
     {
         KURL destDir;
         destDir.setPath(dest);
-        if (!KIO::NetAccess::exists(destDir, false, 0 ))
-            KIO::NetAccess::mkdir(destDir);
+        if (!TDEIO::NetAccess::exists(destDir, false, 0 ))
+            TDEIO::NetAccess::mkdir(destDir);
 
         KURL destination;
         destination.setPath(dest + destName);
 
-        KIO::NetAccess::upload(templateUrl, destination);
+        TDEIO::NetAccess::upload(templateUrl, destination);
     }
 }
 
@@ -411,7 +411,7 @@ void FCConfigWidget::removetemplate_button_clicked( )
     {
         KURL removedTemplate;
         removedTemplate.setPath(m_part->project()->projectDirectory() + "/templates/" + fctemplates_view->currentItem()->text(0));
-        KIO::NetAccess::del(removedTemplate);
+        TDEIO::NetAccess::del(removedTemplate);
         TQListViewItem *it = fctemplates_view->currentItem();
         if (it->itemBelow())
         {
diff --git a/parts/filelist/projectviewconfig.cpp b/parts/filelist/projectviewconfig.cpp
index 31149b91..0aeac511 100644
--- a/parts/filelist/projectviewconfig.cpp
+++ b/parts/filelist/projectviewconfig.cpp
@@ -28,7 +28,7 @@
 ProjectviewConfig::ProjectviewConfig(TQWidget *parent, const char *name)
     : ProjectviewConfigBase(parent, name)
 {
-  KConfig * config = kapp->config();
+  TDEConfig * config = kapp->config();
   config->setGroup("File List Plugin");
   inToolview->setChecked(config->readBoolEntry("ToolbarInToolview", true));
   onlyProject->setChecked(config->readBoolEntry("OnlyProjectFiles", false));
@@ -37,7 +37,7 @@ ProjectviewConfig::ProjectviewConfig(TQWidget *parent, const char *name)
 
 void ProjectviewConfig::accept()
 {
-  KConfig * config = kapp->config();
+  TDEConfig * config = kapp->config();
   config->setGroup("File List Plugin");
   config->writeEntry("ToolbarInToolview", inToolview->isChecked());
   config->writeEntry("OnlyProjectFiles", onlyProject->isChecked());
diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp
index b0b6815c..45d186ae 100644
--- a/parts/filelist/projectviewpart.cpp
+++ b/parts/filelist/projectviewpart.cpp
@@ -88,7 +88,7 @@ ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStr
     connect(core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()));
     connect(core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()));
   
-    KConfig * config = kapp->config();
+    TDEConfig * config = kapp->config();
     config->setGroup("File List Plugin");
     if (config->readBoolEntry("ToolbarInToolview", true))
     {
@@ -382,7 +382,7 @@ void ProjectviewPart::projectClosed()
 
 void ProjectviewPart::slotOpenProjectView(const TQString &view)
 {
-    KConfig * config = kapp->config();
+    TDEConfig * config = kapp->config();
     config->setGroup("File List Plugin");
     bool onlyProject = config->readBoolEntry("OnlyProjectFiles", false);
     bool closeOpenFiles = config->readBoolEntry("CloseOpenFiles", true);
@@ -535,7 +535,7 @@ void ProjectviewPart::slotSaveAsProjectView(bool askForName)
 
 void ProjectviewPart::writeConfig()
 {
-  KConfig * config = kapp->config();
+  TDEConfig * config = kapp->config();
   config->deleteGroup("ProjectViews", true);
   config->setGroup("ProjectViews");
     
@@ -559,7 +559,7 @@ void ProjectviewPart::writeConfig()
 
 void ProjectviewPart::readConfig()
 {
-  KConfig * config = kapp->config();
+  TDEConfig * config = kapp->config();
   TQMap<TQString, TQString> entries = config->entryMap("ProjectViews");
   
   m_projectViews.clear();
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 0472f38b..d2d8ffff 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -237,7 +237,7 @@ KDevFileSelector::~KDevFileSelector()
 
 //BEGIN Public Methods
 
-void KDevFileSelector::readConfig(KConfig *config, const TQString & name)
+void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name)
 {
     dir->readConfig(config, name + ":dir");
     dir->setView( KFile::Default );
@@ -288,7 +288,7 @@ void KDevFileSelector::initialDirChangeHack()
     setDir( waitingDir );
 }
 
-void KDevFileSelector::setupToolbar( KConfig *config )
+void KDevFileSelector::setupToolbar( TDEConfig *config )
 {
     toolbar->clear();
     TQStringList tbactions = config->readListEntry( "toolbar actions", ',' );
@@ -311,7 +311,7 @@ void KDevFileSelector::setupToolbar( KConfig *config )
     }
 }
 
-void KDevFileSelector::writeConfig(KConfig *config, const TQString & name)
+void KDevFileSelector::writeConfig(TDEConfig *config, const TQString & name)
 {
     dir->writeConfig(config,name + ":dir");
 
@@ -686,7 +686,7 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect
 
 void KFSConfigPage::apply()
 {
-    KConfig *config = fileSelector->m_part->instance()->config();
+    TDEConfig *config = fileSelector->m_part->instance()->config();
     config->setGroup( "fileselector" );
     // toolbar
     TQStringList l;
@@ -741,7 +741,7 @@ void KFSConfigPage::reload()
 
 void KFSConfigPage::init()
 {
-    KConfig *config = fileSelector->m_part->instance()->config();
+    TDEConfig *config = fileSelector->m_part->instance()->config();
     config->setGroup( "fileselector" );
     // toolbar
     TQStringList l = config->readListEntry( "toolbar actions", ',' );
diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h
index 65bd2000..17c533ee 100644
--- a/parts/fileselector/fileselector_widget.h
+++ b/parts/fileselector/fileselector_widget.h
@@ -116,9 +116,9 @@ public:
                       TQWidget * parent = 0, const char * name = 0 );
     ~KDevFileSelector();
 
-    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 );
     KDevDirOperator *dirOperator(){ return dir; }
     KActionCollection *actionCollection() { return mActionCollection; };
diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp
index 3873c112..a6c79495 100644
--- a/parts/fileview/fileviewpart.cpp
+++ b/parts/fileview/fileviewpart.cpp
@@ -112,9 +112,9 @@ void FileViewPart::loadSettings()
         unknown = TQColor( white ),
         defaultColor = TQColor( white );
 
-    KConfig *cfg = instance()->config();
+    TDEConfig *cfg = instance()->config();
 
-    KConfigGroupSaver gs( cfg, "VCS Colors" );
+    TDEConfigGroupSaver gs( cfg, "VCS Colors" );
     vcsColors.added = cfg->readColorEntry( "FileAddedColor", &added );
     vcsColors.updated = cfg->readColorEntry( "FileUpdatedColor", &updated );
     vcsColors.sticky = cfg->readColorEntry( "FileStickyColor", &sticky );
@@ -130,9 +130,9 @@ void FileViewPart::loadSettings()
 
 void FileViewPart::storeSettings()
 {
-    KConfig *cfg = instance()->config();
+    TDEConfig *cfg = instance()->config();
     // VCS colors
-    KConfigGroupSaver gs( cfg, "VCS Colors" );
+    TDEConfigGroupSaver gs( cfg, "VCS Colors" );
     cfg->writeEntry( "FileAddedColor", vcsColors.added );
     cfg->writeEntry( "FileUpdatedColor", vcsColors.updated );
     cfg->writeEntry( "FileStickyColor", vcsColors.sticky );
diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp
index 59a95db0..59b598e1 100644
--- a/parts/filter/shellfilterdlg.cpp
+++ b/parts/filter/shellfilterdlg.cpp
@@ -51,7 +51,7 @@ ShellFilterDialog::ShellFilterDialog()
 
     m_proc = 0;
 
-    KConfig *config = FilterFactory::instance()->config();
+    TDEConfig *config = FilterFactory::instance()->config();
     config->setGroup("General");
     combo->insertStringList(config->readListEntry("filteritems"));
 }
@@ -67,7 +67,7 @@ ShellFilterDialog::~ShellFilterDialog()
     for (int i=0; i < combo->count(); ++i)
         list << combo->text(i);
 
-    KConfig *config = FilterFactory::instance()->config();
+    TDEConfig *config = FilterFactory::instance()->config();
     config->setGroup("General");
     config->writeEntry("filteritems", list);
 }
diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp
index d1799663..fd8752e4 100644
--- a/parts/filter/shellinsertdlg.cpp
+++ b/parts/filter/shellinsertdlg.cpp
@@ -52,7 +52,7 @@ ShellInsertDialog::ShellInsertDialog()
     connect( combo->lineEdit(), TQT_SIGNAL(textChanged( const TQString &)), this, TQT_SLOT(executeTextChanged( const TQString &)));
     m_proc = 0;
 
-    KConfig *config = FilterFactory::instance()->config();
+    TDEConfig *config = FilterFactory::instance()->config();
     config->setGroup("General");
     TQStringList items = config->readListEntry("InsertItems");
     combo->insertStringList(items);
@@ -71,7 +71,7 @@ ShellInsertDialog::~ShellInsertDialog()
     for (int i=0; i < combo->count(); ++i)
         list << combo->text(i);
 
-    KConfig *config = FilterFactory::instance()->config();
+    TDEConfig *config = FilterFactory::instance()->config();
     config->setGroup("General");
     config->writeEntry("InsertItems", list);
 }
diff --git a/parts/grepview/grepdlg.h b/parts/grepview/grepdlg.h
index 60637a0f..719bbfdc 100644
--- a/parts/grepview/grepdlg.h
+++ b/parts/grepview/grepdlg.h
@@ -19,7 +19,7 @@
 #include <klineedit.h>
 
 
-class KConfig;
+class TDEConfig;
 class KURLRequester;
 class TQPushButton;
 class GrepViewPart;
@@ -90,7 +90,7 @@ private:
     TQCheckBox *no_find_err_box;
     TQCheckBox *case_sens_box;
     TQCheckBox *keep_output_box;
-    KConfig* config;
+    TDEConfig* config;
     TQPushButton *search_button;
 	TQPushButton *synch_button;
 	GrepViewPart * m_part;
diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp
index 62a10d86..8c9e517b 100644
--- a/parts/konsole/konsoleviewwidget.cpp
+++ b/parts/konsole/konsoleviewwidget.cpp
@@ -104,7 +104,7 @@ void KonsoleViewWidget::setDirectory(const KURL &dirUrl)
     {
         kdDebug(9035) << k_funcinfo << "Changing dirUrl.path() == " << dirUrl.path() << endl;
         kdDebug(9035) << k_funcinfo << "Changing part->url.path() == " << part->url().path() << endl;
-        KConfig* config = kapp->config();
+        TDEConfig* config = kapp->config();
         
         kdDebug(9035) << k_funcinfo << "SyncTerminalEmulator: " << config->readBoolEntry("SyncTerminalEmulator") << endl;
 
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index 6560552d..6020b1d6 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -43,7 +43,7 @@ AppOutputWidget::AppOutputWidget(AppOutputViewPart* part)
 	connect(this, TQT_SIGNAL(executed(TQListBoxItem*)), TQT_SLOT(slotRowSelected(TQListBoxItem*)));
 	connect(this, TQT_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )), 
 		TQT_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & )));
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("General Options");
 	setFont(config->readFontEntry("OutputViewFont"));
   setSelectionMode(TQListBox::Extended);
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 4dd11fa5..ad106ef0 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -527,7 +527,7 @@ void MakeWidget::searchItem(int parag)
 void MakeWidget::insertStdoutLine( const TQCString& line )
 {
     TQString sline;
-    bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
+    bool forceCLocale = TDEConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
     
     if( forceCLocale )
         sline = TQString::fromAscii( stdoutbuf+line );
@@ -542,7 +542,7 @@ void MakeWidget::insertStdoutLine( const TQCString& line )
 void MakeWidget::insertStderrLine( const TQCString& line )
 {
     TQString sline;
-    bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
+    bool forceCLocale = TDEConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
     
     if( forceCLocale ) {
         sline = TQString( stderrbuf+line );
@@ -724,7 +724,7 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos )
 void MakeWidget::toggleLineWrapping()
 {
 	m_bLineWrapping = !m_bLineWrapping;
-	KConfig *pConfig = kapp->config();
+	TDEConfig *pConfig = kapp->config();
 	pConfig->setGroup("MakeOutputView");
 	pConfig->writeEntry("LineWrapping", m_bLineWrapping);
 	pConfig->sync();
@@ -759,7 +759,7 @@ void MakeWidget::slotFullCompilerOutput() { setTextFormat( TQt::RichText ); setC
 void MakeWidget::setCompilerOutputLevel(EOutputLevel level)
 {
 	m_compilerOutputLevel = level;
-	KConfig *pConfig = kapp->config();
+	TDEConfig *pConfig = kapp->config();
 	pConfig->setGroup("MakeOutputView");
 	pConfig->writeEntry("CompilerOutputLevel", (int) level);
 	pConfig->sync();
@@ -769,7 +769,7 @@ void MakeWidget::setCompilerOutputLevel(EOutputLevel level)
 void MakeWidget::toggleShowDirNavigMessages()
 {
 	DirectoryItem::setShowDirectoryMessages( !DirectoryItem::getShowDirectoryMessages() );
-	KConfig *pConfig = kapp->config();
+	TDEConfig *pConfig = kapp->config();
 	pConfig->setGroup("MakeOutputView");
 	pConfig->writeEntry("ShowDirNavigMsg", DirectoryItem::getShowDirectoryMessages());
 	pConfig->sync();
@@ -778,7 +778,7 @@ void MakeWidget::toggleShowDirNavigMessages()
 
 void MakeWidget::updateSettingsFromConfig()
 {
-	KConfig *pConfig = kapp->config();
+	TDEConfig *pConfig = kapp->config();
 	pConfig->setGroup("General Options");
 	TQFont outputFont = pConfig->readFontEntry("OutputViewFont");
 	setFont(outputFont);
diff --git a/parts/scripting/scriptingglobalconfig.cpp b/parts/scripting/scriptingglobalconfig.cpp
index 78749465..45d005a3 100644
--- a/parts/scripting/scriptingglobalconfig.cpp
+++ b/parts/scripting/scriptingglobalconfig.cpp
@@ -28,7 +28,7 @@ scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *pare
     : scriptingGlobalConfigBase(parent, name), m_part(part)
 {
     // read kconfig and post list to the m_dirs
-    KConfig *cfg = kapp->config();
+    TDEConfig *cfg = kapp->config();
      TQStringList searchDirs = cfg->readListEntry("SearchDirs");
     m_dirs->clear();
     m_dirs->insertStringList(searchDirs);
@@ -37,7 +37,7 @@ scriptingGlobalConfig::scriptingGlobalConfig(scriptingPart *part, TQWidget *pare
 void scriptingGlobalConfig::accept()
 {
     // read mdirs and save to kconfig
-    KConfig *cfg = kapp->config();
+    TDEConfig *cfg = kapp->config();
     if( !m_dirs->isEnabled() )
         cfg->writeEntry("SearchDirs", TQStringList() );
     else
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index 496746b2..f12625f8 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -79,11 +79,11 @@ void scriptingPart::init()
 void scriptingPart::setupActions()
 {
     kdDebug() << "Load plugins" << endl;
-    // Read KConfig and get the list of custom directories.
+    // Read TDEConfig and get the list of custom directories.
     TQStringList searchDirs;
     searchDirs += "kate/scripts";
     
-    KConfig *cfg = kapp->config();
+    TDEConfig *cfg = kapp->config();
     searchDirs += cfg->readListEntry("SearchDirs");
     
     unplugActionList(TQString::fromLatin1( "script_actions" ));
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index 4c67b158..1cf8a398 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -385,7 +385,7 @@ void SnippetWidget::writeConfig()
     As far as some guys might have some snippets stored in the "old" way
     we need to create a "DEFAULT" group into which we can import all snippets
  */
-void SnippetWidget::initConfigOldVersion(KConfig *cfg)
+void SnippetWidget::initConfigOldVersion(TDEConfig *cfg)
 {
   SnippetGroup * group = new SnippetGroup(this, "DEFAULT", 1);
   _list.append(group);
@@ -418,7 +418,7 @@ void SnippetWidget::initConfigOldVersion(KConfig *cfg)
 void SnippetWidget::initConfig()
 {
   if (_cfg == NULL)
-    _cfg = new KConfig("kdevsnippetrc", false, false);
+    _cfg = new TDEConfig("kdevsnippetrc", false, false);
 
   _cfg->setGroup("SnippetPart");
 
diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h
index 5277e8d5..1a0ef8c1 100644
--- a/parts/snippet/snippet_widget.h
+++ b/parts/snippet/snippet_widget.h
@@ -28,7 +28,7 @@ class TQPoint;
 class SnippetDlg;
 class SnippetItem;
 class KTextEdit;
-class KConfig;
+class TDEConfig;
 
 
 /**
@@ -49,7 +49,7 @@ public:
     ~SnippetWidget();
     TQPtrList<SnippetItem> * getList() { return (&_list); }
     void writeConfig();
-    void initConfigOldVersion(KConfig *cfg);
+    void initConfigOldVersion(TDEConfig *cfg);
     SnippetConfig *  getSnippetConfig() { return (&_SnippetConfig); }
 
 
@@ -71,7 +71,7 @@ private:
 
     TQPtrList<SnippetItem> _list;
     TQMap<TQString, TQString> _mapSaved;
-    KConfig * _cfg;
+    TDEConfig * _cfg;
     SnippetConfig _SnippetConfig;
 
 public slots:
diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp
index 4bcf842d..5efd3870 100644
--- a/parts/tipofday/tipofday_part.cpp
+++ b/parts/tipofday/tipofday_part.cpp
@@ -46,7 +46,7 @@ TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringLis
 
 TQString TipOfDayPart::getFilename()
 {
-  KConfig * config = TDEApplication::kApplication()->config();
+  TDEConfig * config = TDEApplication::kApplication()->config();
   config->setGroup("Tip of day plugin");
   return config->readEntry("TipsFile", "kdevtipofday/tips");
 }
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index e7de47d9..b414fbbb 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -90,7 +90,7 @@ void ToolsPart::updateMenu()
 
   unplugActionList("tools_list");
 
-  KConfig *config = ToolsFactory::instance()->config();
+  TDEConfig *config = ToolsFactory::instance()->config();
   config->setGroup("Tools");
 
   TQStringList list = config->readListEntry("Tools");
@@ -167,7 +167,7 @@ void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName)
 
 void ToolsPart::updateToolsMenu()
 {
-    KConfig *config = ToolsFactory::instance()->config();
+    TDEConfig *config = ToolsFactory::instance()->config();
     config->setGroup("External Tools");
     TQStringList l = config->readListEntry("Tool Menu");
 
@@ -176,7 +176,7 @@ void ToolsPart::updateToolsMenu()
     TQStringList::ConstIterator it;
     for (it = l.begin(); it != l.end(); ++it) {
         TQString menutext = *it;
-        KConfig *config = ToolsFactory::instance()->config();
+        TDEConfig *config = ToolsFactory::instance()->config();
         config->setGroup("Tool Menu " + menutext);
         bool isdesktopfile = config->readBoolEntry("DesktopFile");
         KAction *action = new KAction(*it, 0,
@@ -204,7 +204,7 @@ void ToolsPart::contextMenu(TQPopupMenu *popup, const Context *context)
     m_contextFileName = fcontext->urls().first().path();
     externalToolMenuEntries.clear();
     
-    KConfig *config = ToolsFactory::instance()->config();
+    TDEConfig *config = ToolsFactory::instance()->config();
     config->setGroup("External Tools");
     TQStringList filecontextList = config->readListEntry("File Context");
 
@@ -225,7 +225,7 @@ void ToolsPart::contextMenu(TQPopupMenu *popup, const Context *context)
 void ToolsPart::toolsMenuActivated()
 {
     TQString menutext = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
-    KConfig *config = ToolsFactory::instance()->config();
+    TDEConfig *config = ToolsFactory::instance()->config();
     config->setGroup("Tool Menu " + menutext);
     TQString cmdline = config->readPathEntry("CommandLine");
     bool isdesktopfile = config->readBoolEntry("DesktopFile");
@@ -244,7 +244,7 @@ void ToolsPart::fileContextActivated(int id)
 {
     TQString menutext = externalToolMenuEntries[ id ];
 
-    KConfig *config = ToolsFactory::instance()->config();
+    TDEConfig *config = ToolsFactory::instance()->config();
     config->setGroup("File Context " + menutext);
     TQString cmdline = config->readPathEntry("CommandLine");
     bool captured = config->readBoolEntry("Captured");
@@ -259,7 +259,7 @@ void ToolsPart::dirContextActivated(int id)
 {
     TQString menutext = externalToolMenuEntries[ id ];
 
-    KConfig *config = ToolsFactory::instance()->config();
+    TDEConfig *config = ToolsFactory::instance()->config();
     config->setGroup("Dir Context " + menutext);
     TQString cmdline = config->readPathEntry("CommandLine");
     bool captured = config->readBoolEntry("Captured");
diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp
index 5a8add6e..213ff02f 100644
--- a/parts/tools/toolsconfig.cpp
+++ b/parts/tools/toolsconfig.cpp
@@ -88,7 +88,7 @@ void ToolsConfig::fill()
 {
   _entries.clear();
 
-  KConfig *config = ToolsFactory::instance()->config();
+  TDEConfig *config = ToolsFactory::instance()->config();
   config->setGroup("Tools");
 
   TQStringList list = config->readListEntry("Tools");
@@ -138,7 +138,7 @@ void ToolsConfig::toTree()
 
 void ToolsConfig::accept()
 {
-  KConfig *config = ToolsFactory::instance()->config();
+  TDEConfig *config = ToolsFactory::instance()->config();
   config->setGroup("Tools");
 
   TQStringList l;
diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp
index fefef501..ef34eb97 100644
--- a/parts/tools/toolsconfigwidget.cpp
+++ b/parts/tools/toolsconfigwidget.cpp
@@ -63,7 +63,7 @@ ToolsConfigWidget::~ToolsConfigWidget()
 
 void ToolsConfigWidget::readGroup(const TQString &group, TQDict<ToolsConfigEntry> *entryDict)
 {
-    KConfig *config = ToolsFactory::instance()->config();
+    TDEConfig *config = ToolsFactory::instance()->config();
     config->setGroup("External Tools");
     TQStringList list = config->readListEntry(group);
 
@@ -85,7 +85,7 @@ void ToolsConfigWidget::readGroup(const TQString &group, TQDict<ToolsConfigEntry
 
 void ToolsConfigWidget::storeGroup(const TQString &group, const TQDict<ToolsConfigEntry> &entryDict)
 {
-    KConfig *config = ToolsFactory::instance()->config();
+    TDEConfig *config = ToolsFactory::instance()->config();
 
     TQStringList list;
 
diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp
index 721118c3..25df2d5a 100644
--- a/parts/uimode/uichooser_widget.cpp
+++ b/parts/uimode/uichooser_widget.cpp
@@ -36,7 +36,7 @@ UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *parent, const
 
 void UIChooserWidget::load()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("UI");
 
 	int mdistyle = config->readNumEntry( "MDIStyle", 1 );
@@ -86,7 +86,7 @@ void UIChooserWidget::load()
 
 void UIChooserWidget::save()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("UI");
 
 	if ( AlwaysShowTabs->isChecked() )
diff --git a/src/core.cpp b/src/core.cpp
index 61c22403..d08a826e 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -71,7 +71,7 @@ Core::~Core()
 bool Core::queryClose()
 {
   // save the the project to open it automaticly on startup if needed
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup("General Options");
   config->writePathEntry("Last Project",ProjectManager::getInstance()->projectFile().url());
   
diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp
index ef5fede9..34860c26 100644
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@@ -41,7 +41,7 @@ EditorProxy::EditorProxy()
 {
 	m_delayedLineTimer = new TQTimer( this );
 	connect( m_delayedLineTimer,  TQT_SIGNAL( timeout() ), this, TQT_SLOT(setLineNumberDelayed()) );
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 
 	m_delayedViewCreationCompatibleUI = true;
 
@@ -125,7 +125,7 @@ void EditorProxy::installPopup( KParts::Part * part )
 
 			KAction * action = NULL;
 			//If there is a tab for this file, we don't need to plug the closing menu entries here
-			KConfig *config = TDEGlobal::config();
+			TDEConfig *config = TDEGlobal::config();
 			config->setGroup("UI");
 			bool m_tabBarShown = ! config->readNumEntry("TabWidgetVisibility", 0);
 			if (!m_tabBarShown)
diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp
index 3a6cdf2c..a034cc52 100644
--- a/src/kdevideextension.cpp
+++ b/src/kdevideextension.cpp
@@ -53,7 +53,7 @@ void KDevIDEExtension::init()
 
 void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     TQVBox *vbox = dlg->addVBoxPage(i18n("General"), i18n("General"), BarIcon("tdevelop", KIcon::SizeMedium) );
     gsw = new SettingsWidget(vbox, "general settings widget");
 
@@ -87,7 +87,7 @@ void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
 
 void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg)
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     config->setGroup("General Options");
     config->writeEntry("DesignerApp", gsw->designerButtonGroup->selectedId());
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index 7046c679..1d67217b 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -302,7 +302,7 @@ void MainWindowShare::slotSettings()
 
     ShellExtension::getInstance()->createGlobalSettingsPage(&dlg);
 
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     config->setGroup("Global Settings Dialog");
     int height = config->readNumEntry( "Height", 600 );
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 311e3631..4381ee2d 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -60,7 +60,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
     m_clearAccelAction = new KAction(i18n("Clear Accelerator"), 0,
         TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this));
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("UI");
     TQString accel = config->readEntry(TQString("button_%1").arg(text), "");
     if (!accel.isEmpty())
@@ -70,7 +70,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon,
 Button::~Button()
 {
 //     m_buttonBar->removeButton(this);
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("UI");
 
     TQRegExp r("^&([0-9])\\s.*");
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index fbe9edb1..d8abfde7 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -68,7 +68,7 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position)
             break;
     }
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("UI");
     int mode = config->readNumEntry("MDIStyle", 3);
     Ideal::ButtonMode buttonMode = Ideal::Text;
@@ -103,7 +103,7 @@ DDockWindow::~DDockWindow()
 void DDockWindow::setVisible(bool v)
 {
     //write dock width to the config file
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     TQString group = TQString("%1").arg(m_name);
     config->setGroup(group);
 
@@ -147,7 +147,7 @@ void DDockWindow::loadSettings()
 
 void DDockWindow::saveSettings()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     TQString group = TQString("%1").arg(m_name);
     int invisibleWidth = 0;
     config->setGroup(group);
@@ -199,7 +199,7 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc
     {
         //if the widget was selected last time the dock is deleted
         //we need to show it
-        KConfig *config = kapp->config();
+        TDEConfig *config = kapp->config();
         TQString group = TQString("%1").arg(m_name);
         config->setGroup(group);
         if (config->readEntry("ViewLastWidget") == title)
diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp
index 45894178..d8b79f22 100644
--- a/src/newui/dmainwindow.cpp
+++ b/src/newui/dmainwindow.cpp
@@ -42,7 +42,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name)
 
 void DMainWindow::loadSettings()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("UI");
     m_openTabAfterCurrent = config->readBoolEntry("OpenNewTabAfterCurrent", true);
     m_showIconsOnTabs = config->readBoolEntry("ShowTabIcons", false);
diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp
index c3a0c7d1..92148207 100644
--- a/src/newui/dtabwidget.cpp
+++ b/src/newui/dtabwidget.cpp
@@ -55,7 +55,7 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name)
 
 void DTabWidget::loadSettings()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("UI");
 //    m_tabBarShown = config->readBoolEntry("TabBarShown", true);
     m_tabBarShown = ! config->readNumEntry("TabWidgetVisibility", 0);
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index 05ffc087..0bd2e404 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -277,7 +277,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 	}
 
 	// Make sure the URL exists
-	if ( !url.isValid() || !KIO::NetAccess::exists(url, false, 0) )
+	if ( !url.isValid() || !TDEIO::NetAccess::exists(url, false, 0) )
 	{
 		bool done = false;
 
@@ -289,7 +289,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 				relURL.addPath( url.url() );
 
 				kdDebug() << k_funcinfo << "Looking for file in project dir: " << API::getInstance()->project()->projectDirectory() << " url " << url.url() << " transformed to " << relURL.url() << ": " << done << endl;
-				if (relURL.isValid() && KIO::NetAccess::exists(relURL, false, 0)) {
+				if (relURL.isValid() && TDEIO::NetAccess::exists(relURL, false, 0)) {
 					url = relURL;
 					done = true;
 				}
@@ -297,7 +297,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 					KURL relURL(API::getInstance()->project()->buildDirectory());
 					relURL.addPath( url.url() );
 					kdDebug() << k_funcinfo << "Looking for file in build dir: " << API::getInstance()->project()->buildDirectory() << " url " << url.url() << " transformed to " << relURL.url() << ": " << done << endl;
-					if (relURL.isValid() && KIO::NetAccess::exists(relURL, false, 0)) {
+					if (relURL.isValid() && TDEIO::NetAccess::exists(relURL, false, 0)) {
 						url = relURL;
 						done = true;
 					}
@@ -307,7 +307,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 			if (!done) {
 				url = findURLInProject(url);
 
-				if ( !url.isValid() || !KIO::NetAccess::exists(url, false, 0) )
+				if ( !url.isValid() || !TDEIO::NetAccess::exists(url, false, 0) )
 					// See if this url is relative to the current project's directory
 					url = API::getInstance()->project()->projectDirectory() + "/" + url.path();
 
@@ -316,7 +316,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 			}
 		}
 
- 		if ( !done && ( !url.isValid() || !KIO::NetAccess::exists(url, false, 0) ))
+ 		if ( !done && ( !url.isValid() || !TDEIO::NetAccess::exists(url, false, 0) ))
 		{
 			// Not found - prompt the user to find it?
 			kdDebug(9000) << "cannot find URL: " << url.url() << endl;
@@ -382,7 +382,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 		m_openNextAsText = true;
 	}
 
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("General Options");
 
 	// we don't trust KDE with designer files, let's handle it ourselves
@@ -547,7 +547,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum,
 			{
 				if ( dlg.always_open_as_text->isChecked() )
 				{
-					KConfig *config = kapp->config();
+					TDEConfig *config = kapp->config();
 					config->setGroup("General");
 					TQStringList texttypeslist = config->readListEntry( "TextTypes" );
 					texttypeslist << MimeType->name();
@@ -1282,7 +1282,7 @@ void PartController::slotOpenFile()
 	if ( DefaultEncoding.isEmpty() )
 	{
 		// have a peek at katepart's settings:
-		KConfig * config = kapp->config();
+		TDEConfig * config = kapp->config();
 		config->setGroup("Kate Document Defaults");
 		DefaultEncoding = config->readEntry("Encoding", TQString() );
 	}
@@ -1460,7 +1460,7 @@ bool PartController::isDirty( KURL const & url )
 
 bool PartController::reactToDirty( KURL const & url, unsigned char reason )
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup("Editor");
 	TQString dirtyAction = config->readEntry( "DirtyAction" );
 
diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp
index 4a75b387..e568313f 100644
--- a/src/profileengine/lib/profile.cpp
+++ b/src/profileengine/lib/profile.cpp
@@ -33,7 +33,7 @@ Profile::Profile(Profile *parent, const TQString &name)
         m_parent->addChildProfile(this);
 
     TQString profileConfig = locate("data", "tdevelop/profiles" + dirName() + "/profile.config");
-    KConfig config(profileConfig);
+    TDEConfig config(profileConfig);
 
     config.setGroup("Information");
     m_genericName = config.readEntry("GenericName");
@@ -84,7 +84,7 @@ TQString Profile::dirName() const
 void Profile::save()
 {
     TQString profileConfig = locateLocal("data", "tdevelop/profiles" + dirName() + "/profile.config");
-    KConfig config(profileConfig);
+    TDEConfig config(profileConfig);
 
     config.setGroup("Information");
     config.writeEntry("GenericName", m_genericName);
@@ -167,7 +167,7 @@ bool Profile::remove()
 {
     TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdevelop/profiles" + dirName());
     if ((dirs.count() == 1) && dirs[0].startsWith(TQDir::homeDirPath()))
-        return KIO::NetAccess::del(KURL::fromPathOrURL(dirs[0]), 0);
+        return TDEIO::NetAccess::del(KURL::fromPathOrURL(dirs[0]), 0);
     return false;
 }
 
@@ -201,5 +201,5 @@ KURL::List Profile::resources(const TQString &nameFilter)
 void Profile::addResource(const KURL &url)
 {
     TQString saveLocation = TDEGlobal::dirs()->saveLocation("data", "tdevelop/profiles"+dirName(), true);
-    KIO::NetAccess::file_copy(url, KURL::fromPathOrURL(saveLocation), -1, true);
+    TDEIO::NetAccess::file_copy(url, KURL::fromPathOrURL(saveLocation), -1, true);
 }
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index cf545ac9..bd4ee23e 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -125,7 +125,7 @@ void ProjectManager::createActions( KActionCollection* ac )
 
 void ProjectManager::slotOpenProject()
 {
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("General Options");
 	TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/");
 
@@ -153,7 +153,7 @@ void ProjectManager::slotProjectOptions()
     GeneralInfoWidget *g = new GeneralInfoWidget(*API::getInstance()->projectDom(), box, "general informations widget");
     connect (&dlg, TQT_SIGNAL(okClicked()), g, TQT_SLOT(accept()));
 
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("Project Settings Dialog");
   int height = config->readNumEntry( "Height", 600 );
   int width = config->readNumEntry( "Width", 800 );
@@ -176,7 +176,7 @@ void ProjectManager::loadSettings()
 
 void ProjectManager::saveSettings()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
 
   if (projectLoaded())
   {
@@ -189,7 +189,7 @@ void ProjectManager::saveSettings()
 
 void ProjectManager::loadDefaultProject()
 {
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   config->setGroup("General Options");
   TQString project = config->readPathEntry("Last Project");
   bool readProject = config->readBoolEntry("Read Last Project On Startup", true);
@@ -353,7 +353,7 @@ bool ProjectManager::closeProject( bool exiting )
 bool ProjectManager::loadProjectFile()
 {
   TQString path;
-  if (!KIO::NetAccess::download(m_info->m_projectURL, path, 0)) {
+  if (!TDEIO::NetAccess::download(m_info->m_projectURL, path, 0)) {
     KMessageBox::sorry(TopLevel::getInstance()->main(),
         i18n("Could not read project file: %1").arg(m_info->m_projectURL.prettyURL()));
     return false;
@@ -376,7 +376,7 @@ bool ProjectManager::loadProjectFile()
              "XML error in line %1, column %2:\n%3")
              .arg(errorLine).arg(errorCol).arg(errorMsg));
     fin.close();
-    KIO::NetAccess::removeTempFile(path);
+    TDEIO::NetAccess::removeTempFile(path);
     return false;
   }
   if (m_info->m_document.documentElement().nodeName() != "tdevelop")
@@ -384,12 +384,12 @@ bool ProjectManager::loadProjectFile()
     KMessageBox::sorry(TopLevel::getInstance()->main(),
         i18n("This is not a valid project file."));
     fin.close();
-    KIO::NetAccess::removeTempFile(path);
+    TDEIO::NetAccess::removeTempFile(path);
     return false;
   }
 
   fin.close();
-  KIO::NetAccess::removeTempFile(path);
+  TDEIO::NetAccess::removeTempFile(path);
 
   API::getInstance()->setProjectDom(&m_info->m_document);
 
@@ -419,7 +419,7 @@ bool ProjectManager::saveProjectFile()
     }
     API::getInstance()->projectDom()->save(*(fout.textStream()), 2);
     fout.close();
-    KIO::NetAccess::upload(fout.name(), m_info->m_projectURL, 0);
+    TDEIO::NetAccess::upload(fout.name(), m_info->m_projectURL, 0);
   }
 
   return true;
@@ -637,7 +637,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url )
 
 // TQString ProjectManager::profileByAttributes(const TQString &language, const TQStringList &keywords)
 // {
-//     KConfig config(locate("data", "tdevelop/profiles/projectprofiles"));
+//     TDEConfig config(locate("data", "tdevelop/profiles/projectprofiles"));
 //     config.setGroup(language);
 //
 //     TQStringList profileKeywords = TQStringList::split("/", "Empty");
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index 4e96785d..6c733c5e 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -249,7 +249,7 @@ void SimpleMainWindow::embedView( DDockWindow::Position pos, TQWidget * view, co
 
 DDockWindow::Position SimpleMainWindow::recallToolViewPosition( const TQString & name, DDockWindow::Position defaultPos )
 {
-    KConfig * config = kapp->config();
+    TDEConfig * config = kapp->config();
     config->setGroup( "DToolDockPosition" );
 
     TQString position = config->readEntry( name );
@@ -268,7 +268,7 @@ DDockWindow::Position SimpleMainWindow::recallToolViewPosition( const TQString &
 
 void SimpleMainWindow::rememberToolViewPosition( const TQString & name, DDockWindow::Position pos )
 {
-    KConfig * config = kapp->config();
+    TDEConfig * config = kapp->config();
     config->setGroup( "DToolDockPosition" );
 
     TQString position = "unknown";
@@ -353,7 +353,7 @@ void SimpleMainWindow::lowerView(TQWidget * view)
 
 void SimpleMainWindow::loadSettings()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
 
     ProjectManager::getInstance()->loadSettings();
     applyMainWindowSettings(config, "SimpleMainWindow");
@@ -363,7 +363,7 @@ void SimpleMainWindow::loadSettings()
 
 void SimpleMainWindow::saveSettings( )
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
 
     ProjectManager::getInstance()->saveSettings();
     saveMainWindowSettings(config, "SimpleMainWindow");
diff --git a/vcs/cvsservice/bufferedstringreader.h b/vcs/cvsservice/bufferedstringreader.h
index 6f34ed4c..c7548b59 100644
--- a/vcs/cvsservice/bufferedstringreader.h
+++ b/vcs/cvsservice/bufferedstringreader.h
@@ -15,7 +15,7 @@
 #include <tqstringlist.h>
 
 class CvsServicePart;
-class KConfig;
+class TDEConfig;
 class KDevProject;
 
 /* This class helps when we have to collect a string list from a text
diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp
index be20d977..07745c5c 100644
--- a/vcs/cvsservice/checkoutdialog.cpp
+++ b/vcs/cvsservice/checkoutdialog.cpp
@@ -89,7 +89,7 @@ CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService,
 	// Grab the entries from $HOME/.cvspass
 	fetchUserCvsRepositories();
 	// And suggest to use the default projects dir set in KDevelop's preferences
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
 	config->setGroup("General Options");
     TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/");
 	setWorkDir( defaultProjectsDir );
diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp
index 43add3be..723ad9d5 100644
--- a/vcs/cvsservice/cvsoptions.cpp
+++ b/vcs/cvsservice/cvsoptions.cpp
@@ -54,7 +54,7 @@ CvsOptions::CvsOptions()
 {
     kdDebug( 9006 ) << " **** CvsOptions instance CREATED!" << endl;
     // We share some configuration data with cvsservice
-    m_serviceConfig = new KConfig( "cvsservicerc" );
+    m_serviceConfig = new TDEConfig( "cvsservicerc" );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/vcs/cvsservice/cvsoptions.h b/vcs/cvsservice/cvsoptions.h
index 857b47e4..c4daf301 100644
--- a/vcs/cvsservice/cvsoptions.h
+++ b/vcs/cvsservice/cvsoptions.h
@@ -16,7 +16,7 @@
 #include <tqdom.h>
 
 class CvsServicePart;
-class KConfig;
+class TDEConfig;
 class KDevProject;
 
 /* This class represents the command line options for the used cvs commands.
@@ -92,7 +92,7 @@ private:
     unsigned int m_compressionLevel;
     unsigned int m_contextLines;
     //! So we can access cvssservice configuration (repositories first of all)
-    KConfig *m_serviceConfig;
+    TDEConfig *m_serviceConfig;
 
     static CvsOptions *m_instance;
     CvsOptions();
diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp
index 8d7e9641..d4a2dc55 100644
--- a/vcs/cvsservice/diffwidget.cpp
+++ b/vcs/cvsservice/diffwidget.cpp
@@ -41,7 +41,7 @@ TQStringList KDiffTextEdit::extPartsTranslated;
 
 KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name )
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
   config->setGroup( "Diff" );
   _highlight = config->readBoolEntry( "Highlight", true );
 
@@ -50,7 +50,7 @@ KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit(
 
 KDiffTextEdit::~KDiffTextEdit()
 {
-  KConfig* config = kapp->config();
+  TDEConfig* config = kapp->config();
 
   config->setGroup( "Diff" );
   config->writeEntry( "Highlight", _highlight );
@@ -248,7 +248,7 @@ void DiffWidget::slotAppend( const TQString& str )
 }
 
 // internally for the TextEdit only!
-void DiffWidget::slotAppend( KIO::Job*, const TQByteArray& ba )
+void DiffWidget::slotAppend( TDEIO::Job*, const TQByteArray& ba )
 {
   slotAppend( TQString( ba ) );
 }
@@ -297,13 +297,13 @@ void DiffWidget::openURL( const KURL& url )
   if ( job )
     job->kill();
 
-  KIO::TransferJob* job = KIO::get( url );
+  TDEIO::TransferJob* job = TDEIO::get( url );
   if ( !job )
     return;
 
-  connect( job, TQT_SIGNAL(data( KIO::Job *, const TQByteArray & )),
-           this, TQT_SLOT(slotAppend( KIO::Job*, const TQByteArray& )) );
-  connect( job, TQT_SIGNAL(result( KIO::Job * )),
+  connect( job, TQT_SIGNAL(data( TDEIO::Job *, const TQByteArray & )),
+           this, TQT_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) );
+  connect( job, TQT_SIGNAL(result( TDEIO::Job * )),
            this, TQT_SLOT(slotFinished()) );
 }
 
diff --git a/vcs/cvsservice/diffwidget.h b/vcs/cvsservice/diffwidget.h
index 25594f40..4bab139e 100644
--- a/vcs/cvsservice/diffwidget.h
+++ b/vcs/cvsservice/diffwidget.h
@@ -20,7 +20,7 @@
 
 class KTempFile;
 
-namespace KIO {
+namespace TDEIO {
   class Job;
 }
 
@@ -79,7 +79,7 @@ private slots:
     /** appends a piece of "diff" */
     void slotAppend( const TQString& str );
     /** overloaded for convenience */
-    void slotAppend( KIO::Job*, const TQByteArray& ba );
+    void slotAppend( TDEIO::Job*, const TQByteArray& ba );
     /** call this when the whole "diff" has been sent.
      *  Don't call slotAppend afterwards!
      */
@@ -97,7 +97,7 @@ private:
 
 private:
     KDiffTextEdit* te;
-    KIO::Job* job;
+    TDEIO::Job* job;
     KParts::ReadOnlyPart* extPart;
     KTempFile* tempFile;
 };
diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp
index 0df43f4a..94ceca77 100644
--- a/vcs/subversion/integrator/svnintegratordlg.cpp
+++ b/vcs/subversion/integrator/svnintegratordlg.cpp
@@ -36,7 +36,7 @@
 
 #include <kio/netaccess.h>
 
-using namespace KIO;
+using namespace TDEIO;
 
 SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *parent, const char *name )
         : SvnIntegratorDlgBase( parent, name )
@@ -68,7 +68,7 @@ void SvnIntegratorDlg::accept()
         TQDataStream s( parms, IO_WriteOnly );
         int cmd = 10; // MKDIR(list)
         s << cmd << list;
-        KIO::SimpleJob* job = KIO::special( protocolUrl, parms, true );
+        TDEIO::SimpleJob* job = TDEIO::special( protocolUrl, parms, true );
         if( !NetAccess::synchronousRun( job, 0 ) ){
             KMessageBox::error( this, i18n("Unable to create project directories on repository") );
             return;
@@ -79,7 +79,7 @@ void SvnIntegratorDlg::accept()
         cmd = 5; //IMPORT
         servURL.setPath( servURL.path() + "/trunk/" );
         s2 << cmd << servURL << KURL::fromPathOrURL( m_projectLocation );
-        KIO::SimpleJob* importJob = KIO::special( protocolUrl, parms2, true );
+        TDEIO::SimpleJob* importJob = TDEIO::special( protocolUrl, parms2, true );
         if( !NetAccess::synchronousRun( importJob, 0 ) ){
             KMessageBox::error( this, i18n("Unable to import into repository.") );
             return;
@@ -100,7 +100,7 @@ void SvnIntegratorDlg::accept()
     int rev = -1;
     
     s3 << cmd2 << servURL << KURL::fromPathOrURL( m_projectLocation ) << rev << TQString( "HEAD" );
-    SimpleJob *job2 = KIO::special( protocolUrl, parms3, true );
+    SimpleJob *job2 = TDEIO::special( protocolUrl, parms3, true );
     if( ! NetAccess::synchronousRun( job2, 0 ) ){
         // Checkout failed
         KMessageBox::error(this, i18n("Unable to checkout from repository.") );
diff --git a/vcs/subversion/kdevsvnd.h b/vcs/subversion/kdevsvnd.h
index 2954af6c..438520e1 100644
--- a/vcs/subversion/kdevsvnd.h
+++ b/vcs/subversion/kdevsvnd.h
@@ -40,7 +40,7 @@ public:
 	~KDevSvnd();
 
 k_dcop:
-//  void addAuthInfo(KIO::AuthInfo, long);
+//  void addAuthInfo(TDEIO::AuthInfo, long);
 	TQString commitDialog(TQString);
 	int sslServerTrustPrompt(TQString certFailMsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert );
 	TQString sslCertFile();
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index cba5aee4..4a647b34 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -51,7 +51,7 @@
 #include <kinstance.h>
 #include <kaboutdata.h>
 
-using namespace KIO;
+using namespace TDEIO;
 using namespace SvnGlobal;
 
 subversionCore::subversionCore(subversionPart *part)
@@ -125,9 +125,9 @@ void subversionCore::resolve( const KURL::List& list ) {
 		int cmd = 11;
 		bool recurse = true;
 		s << cmd << *it << recurse;
-		SimpleJob * job = KIO::special(servURL, parms, true);
+		SimpleJob * job = TDEIO::special(servURL, parms, true);
 		job->setWindow( m_part->mainWindow()->main() );
-		connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+		connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 	}
 }
 
@@ -141,9 +141,9 @@ void subversionCore::update( const KURL::List& list ) {
 	int rev = -1;
 	s << cmd << list << rev << TQString( "HEAD" );
 	
-	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-	initProcessDlg( (KIO::Job*)job, i18n("Subversion Update") , i18n("Subversion Update") );
+	SimpleJob * job = TDEIO::special(servURL, parms, false);
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+	initProcessDlg( (TDEIO::Job*)job, i18n("Subversion Update") , i18n("Subversion Update") );
 }
 
 void subversionCore::diff( const KURL::List& list, const TQString& where){
@@ -159,9 +159,9 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){
 		TQString revkind1 = where;
 		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() ) {
@@ -240,9 +240,9 @@ void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2,
 	kdDebug(9036) << "diffing async : " << pathOrUrl1 << " and " << pathOrUrl2 << endl;
 	s << cmd << pathOrUrl1 << pathOrUrl2 << rev1 << revKind1 << rev2 << revKind2 << recurse;
 	s << pegdiff;
-	KIO::SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotDiffResult( KIO::Job * ) ) );
-	initProcessDlg( (KIO::Job*)job, pathOrUrl1.prettyURL(), pathOrUrl2.prettyURL() );
+	TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, false);
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotDiffResult( TDEIO::Job * ) ) );
+	initProcessDlg( (TDEIO::Job*)job, pathOrUrl1.prettyURL(), pathOrUrl2.prettyURL() );
 }
 
 void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplocks ) {
@@ -260,12 +260,12 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock
 		kdDebug(9036) << "adding to list: " << (*it).prettyURL() << endl;
 		s << *it;
 	}
-	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+	SimpleJob * job = TDEIO::special(servURL, parms, false);
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 	if( list.count() == 1 )
-		initProcessDlg( (KIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Commit to remote repository") );
+		initProcessDlg( (TDEIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Commit to remote repository") );
 	else if( list.count() > 1 )
-		initProcessDlg( (KIO::Job*)job, i18n("From working copy") , i18n("Commit to remote repository") );
+		initProcessDlg( (TDEIO::Job*)job, i18n("From working copy") , i18n("Commit to remote repository") );
 }
 // Right now, only one item for each action.
 void subversionCore::svnLog( const KURL::List& list,
@@ -294,10 +294,10 @@ void subversionCore::svnLog( const KURL::List& list,
 		kdDebug(9036) << "svnCore: adding to list: " << (*it).prettyURL() << endl;
 		s << *it;
 	}
-	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotLogResult( KIO::Job * ) ) );
+	SimpleJob * job = TDEIO::special(servURL, parms, false);
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotLogResult( TDEIO::Job * ) ) );
 	//  progress info. LogView is allowed and meaninful only for one url in KDev3.4
-	initProcessDlg( (KIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Subversion Log View") );
+	initProcessDlg( (TDEIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Subversion Log View") );
 }
 
 void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQString revKindStart, int revend, TQString revKindEnd )
@@ -315,9 +315,9 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQStrin
 	s << cmd << url << (int)mode ;
 	s << revstart << revKindStart << revend << revKindEnd ;
 
-	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotBlameResult( KIO::Job * ) ) );
-	initProcessDlg( (KIO::Job*)job, url.prettyURL() , i18n("Subversion Blame") );
+	SimpleJob * job = TDEIO::special(servURL, parms, false);
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotBlameResult( TDEIO::Job * ) ) );
+	initProcessDlg( (TDEIO::Job*)job, url.prettyURL() , i18n("Subversion Blame") );
 }
 
 void subversionCore::add( const KURL::List& list ) {
@@ -330,9 +330,9 @@ void subversionCore::add( const KURL::List& list ) {
 	int cmd = 6;
 	s << cmd << list;
 	// add/delete/revert works on local copy. Don't need to show progress dialog
-	SimpleJob * job = KIO::special(servURL, parms, false); 
+	SimpleJob * job = TDEIO::special(servURL, parms, false); 
 	job->setWindow( m_part->mainWindow()->main() );
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
 void subversionCore::del( const KURL::List& list ) {
@@ -344,9 +344,9 @@ void subversionCore::del( const KURL::List& list ) {
 	int cmd = 7;
 	s << cmd << list;
 	// add/delete/revert works on local copy. Don't need to show progress dialog
-	SimpleJob * job = KIO::special(servURL, parms, false);
+	SimpleJob * job = TDEIO::special(servURL, parms, false);
 	job->setWindow( m_part->mainWindow()->main() );
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
 void subversionCore::revert( const KURL::List& list ) {
@@ -357,9 +357,9 @@ void subversionCore::revert( const KURL::List& list ) {
 	TQDataStream s( parms, IO_WriteOnly );
 	int cmd = 8;
 	s << cmd << list;
-	SimpleJob * job = KIO::special(servURL, parms, false);
+	SimpleJob * job = TDEIO::special(servURL, parms, false);
 	job->setWindow( m_part->mainWindow()->main() );
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
 void subversionCore::checkout() {
@@ -375,9 +375,9 @@ void subversionCore::checkout() {
 		int rev = -1;
 		s << cmd << servURL << KURL( wcPath ) << rev << TQString( "HEAD" );
 		servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
-		SimpleJob * job = KIO::special(servURL,parms, true);
+		SimpleJob * job = TDEIO::special(servURL,parms, true);
 		job->setWindow( m_part->mainWindow()->main() );
-		connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( KIO::Job * ) ) );
+		connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( TDEIO::Job * ) ) );
 	}
 }
 
@@ -392,9 +392,9 @@ void subversionCore::switchTree( const KURL &path, const KURL &repositUrl,
 	s << cmd << path << repositUrl ;
 	s << recurse << revNum << revKind;
 
-	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-	initProcessDlg( (KIO::Job*)job, repositUrl.prettyURL() , path.prettyURL() );
+	SimpleJob * job = TDEIO::special(servURL, parms, false);
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+	initProcessDlg( (TDEIO::Job*)job, repositUrl.prettyURL() , path.prettyURL() );
 }
 
 void subversionCore::switchRelocate( const KURL &path,
@@ -407,8 +407,8 @@ void subversionCore::switchRelocate( const KURL &path,
 	int cmd = 16;
 	s << cmd << path << currentUrl << newUrl << recurse;
 
-	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+	SimpleJob * job = TDEIO::special(servURL, parms, false);
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 	// this doesn't contact repository
 }
 
@@ -422,9 +422,9 @@ void subversionCore::svnCopy( const KURL &src, int srcRev, const TQString &srcRe
 	int cmd = 17;
 	s << cmd << src << srcRev << srcRevKind << dest;
 
-	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-	initProcessDlg( (KIO::Job*)job, src.prettyURL(), dest.prettyURL() );
+	SimpleJob * job = TDEIO::special(servURL, parms, false);
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+	initProcessDlg( (TDEIO::Job*)job, src.prettyURL(), dest.prettyURL() );
 }
 
 void subversionCore::merge( const KURL &src1, int rev1, TQString revKind1,
@@ -439,9 +439,9 @@ void subversionCore::merge( const KURL &src1, int rev1, TQString revKind1,
 	s << cmd << src1 << rev1 << revKind1 << src2 << rev2 << revKind2 << wc_path;
 	s << recurse << ignore_ancestry << force << dry_run;
 
-	SimpleJob * job = KIO::special(servURL, parms, false);
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-	initProcessDlg( (KIO::Job*)job, src1.prettyURL() + "\n" + src2.prettyURL() ,
+	SimpleJob * job = TDEIO::special(servURL, parms, false);
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+	initProcessDlg( (TDEIO::Job*)job, src1.prettyURL() + "\n" + src2.prettyURL() ,
 					wc_path.prettyURL() );
 }
 
@@ -452,10 +452,10 @@ bool subversionCore::clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, Sv
     TQDataStream s( parms, IO_WriteOnly );
     int cmd = 15;
     s << cmd << path_or_url << -1 << TQString("UNSPECIFIED") << -1 << TQString("UNSPECIFIED") << recurse;
-    SimpleJob *job = KIO::special( servURL, parms, false );
+    SimpleJob *job = TDEIO::special( servURL, parms, false );
 
     TQMap<TQString,TQString> ma;
-    KIO::NetAccess::synchronousRun(job, 0, 0, 0, &ma ); // synchronize
+    TDEIO::NetAccess::synchronousRun(job, 0, 0, 0, &ma ); // synchronize
 
     TQValueList<TQString> keys = ma.keys();
     TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it;
@@ -493,7 +493,7 @@ bool subversionCore::clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, Sv
     return true;;
 }
         
-void subversionCore::slotEndCheckout( KIO::Job * job ) {
+void subversionCore::slotEndCheckout( TDEIO::Job * job ) {
 	if ( job->error() ) {
 		job->showErrorDialog( m_part->mainWindow()->main() );
 		emit checkoutFinished( TQString() );
@@ -501,7 +501,7 @@ void subversionCore::slotEndCheckout( KIO::Job * job ) {
 		emit checkoutFinished(wcPath);
 }
 
-void subversionCore::slotResult( KIO::Job * job ) {
+void subversionCore::slotResult( TDEIO::Job * job ) {
     if ( job->error() ){
         job->showErrorDialog( m_part->mainWindow()->main() );
         if( job->error() == ERR_CANNOT_LAUNCH_PROCESS )
@@ -512,7 +512,7 @@ void subversionCore::slotResult( KIO::Job * job ) {
                                     ) );
         return;
     }
-    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;
@@ -529,7 +529,7 @@ void subversionCore::slotResult( KIO::Job * job ) {
 		}
 	}
 }
-void subversionCore::slotLogResult( KIO::Job * job )
+void subversionCore::slotLogResult( TDEIO::Job * job )
 {
 	if ( job->error() ){
 		job->showErrorDialog( m_part->mainWindow()->main() );
@@ -544,7 +544,7 @@ void subversionCore::slotLogResult( KIO::Job * job )
 
 	TQValueList<SvnLogHolder> holderList;
 
-	KIO::MetaData ma = job->metaData();
+	TDEIO::MetaData ma = job->metaData();
 	TQValueList<TQString> keys = ma.keys();
 	TQRegExp rx( "([0-9]*)(.*)" );
 	int curIdx, lastIdx;
@@ -589,7 +589,7 @@ void subversionCore::slotLogResult( KIO::Job * job )
 
 }
 
-void subversionCore::slotBlameResult( KIO::Job * job )
+void subversionCore::slotBlameResult( TDEIO::Job * job )
 {
     if ( job->error() ){
         job->showErrorDialog( m_part->mainWindow()->main() );
@@ -603,7 +603,7 @@ void subversionCore::slotBlameResult( KIO::Job * job )
     }
 	TQValueList<SvnBlameHolder> blameList;
 
-	KIO::MetaData ma = job->metaData();
+	TDEIO::MetaData ma = job->metaData();
 	TQValueList<TQString> keys = ma.keys();
 	TQRegExp rx( "([0-9]*)(.*)" );
 	int curIdx, lastIdx;
@@ -659,7 +659,7 @@ void subversionCore::slotBlameResult( KIO::Job * job )
     m_part->mainWindow()->raiseView(processWidget());
 }
 
-void subversionCore::slotDiffResult( KIO::Job * job )
+void subversionCore::slotDiffResult( TDEIO::Job * job )
 {
 	if ( job->error() ){
 		job->showErrorDialog( m_part->mainWindow()->main() );
@@ -671,7 +671,7 @@ void subversionCore::slotDiffResult( KIO::Job * job )
 									) );
 		return;
 	}
-	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;
@@ -716,16 +716,16 @@ void subversionCore::slotDiffResult( KIO::Job * job )
 	}
 }
 
-void subversionCore::initProcessDlg( KIO::Job *job, const TQString &src, const TQString &dest )
+void subversionCore::initProcessDlg( TDEIO::Job *job, const TQString &src, const TQString &dest )
 {
 	SvnProgressDlg *progress = new SvnProgressDlg( true );
 	progress->setSourceUrl( src );
 	progress->setDestUrl( dest );
 	progress->setJob( job );
-	connect( job, TQT_SIGNAL( totalSize(KIO::Job*, KIO::filesize_t) ),
-			 progress, TQT_SLOT( slotTotalSize (KIO::Job*, KIO::filesize_t) ) );
-	connect( job, TQT_SIGNAL( processedSize(KIO::Job*, KIO::filesize_t) ),
-			 progress, TQT_SLOT( slotProcessedSize(KIO::Job*, KIO::filesize_t) ) );
+	connect( job, TQT_SIGNAL( totalSize(TDEIO::Job*, TDEIO::filesize_t) ),
+			 progress, TQT_SLOT( slotTotalSize (TDEIO::Job*, TDEIO::filesize_t) ) );
+	connect( job, TQT_SIGNAL( processedSize(TDEIO::Job*, TDEIO::filesize_t) ),
+			 progress, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t) ) );
 }
 
 void subversionCore::createNewProject( const TQString& // dirName
diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h
index b2f6ba41..28d98d3c 100644
--- a/vcs/subversion/subversion_core.h
+++ b/vcs/subversion/subversion_core.h
@@ -78,16 +78,16 @@ public:
 	void createNewProject( const TQString& dirName, const KURL& importURL, bool init );
     KDevVCSFileInfoProvider *fileInfoProvider() const;
 	
-	void initProcessDlg( KIO::Job *job, const TQString &src, const TQString &dest );
+	void initProcessDlg( TDEIO::Job *job, const TQString &src, const TQString &dest );
 // k_dcop:
 // 	void notification( const TQString&, int,int, const TQString&, int,int ,long int, const TQString& );
 
 private slots:
-	void slotEndCheckout( KIO::Job * job );
-	void slotResult( KIO::Job * job );
-	void slotLogResult( KIO::Job * job );
-	void slotBlameResult( KIO::Job * job );
-	void slotDiffResult( KIO::Job * job );
+	void slotEndCheckout( TDEIO::Job * job );
+	void slotResult( TDEIO::Job * job );
+	void slotLogResult( TDEIO::Job * job );
+	void slotBlameResult( TDEIO::Job * job );
+	void slotDiffResult( TDEIO::Job * job );
 
 signals:
 	void checkoutFinished( TQString dir );
diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp
index be0a4411..6f960e0a 100644
--- a/vcs/subversion/subversion_fileinfo.cpp
+++ b/vcs/subversion/subversion_fileinfo.cpp
@@ -71,13 +71,13 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const TQString &dirPath ) {
 		// Of course, the user cannot get information about the out-of-dateness of his local copy.
 		s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << false/*checkRepos*/ << false /*fullRecurse*/;
 
-		KIO::SimpleJob *job2 = KIO::special(servURL, parms, false);
+		TDEIO::SimpleJob *job2 = TDEIO::special(servURL, parms, false);
 		job2->setWindow( m_part->mainWindow()->main() );
 
 
         TQMap<TQString,TQString> ma;
 
-		KIO::NetAccess::synchronousRun(job2, m_part->mainWindow()->main(), 0, 0, &ma );
+		TDEIO::NetAccess::synchronousRun(job2, m_part->mainWindow()->main(), 0, 0, &ma );
 
 		TQValueList<TQString> keys = ma.keys();
 		qHeapSort( keys );
@@ -154,18 +154,18 @@ bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerDa
 	kdDebug(9036) << "DIR : " << rPath << " " << TQFileInfo( rPath ).absFilePath() << endl;
 	s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << checkRepos << recursive;
 	KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/";
-	job = KIO::special(servURL, parms, false);
-	connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+	job = TDEIO::special(servURL, parms, false);
+	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
 	if( checkRepos )
 		m_part->svncore()->initProcessDlg( job, dirPath, i18n("Subversion File/Directory Status") );
     return true;
 }
 
-void SVNFileInfoProvider::slotResult( KIO::Job *j ) {
+void SVNFileInfoProvider::slotResult( TDEIO::Job *j ) {
 	if ( j->error() )
 		j->showErrorDialog( m_part->mainWindow()->main() );
 
-	KIO::MetaData ma = j->metaData();
+	TDEIO::MetaData ma = j->metaData();
 	TQValueList<TQString> keys = ma.keys();
 	qHeapSort( keys );
 	TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it;
@@ -329,12 +329,12 @@ const VCSFileInfoMap *SVNFileInfoProvider::statusExt( const TQString &dirPath,
 	rPath += TQDir::separator() + dirPath;
 	kdDebug(9036) << "DIR : " << rPath << " " << KURL( TQFileInfo( rPath ).absFilePath() ) << endl;
 	s << cmd << checkRepos << fullRecurse << getAll << noIgnore << -1 << "WORKING" << KURL( TQFileInfo( rPath ).absFilePath() );
-	KIO::SimpleJob *job2 = KIO::special(servURL, parms, false);
+	TDEIO::SimpleJob *job2 = TDEIO::special(servURL, parms, false);
 	job2->setWindow( m_part->mainWindow()->main() );
 
 
 	TQMap<TQString,TQString> ma;
-	KIO::NetAccess::synchronousRun(job2, m_part->mainWindow()->main(), 0, 0, &ma );
+	TDEIO::NetAccess::synchronousRun(job2, m_part->mainWindow()->main(), 0, 0, &ma );
 
 	TQValueList<TQString> keys = ma.keys();
 	qHeapSort( keys );
diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h
index 8b91b3b2..7a1c9bf7 100644
--- a/vcs/subversion/subversion_fileinfo.h
+++ b/vcs/subversion/subversion_fileinfo.h
@@ -59,7 +59,7 @@ k_dcop:
 	void slotStatus( const TQString& , int, int, int, int, long int ) ;
 
 public slots:
-	void slotResult( KIO::Job * );
+	void slotResult( TDEIO::Job * );
 
 private:
     mutable void *m_savedCallerData;
@@ -67,7 +67,7 @@ private:
 	mutable TQString m_recursivePreviousDirPath;
 	mutable VCSFileInfoMap *m_cachedDirEntries;
 	mutable VCSFileInfoMap *m_recursiveDirEntries;
-	KIO::SimpleJob *job;
+	TDEIO::SimpleJob *job;
 	subversionPart *m_part;
 };
 
diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp
index c27f845e..0f66a844 100644
--- a/vcs/subversion/subversion_widget.cpp
+++ b/vcs/subversion/subversion_widget.cpp
@@ -115,7 +115,7 @@ SvnLogViewItem ::~SvnLogViewItem ()
 ////////////////////////////////////////////////////////////////////////
 
 SvnProgressDlg::SvnProgressDlg( bool showNow )
-	: KIO::DefaultProgress( showNow )
+	: TDEIO::DefaultProgress( showNow )
 {
 	setStopOnClose( true );
 	setCaption( i18n("Subversion Job Progress") );
diff --git a/vcs/subversion/subversion_widget.h b/vcs/subversion/subversion_widget.h
index a9369a37..a74f7182 100644
--- a/vcs/subversion/subversion_widget.h
+++ b/vcs/subversion/subversion_widget.h
@@ -85,7 +85,7 @@ class SvnLogViewItem : public SvnIntSortListItem {
 
 /////////////////////////////////////////////////////////////
 /// Subversion Progress Display Widget
-class SvnProgressDlg : public KIO::DefaultProgress {
+class SvnProgressDlg : public TDEIO::DefaultProgress {
 public:
 	SvnProgressDlg( bool showNow = true );
 	~SvnProgressDlg();
diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp
index 7018456f..1680595a 100644
--- a/vcs/subversion/svn_kio.cpp
+++ b/vcs/subversion/svn_kio.cpp
@@ -56,7 +56,7 @@
 // #include "commitdlg.h"
 #include <ktextedit.h>
 
-using namespace KIO;
+using namespace TDEIO;
 using namespace SvnGlobal;
 
 typedef struct
@@ -132,14 +132,14 @@ kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString &
 		svn_error_t *err = svn_client_create_context(&ctx, pool);
                 if ( err ) {
                         kdDebug(9036) << "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(9036) << "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);
@@ -286,7 +286,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;
 	}
@@ -453,7 +453,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;
 	}
@@ -504,23 +504,23 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString&
 	kdDebug(9036) << "MTime : " << ( long )mtime << endl;
 	kdDebug(9036) << "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 );
 
@@ -567,7 +567,7 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString&
 // 	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 );
 // 		svn_pool_destroy (subpool);
 // 	}
 // 
@@ -596,7 +596,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, TQString::fromLocal8Bit(err->message) );
+		error( TDEIO::ERR_COULD_NOT_MKDIR, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
         return;
 	}
@@ -621,7 +621,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 );
 		svn_pool_destroy (subpool);
         return;
 	}
@@ -646,7 +646,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 );
 		svn_pool_destroy (subpool);
         return;
 	}
@@ -694,7 +694,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 );
 		svn_pool_destroy (subpool);
 		return;
 	}
@@ -1005,7 +1005,7 @@ void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString
 	svn_client_blame_receiver_t receiver = kio_svnProtocol::blameReceiver;
 	svn_error_t *err = svn_client_blame( path_or_url, &rev1, &rev2, receiver, (void*)this, ctx, subpool );
 	if ( err )
-		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
+		error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 	finished();
 	svn_pool_destroy (subpool);
 
@@ -1059,7 +1059,7 @@ void kio_svnProtocol::svn_log( int revstart, const TQString& revkindstart, int r
 	svn_log_message_receiver_t receiver = kio_svnProtocol::receiveLogMessage;
 	svn_error_t *err = svn_client_log2(targets, &rev1, &rev2, 0, discorverChangedPaths, strictNodeHistory, receiver, this, ctx, subpool);
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
+		error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
         return;
 	}
@@ -1183,7 +1183,7 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int
 	}
 
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
+		error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
 		return;
 	}
@@ -1233,7 +1233,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, TQString::fromLocal8Bit( err->message ) );
+		error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) );
 		svn_pool_destroy (subpool);
         return;
 	}
@@ -1255,7 +1255,7 @@ void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl,
 	svn_error_t *err = svn_client_relocate( wcPath, fromUrl, toUrl, recurse, ctx, pool );
 	
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) );
+		error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) );
 		svn_pool_destroy (subpool);
         return;
 	}
@@ -1284,7 +1284,7 @@ void kio_svnProtocol::update( const KURL::List &list, int revnumber, const TQStr
 										   true/*recurse*/, false/*ignore_external*/,
 										   ctx, subpool);
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
+		error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
 		return;
 	}
@@ -1310,7 +1310,7 @@ void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) {
 	
 	svn_error_t *err = svn_client_import2(&commit_info, path, url, nonrecursive, false, ctx, subpool);
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
+		error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
 		return;
 	}
@@ -1337,7 +1337,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 );
 		svn_pool_destroy (subpool);
         return;
 	}
@@ -1372,7 +1372,7 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc
 	if ( err ){
 		char errbuf[512];
 		svn_strerror(err->apr_err, errbuf, 512);
-		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) + "\n: " +  TQString::fromLocal8Bit(errbuf) );
+		error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) + "\n: " +  TQString::fromLocal8Bit(errbuf) );
 		svn_pool_destroy (subpool);
 		return;
 	}
@@ -1420,7 +1420,7 @@ void kio_svnProtocol::add(const KURL::List& list) {
 		if( err ) break;
 	}
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
+		error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
 		return;
 	}
@@ -1449,7 +1449,7 @@ void kio_svnProtocol::wc_delete(const KURL::List& wc) {
 	svn_error_t *err = svn_client_delete(&commit_info,targets,force,ctx,subpool);
 	
 	if ( err )
-		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
+		error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 
 	finished();
 	svn_pool_destroy (subpool);
@@ -1473,7 +1473,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, TQString::fromLocal8Bit( err->message ) );
+		error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) );
 		svn_pool_destroy (subpool);
 		return;
 	}
@@ -1506,7 +1506,7 @@ void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecur
 	svn_error_t *err = svn_client_status(&result_rev, svn_path_canonicalize( nurl.path().utf8(), subpool ), &rev, kio_svnProtocol::status, this, fullRecurse, getAll, checkRepos, noIgnore, ctx, subpool);
 
 	if ( err ){
-		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
+		error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
         return;
 	}
@@ -1531,7 +1531,7 @@ void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind,
                                         ctx, pool );
 
     if ( err ){
-        error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
+        error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) );
 		svn_pool_destroy (subpool);
         return;
     }
@@ -1577,7 +1577,7 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString &
 		apr_status_t errcode = err->apr_err;
 		char buf[512];
 		svn_strerror(errcode, buf, 512);
-		error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(buf) );
+		error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(buf) );
 		svn_pool_destroy (subpool);
 		return;
 	}
@@ -1599,7 +1599,7 @@ void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, TQString revKind1
 								const KURL &target_wc,
 								bool recurse, bool ignore_ancestry, bool force, bool dry_run )
 {
-	kdDebug(9036) << " KIO::svn_merge src1 " << src1.pathOrURL().utf8() << " src2 " << src2.pathOrURL().utf8() << " target " << target_wc.pathOrURL().utf8() << endl;
+	kdDebug(9036) << " TDEIO::svn_merge src1 " << src1.pathOrURL().utf8() << " src2 " << src2.pathOrURL().utf8() << " target " << target_wc.pathOrURL().utf8() << endl;
 	apr_pool_t *subpool = svn_pool_create( pool );
 
 	svn_opt_revision_t rev1 = createRevision( revNum1, revKind1, subpool );
@@ -1615,7 +1615,7 @@ void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, TQString revKind1
 		apr_status_t errcode = err->apr_err;
 		char buf[512];
 		svn_strerror(errcode, buf, 512);
-		error( KIO::ERR_SLAVE_DEFINED,
+		error( TDEIO::ERR_SLAVE_DEFINED,
 			   TQString::fromLocal8Bit(err->message) + "\n "+ TQString::fromLocal8Bit(buf) );
 		svn_pool_destroy (subpool);
 		return;
@@ -2127,7 +2127,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/vcs/subversion/svn_kio.h b/vcs/subversion/svn_kio.h
index 4ecfbb9d..0a6d56b2 100644
--- a/vcs/subversion/svn_kio.h
+++ b/vcs/subversion/svn_kio.h
@@ -65,7 +65,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);
@@ -128,7 +128,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
@@ -155,7 +155,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;
 		unsigned long int m_counter;
 };