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

102 files changed, 277 insertions, 277 deletions

diff --git a/blinken/src/button.cpp b/blinken/src/button.cpp
index b8eef48a..36f18511 100644
--- a/blinken/src/button.cpp
+++ b/blinken/src/button.cpp
@@ -17,7 +17,7 @@
 
 button::button(blinkenGame::color c) : m_selected(false), m_color(c)
 {
-	KConfig *kc = kapp->config();
+	TDEConfig *kc = kapp->config();
 	kc->setGroup("General");
 	TQString cs = getColorString();
 	TQString pixmap = TQString("images/%1h.png").arg(cs);
@@ -58,7 +58,7 @@ void button::setShortcut(int key)
 	m_key = key;
 	m_selected = false;
 	
-	KConfig *kc = kapp->config();
+	TDEConfig *kc = kapp->config();
 	kc->setGroup("General");
 	kc->writeEntry(getColorString(), key);
 	kc->sync();
diff --git a/blinken/src/fontchecker.cpp b/blinken/src/fontchecker.cpp
index 55e18601..f6bc9440 100644
--- a/blinken/src/fontchecker.cpp
+++ b/blinken/src/fontchecker.cpp
@@ -20,7 +20,7 @@ bool fontChecker::checkInstalled(const TQFont &font, const TQString &fontPath)
 	// Works with Steve may need some tweaking to work with other fonts
 	if (!fi.exactMatch())
 	{
-		bool success = KIO::NetAccess::copy(fontPath, "fonts:/Personal/", 0);
+		bool success = TDEIO::NetAccess::copy(fontPath, "fonts:/Personal/", 0);
 		return !success;
 	}
 	return true;
diff --git a/blinken/src/highscoredialog.cpp b/blinken/src/highscoredialog.cpp
index 46588f5f..1121eb30 100644
--- a/blinken/src/highscoredialog.cpp
+++ b/blinken/src/highscoredialog.cpp
@@ -130,7 +130,7 @@ highScoreDialog::highScoreDialog(TQWidget *parent) : KDialogBase(parent, 0, true
 	m_tw = new myTabWidget(this);
 	setMainWidget(m_tw);
 	
-	KConfig *cfg = kapp -> config();
+	TDEConfig *cfg = kapp -> config();
 	for (int i = 1; i <= 3; i++)
 	{
 		cfg -> setGroup(TQString("Level%1").arg(i));
@@ -169,7 +169,7 @@ void highScoreDialog::addScore(int level, int score, const TQString &name)
 		m_scores[level].insert(it, tqMakePair(score, name));
 		m_scores[level].remove(--m_scores[level].end());
 		
-		KConfig *cfg = kapp -> config();
+		TDEConfig *cfg = kapp -> config();
 		cfg -> setGroup(TQString("Level%1").arg(level + 1));
 		int j;
 		for (it = m_scores[level].begin(), j = 1; it != m_scores[level].end(); ++it, j++)
diff --git a/doc/kiten/index.docbook b/doc/kiten/index.docbook
index 50d48913..d92450a7 100644
--- a/doc/kiten/index.docbook
+++ b/doc/kiten/index.docbook
@@ -496,7 +496,7 @@ given for you to guess on.</para>
 <para>Jim Breen <email>jwb@csse.monash.edu.au</email> - Wrote xjdic, of which &kiten; borrows code, and the xjdic index file generator. Also is main author of edict and kanjidic, which &kiten; essentially require.</para>
 </listitem>
 <listitem>
-  <para>Paul Temple <email>paul.temple@gmx.net</email> - Port to KConfig XT and bug fixing.</para>
+  <para>Paul Temple <email>paul.temple@gmx.net</email> - Port to TDEConfig XT and bug fixing.</para>
 </listitem>
 </itemizedlist>
 
diff --git a/doc/klettres/index.docbook b/doc/klettres/index.docbook
index 86e554ad..e5fccccc 100644
--- a/doc/klettres/index.docbook
+++ b/doc/klettres/index.docbook
@@ -712,7 +712,7 @@ I am very grateful to the following people whose contribution has been greatly v
 <email>chris@os11.com</email></para></listitem>
 <listitem><para>Code for generating special characters icons: Peter Hedlund
 <email>peter@peterandlinda.com</email></para></listitem>
-<listitem><para>Port to KConfig XT, coding help: &Waldo.Bastian;
+<listitem><para>Port to TDEConfig XT, coding help: &Waldo.Bastian;
 <email>&Waldo.Bastian.mail;</email></para></listitem>
 <listitem><para>Kids and grownup SVG icons, desert theme: &Danny.Allen;
     <email>dannya40uk@yahoo.co.uk</email></para></listitem>
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index 53470b2e..d9bcdf6a 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -393,11 +393,11 @@ void Kalzium::slotSwitchtoNumeration( int index )
 
 void Kalzium::showSettingsDialog()
 {
-	if (KConfigDialog::showDialog("settings"))
+	if (TDEConfigDialog::showDialog("settings"))
 		return;
 
-	//KConfigDialog didn't find an instance of this dialog, so lets create it :
-	KConfigDialog *dialog = new KConfigDialog(this,"settings", Prefs::self());
+	//TDEConfigDialog didn't find an instance of this dialog, so lets create it :
+	TDEConfigDialog *dialog = new TDEConfigDialog(this,"settings", Prefs::self());
 	connect( dialog, TQT_SIGNAL( settingsChanged() ), this , TQT_SLOT( slotUpdateSettings() ) );
 	connect( dialog, TQT_SIGNAL( settingsChanged() ), m_somWidget, TQT_SLOT( reloadUnits() ) );
 	dialog->addPage( new setColors( 0, "colors_page"), i18n("Colors"), "colorize");
diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp
index 4e762921..87ce672c 100644
--- a/kanagram/src/kanagram.cpp
+++ b/kanagram/src/kanagram.cpp
@@ -736,10 +736,10 @@ void Kanagram::randomHintImage()
 
 void Kanagram::showSettings()
 {
-	if(KConfigDialog::showDialog("settings"))
+	if(TDEConfigDialog::showDialog("settings"))
 		return;
 
-	KConfigDialog *configDialog = new KConfigDialog( this, "settings", KanagramSettings::self() );
+	TDEConfigDialog *configDialog = new TDEConfigDialog( this, "settings", KanagramSettings::self() );
 	configDialog->addPage( new MainSettings( configDialog ), i18n( "General" ), "configure" );
 	m_vocabSettings = new VocabSettings( configDialog );
 	configDialog->addPage( m_vocabSettings, i18n("Vocabularies"), "edit" );
diff --git a/kanagram/src/kanagram.h b/kanagram/src/kanagram.h
index fcf10a26..2587e62f 100644
--- a/kanagram/src/kanagram.h
+++ b/kanagram/src/kanagram.h
@@ -49,7 +49,7 @@ namespace KDE
 using namespace std;
 
 class KHelpMenu;
-class KConfigDialog;
+class TDEConfigDialog;
 class KRandomSequence;
 class KanagramGame;
 class VocabSettings;
diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp
index 6d4eeaea..ffb95e2d 100644
--- a/kanagram/src/keduvocdocument.cpp
+++ b/kanagram/src/keduvocdocument.cpp
@@ -102,7 +102,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
   // TODO EPT  connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) );
 
   TQString tmpfile;
-  if (KIO::NetAccess::download( url, tmpfile, 0 ))
+  if (TDEIO::NetAccess::download( url, tmpfile, 0 ))
   {
     TQFile f(tmpfile);
     if (!f.open(IO_ReadOnly))
@@ -174,7 +174,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
       }
     }
     f.close();
-    KIO::NetAccess::removeTempFile( tmpfile );
+    TDEIO::NetAccess::removeTempFile( tmpfile );
   }
   return true;
 }
diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp
index eb3a83d3..0e14a207 100644
--- a/kanagram/src/mainsettings.cpp
+++ b/kanagram/src/mainsettings.cpp
@@ -37,7 +37,7 @@
 
 MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent)
 {
-	m_parent = (KConfigDialog*)parent;
+	m_parent = (TDEConfigDialog*)parent;
 
 	connect(parent, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotChangeTranslation()));
 	connect(cboxTranslation, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateParent()));
@@ -49,7 +49,7 @@ MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent)
 	cboxTranslation->insertStringList(languageNames);
 	
 	//the language code/name
-	KConfig entry(locate("locale", "all_languages"));
+	TDEConfig entry(locate("locale", "all_languages"));
 	TQString code = KanagramSettings::dataLanguage();
 	entry.setGroup(code);
 	if (code == "sr")
@@ -117,7 +117,7 @@ void MainSettings::setupTranslations()
 		return;
 
 	//the language code/name
-	KConfig entry(locate("locale", "all_languages"));
+	TDEConfig entry(locate("locale", "all_languages"));
 	const TQStringList::ConstIterator itEnd = languages.end();
 	for (TQStringList::ConstIterator it = languages.begin(); it != itEnd; ++it) {
 		entry.setGroup(*it);
@@ -135,7 +135,7 @@ void MainSettings::setupTranslations()
 
 void MainSettings::getAndInstallFont()
 {
-	bool success = KIO::NetAccess::copy("http://www.kde-edu.org/kanagram/chalk.ttf", "fonts:/Personal/", 0);
+	bool success = TDEIO::NetAccess::copy("http://www.kde-edu.org/kanagram/chalk.ttf", "fonts:/Personal/", 0);
 	if (success)
 	{
 		getFontsButton->hide();
diff --git a/kanagram/src/mainsettings.h b/kanagram/src/mainsettings.h
index d9f2015b..2ee07649 100644
--- a/kanagram/src/mainsettings.h
+++ b/kanagram/src/mainsettings.h
@@ -25,7 +25,7 @@
 
 #include "mainsettingswidget.h"
 
-class KConfigDialog;
+class TDEConfigDialog;
 
 class MainSettings : public MainSettingsWidget
 {
@@ -46,7 +46,7 @@ Q_OBJECT
 		TQMap<TQString, TQString> m_languageCodeMap;
 		void setupTranslations();
 		
-		KConfigDialog *m_parent;
+		TDEConfigDialog *m_parent;
 };
 
 #endif
diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp
index f04fc17a..f167ebcf 100644
--- a/kbruch/src/mainqtwidget.cpp
+++ b/kbruch/src/mainqtwidget.cpp
@@ -416,11 +416,11 @@ void MainQtWidget::OperationBoxSlot()
 void MainQtWidget::slotPrefs()
 {
 	// do not show dialog twice
-	if (KConfigDialog::showDialog("settings"))
+	if (TDEConfigDialog::showDialog("settings"))
 		return;
 
-	//KConfigDialog didn't find an instance of this dialog, so lets create it : 
-	KConfigDialog* configDialog = new KConfigDialog( this, "settings", SettingsClass::self() );
+	//TDEConfigDialog didn't find an instance of this dialog, so lets create it : 
+	TDEConfigDialog* configDialog = new TDEConfigDialog( this, "settings", SettingsClass::self() );
 
 	
 	TaskViewerOptionsBase * taskViewerOptions = new TaskViewerOptionsBase(0, "TaskViewerOptionsBase");
diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp
index 63a96d27..b6afc115 100644
--- a/keduca/keduca/keduca.cpp
+++ b/keduca/keduca/keduca.cpp
@@ -97,7 +97,7 @@ bool Keduca::queryClose()
 
 void Keduca::configRead()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "keduca" );
 	applyMainWindowSettings( config, "keduca" );
 	_recentFiles->loadEntries(config);
@@ -105,7 +105,7 @@ void Keduca::configRead()
 
 void Keduca::configWrite()
 {
-	KConfig *config = TDEGlobal::config();
+	TDEConfig *config = TDEGlobal::config();
 	
 	config->setGroup( "keduca" );
 	saveMainWindowSettings( config, "keduca" );
diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp
index 1d3631cc..aa61d65c 100644
--- a/keduca/keduca/keduca_part.cpp
+++ b/keduca/keduca/keduca_part.cpp
@@ -76,10 +76,10 @@ void KEducaPart::setupActions()
 
 void KEducaPart::slotConfigure()
 {
-	if ( KConfigDialog::showDialog( "KEducaSettings" ) )
+	if ( TDEConfigDialog::showDialog( "KEducaSettings" ) )
 		return;
 		
-	KConfigDialog *dialog = new KConfigDialog( widget(), "KEducaSettings", Settings::self() );
+	TDEConfigDialog *dialog = new TDEConfigDialog( widget(), "KEducaSettings", Settings::self() );
 	ConfigDialogBase *confDlg = new ConfigDialogBase( 0, "ConfigDialogBase" );
 	dialog->addPage( confDlg, i18n("General"), "keduca" );
 	
diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp
index 3bddf2e7..b2c28e34 100644
--- a/keduca/keduca/keducaprefs.cpp
+++ b/keduca/keduca/keducaprefs.cpp
@@ -82,7 +82,7 @@ void KEducaPrefs::setPageGeneral()
 /** Read settings */
 void KEducaPrefs::configRead()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Options");
     TQSize defaultSize(500,400);
     resize( config->readSizeEntry("Geometry", &defaultSize ) );
@@ -94,7 +94,7 @@ void KEducaPrefs::configRead()
 /** Write settings */
 void KEducaPrefs::configWrite()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("Options");
     config->writeEntry("Geometry", size() );
     config->writeEntry("ResultFinish", _resultAfterFinish->isChecked() );
diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp
index 9a6813d5..69020fe1 100644
--- a/keduca/keduca/keducaview.cpp
+++ b/keduca/keduca/keducaview.cpp
@@ -176,7 +176,7 @@ void KEducaView::slotButtonSave()
             newURL.setPath( newURL.path() + extension );
         }
 
-        if ( KIO::NetAccess::exists( newURL, false, this ) ) { // this file exists => ask for confirmation
+        if ( TDEIO::NetAccess::exists( newURL, false, this ) ) { // this file exists => ask for confirmation
             bOk = KMessageBox::warningContinueCancel( this,
                                               i18n("A document with this name already exists.\n"\
                                                    "Do you want to overwrite it?"),
diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp
index 0e539d56..913f9ff7 100644
--- a/keduca/keducabuilder/kcontroladdedit.cpp
+++ b/keduca/keducabuilder/kcontroladdedit.cpp
@@ -225,7 +225,7 @@ void KControlAddEdit::addQuestion()
 /** Read config settings */
 void KControlAddEdit::configRead()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("AddModify Window");
     TQSize defaultSize(500,400);
     resize( config->readSizeEntry("Geometry", &defaultSize ) );
@@ -234,7 +234,7 @@ void KControlAddEdit::configRead()
 /** Write config settings */
 void KControlAddEdit::configWrite()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("AddModify Window");
     config->writeEntry("Geometry", size() );
     config->sync();
diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp
index bcd1eaa0..ee9b6e35 100644
--- a/keduca/keducabuilder/kcontrolheader.cpp
+++ b/keduca/keducabuilder/kcontrolheader.cpp
@@ -226,7 +226,7 @@ void KControlHeader::insertHeader()
     TQStringList tmpResult = _defaultCategories.grep( _headerCategory->currentText() );
     if( tmpResult.count() == 0 )
     {
-        KConfig *appconfig = TDEGlobal::config();
+        TDEConfig *appconfig = TDEGlobal::config();
         _defaultCategories.append( _headerCategory->currentText() );
         appconfig->setGroup("General");
         appconfig->writeEntry( "Categories", _defaultCategories);
@@ -306,8 +306,8 @@ void KControlHeader::slotOk()
 /** Read settings */
 void KControlHeader::configRead()
 {
-    KConfig *config = new KConfig("emaildefaults");
-    KConfig *appconfig = TDEGlobal::config();
+    TDEConfig *config = new TDEConfig("emaildefaults");
+    TDEConfig *appconfig = TDEGlobal::config();
 
     config->setGroup("UserInfo");
 
@@ -369,7 +369,7 @@ void KControlHeader::configRead()
 /** Write settings */
 void KControlHeader::configWrite()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     config->setGroup("kcontrolheader");
     config->writeEntry("Geometry", size() );
     config->sync();
diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp
index 485a09cc..560677ae 100644
--- a/keduca/keducabuilder/keducabuilder.cpp
+++ b/keduca/keducabuilder/keducabuilder.cpp
@@ -257,7 +257,7 @@ void KEducaBuilder::slotPreview( TQListBoxItem *item )
 /** Read config data */
 void KEducaBuilder::configRead()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 
     config->setGroup( "keducacontrol" );
     applyMainWindowSettings( config, "keducacontrol" );
@@ -268,7 +268,7 @@ void KEducaBuilder::configRead()
 /** Write settings */
 void KEducaBuilder::configWrite()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 
     config->setGroup( "keducacontrol" );
     saveMainWindowSettings( config, "keducacontrol" );
@@ -445,7 +445,7 @@ bool KEducaBuilder::fileSaveAs()
             newURL.setPath( newURL.path() + extension );
         }
 
-        if ( KIO::NetAccess::exists( newURL, false, this ) ) { // this file exists => ask for confirmation
+        if ( TDEIO::NetAccess::exists( newURL, false, this ) ) { // this file exists => ask for confirmation
             bOk = KMessageBox::warningContinueCancel( this,
                                               i18n("A document with this name already exists.\n"\
                                                    "Do you want to overwrite it?"),
diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp
index 7878e6c3..6ff7038b 100644
--- a/keduca/keducabuilder/keducaeditorstartdialog.cpp
+++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp
@@ -53,7 +53,7 @@ void KEducaEditorStartDialog::buildRecentFilesList()
     TQString     key;
     TQString     value;
     TQString     oldGroup;
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 
     oldGroup = config->group();
 
diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp
index ad72b7e3..24d66339 100644
--- a/keduca/libkeduca/fileread.cpp
+++ b/keduca/libkeduca/fileread.cpp
@@ -43,7 +43,7 @@ FileRead::~FileRead()
 bool FileRead::openFile(const KURL &url) {
     TQString tmpFile;
     bool returnval=false;
-    if( KIO::NetAccess::download( url, tmpFile, 0 ) )
+    if( TDEIO::NetAccess::download( url, tmpFile, 0 ) )
     {
         returnval=loadFile( tmpFile );
         if (returnval) {
@@ -51,7 +51,7 @@ bool FileRead::openFile(const KURL &url) {
             kdDebug()<<"... load successful: "<<_currentURL.url()<<endl;
         }
 
-        KIO::NetAccess::removeTempFile( tmpFile );
+        TDEIO::NetAccess::removeTempFile( tmpFile );
     }else
         kdDebug()<<"FileRead::openFile(): download NOT successful: "<<url.url()<<endl;
 
@@ -584,11 +584,11 @@ TQPixmap FileRead::getPicturePixmap()
   KURL picture ( getPicture() );
   TQPixmap pict;
     
-  if( KIO::NetAccess::download( picture, _tmpfileImage, 0 ) )
+  if( TDEIO::NetAccess::download( picture, _tmpfileImage, 0 ) )
   {
     kdDebug()<<"... load successful: "<< _tmpfileImage <<endl;
     pict = TQPixmap( _tmpfileImage );
-    KIO::NetAccess::removeTempFile( _tmpfileImage );
+    TDEIO::NetAccess::removeTempFile( _tmpfileImage );
   }
   else
   {
@@ -669,8 +669,8 @@ bool FileRead::saveFile( const KURL &url, bool copyimages, bool saveCompressed )
         // otherwise, we already had a temp file
         if( saveFile(_tmpfile->name(), copyimages, saveCompressed) ) {
             // upload the file
-             KIO::Job * job = KIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ );
-             connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) );
+             TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ );
+             connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) );
             return true;
         }
     }
@@ -804,9 +804,9 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom
     if( copyimages == true && copyJOB.count() > 0 )
     {
         KURL::List	KurlLIST( copyJOB );
-        KIO::CopyJob *copyjob;
+        TDEIO::CopyJob *copyjob;
 
-        copyjob = KIO::copy( KurlLIST, KURL( _currentURL.directory(false,true) ), true);
+        copyjob = TDEIO::copy( KurlLIST, KURL( _currentURL.directory(false,true) ), true);
     }
     _changed=false;
     return true;
@@ -846,8 +846,8 @@ bool FileRead::saveResults( const KURL &url, const TQString &results )
         // otherwise, we already had a temp file
         if( saveResults(_tmpfile->name(), results) ) {
             // upload the file
-             KIO::Job * job = KIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ );
-             connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) );
+             TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ );
+             connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) );
             return true;
         }
     }
@@ -934,7 +934,7 @@ bool FileRead::isResult()
   return _listResults.count() > 0 ? true : false; 
 }
 
-void FileRead::slotUploadFinished( KIO::Job * job )
+void FileRead::slotUploadFinished( TDEIO::Job * job )
 {
   if (job->error()) {
     emit canceled( job->errorString() );
diff --git a/keduca/libkeduca/fileread.h b/keduca/libkeduca/fileread.h
index dd4caa08..3199f0ad 100644
--- a/keduca/libkeduca/fileread.h
+++ b/keduca/libkeduca/fileread.h
@@ -232,7 +232,7 @@ protected:
     bool saveResults( const TQString &filename, const TQString &results );
 
 protected slots:
-    void slotUploadFinished( KIO::Job * job );
+    void slotUploadFinished( TDEIO::Job * job );
 
 signals:
 /* Stolen from kparts */
diff --git a/keduca/libkeduca/kgallerydialog.cpp b/keduca/libkeduca/kgallerydialog.cpp
index 10c6ce43..f7e11da3 100644
--- a/keduca/libkeduca/kgallerydialog.cpp
+++ b/keduca/libkeduca/kgallerydialog.cpp
@@ -44,7 +44,7 @@ KGalleryDialog::~KGalleryDialog()
 bool KGalleryDialog::openFile(const KURL &url) {
     TQString tmpFile;
     bool returnval=false;
-    if( KIO::NetAccess::download( url, tmpFile, this ) )
+    if( TDEIO::NetAccess::download( url, tmpFile, this ) )
     {
         returnval=loadFile( tmpFile );
         if (returnval) {
@@ -52,7 +52,7 @@ bool KGalleryDialog::openFile(const KURL &url) {
             kdDebug()<<"... load successful: "<<_currentURL.url()<<endl;
         }
 
-        KIO::NetAccess::removeTempFile( tmpFile );
+        TDEIO::NetAccess::removeTempFile( tmpFile );
     }else
         kdDebug()<<"FileRead::openFile(): download NOT successful: "<<url.url()<<endl;
 
@@ -104,7 +104,7 @@ bool KGalleryDialog::loadFile( const TQString &filename )
 /** Read servers */
 void KGalleryDialog::configRead()
 {
-    KConfig *appconfig = TDEGlobal::config();
+    TDEConfig *appconfig = TDEGlobal::config();
     TQStringList servers;
     TQStringList ipservers;
     TQStringList::Iterator it_ipservers;
@@ -140,7 +140,7 @@ void KGalleryDialog::configWrite()
 {
     TQStringList servers;
     TQStringList ipservers;
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
 
     config->setGroup( "kgallerydialog" );
     config->writeEntry("Splitter_size", _split->sizes() );
diff --git a/keduca/libkeduca/kgallerydialog.h b/keduca/libkeduca/kgallerydialog.h
index cce2acaf..227acd3f 100644
--- a/keduca/libkeduca/kgallerydialog.h
+++ b/keduca/libkeduca/kgallerydialog.h
@@ -31,7 +31,7 @@
 // forward declarations
 class KTempFile;
 
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 class KGalleryDialog : public KGalleryDialogBase  {
    Q_OBJECT
diff --git a/khangman/khangman/fontchecker.cpp b/khangman/khangman/fontchecker.cpp
index 55e18601..f6bc9440 100644
--- a/khangman/khangman/fontchecker.cpp
+++ b/khangman/khangman/fontchecker.cpp
@@ -20,7 +20,7 @@ bool fontChecker::checkInstalled(const TQFont &font, const TQString &fontPath)
 	// Works with Steve may need some tweaking to work with other fonts
 	if (!fi.exactMatch())
 	{
-		bool success = KIO::NetAccess::copy(fontPath, "fonts:/Personal/", 0);
+		bool success = TDEIO::NetAccess::copy(fontPath, "fonts:/Personal/", 0);
 		return !success;
 	}
 	return true;
diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp
index 7113f879..c57565b9 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -223,7 +223,7 @@ void KHangMan::setLanguages()
     temp_languages.clear();
 
     // Write the present languages in config so they cannot be downloaded.
-    KConfig *config=kapp->config();
+    TDEConfig *config=kapp->config();
     config->setGroup("KNewStuffStatus");
     for (uint i=0;  i<m_languages.count(); i++) {
         TQString tmp = m_languages[i];
@@ -234,7 +234,7 @@ void KHangMan::setLanguages()
     // We look in $TDEDIR/share/locale/all_languages from
     // tdelibs/tdecore/all_languages to find the name of the country
     // corresponding to the code and the language the user set.
-    KConfig entry(locate("locale", "all_languages"));
+    TDEConfig entry(locate("locale", "all_languages"));
     const TQStringList::ConstIterator itEnd = m_languages.end();
     for (TQStringList::Iterator it = m_languages.begin(); 
 	 it != m_languages.end(); ++it) {
@@ -358,14 +358,14 @@ void KHangMan::loadLevels()
 
 void KHangMan::optionsPreferences()
 {
-    if ( KConfigDialog::showDialog( "settings" ) )  {
+    if ( TDEConfigDialog::showDialog( "settings" ) )  {
 	mAdvanced->kcfg_Hint->setEnabled(m_view->hintExists());
         mAdvanced->kcfg_AccentedLetters->setEnabled(m_view->accentedLetters());
         return;
     }
 
-    //KConfigDialog didn't find an instance of this dialog, so lets create it :
-    KConfigDialog* dialog = new KConfigDialog( this, "settings",  Prefs::self() );
+    //TDEConfigDialog didn't find an instance of this dialog, so lets create it :
+    TDEConfigDialog* dialog = new TDEConfigDialog( this, "settings",  Prefs::self() );
     // Add the Normal Settings page
     normal *mNormal =  new normal( 0, "Normal Settings" );
     dialog->addPage(mNormal, i18n("General"), "colorize");
diff --git a/khangman/khangman/khangman.kcfg b/khangman/khangman/khangman.kcfg
index 40fa12cb..ff16a334 100644
--- a/khangman/khangman/khangman.kcfg
+++ b/khangman/khangman/khangman.kcfg
@@ -20,7 +20,7 @@
         <entry name="SelectedLanguage" type="String">
             <label>The language selected by the user</label>
             <code>
-                KConfigBase *globalConf = TDEGlobal::config();
+                TDEConfigBase *globalConf = TDEGlobal::config();
                 globalConf->setGroup("Locale");
                 QString userLanguage = globalConf->readEntry("Language", "en");
                 if (userLanguage.isEmpty())
diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp
index 82beb27e..13cbd8b7 100644
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@@ -46,7 +46,7 @@ Kig::Kig()
   : KParts::MainWindow( 0L, "Kig" ), m_part( 0 )
 {
   // setting the configation file
-  config = new KConfig( "kigrc" );
+  config = new TDEConfig( "kigrc" );
   // set the shell's ui resource file
   setXMLFile("kigui.rc");
   // then, setup our actions
@@ -131,7 +131,7 @@ void Kig::setupActions()
   KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" );
 }
 
-void Kig::saveProperties(KConfig* config)
+void Kig::saveProperties(TDEConfig* config)
 {
   // the 'config' object points to the session managed
   // config file.  anything you write here will be available
@@ -139,7 +139,7 @@ void Kig::saveProperties(KConfig* config)
   config->writePathEntry("fileName", m_part->url().path());
 }
 
-void Kig::readProperties(KConfig* config)
+void Kig::readProperties(TDEConfig* config)
 {
   // the 'config' object points to the session managed
   // config file.  this function is automatically called whenever
diff --git a/kig/kig/kig.h b/kig/kig/kig.h
index a042a2ba..ee65962c 100644
--- a/kig/kig/kig.h
+++ b/kig/kig/kig.h
@@ -103,14 +103,14 @@ class Kig : public KParts::MainWindow
    * 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();
@@ -141,7 +141,7 @@ class Kig : public KParts::MainWindow
 //#endif
   KRecentFilesAction *m_recentFilesAction;
 
-  KConfig* config;
+  TDEConfig* config;
 
   static bool kimageioRegistered;
 };
diff --git a/kiten/asyndeta.cpp b/kiten/asyndeta.cpp
index 46bcb9fa..5c24bc23 100644
--- a/kiten/asyndeta.cpp
+++ b/kiten/asyndeta.cpp
@@ -60,7 +60,7 @@ Dict::Index *Asyndeta::retrieveIndex()
 void Asyndeta::readKitenConfiguration()
 {
 	KStandardDirs *dirs = TDEGlobal::dirs();
-	KConfig config(dirs->findResource("config", "kitenrc"));
+	TDEConfig config(dirs->findResource("config", "kitenrc"));
 
 	TQString globaledict = dirs->findResource("data", "kiten/edict");
 	TQString globalkanjidic = dirs->findResource("data", "kiten/kanjidic");
diff --git a/kiten/asyndeta.h b/kiten/asyndeta.h
index aa02cff1..d4946e17 100644
--- a/kiten/asyndeta.h
+++ b/kiten/asyndeta.h
@@ -21,7 +21,7 @@
 #ifndef ASYNDETA_H
 #define ASYNDETA_H
 
-class KConfig;
+class TDEConfig;
 
 namespace Dict
 {
diff --git a/kiten/configdictionaries.cpp b/kiten/configdictionaries.cpp
index cb81b13f..4b9e2203 100644
--- a/kiten/configdictionaries.cpp
+++ b/kiten/configdictionaries.cpp
@@ -94,7 +94,7 @@ void ConfigDictionaries::readDictionaryList(const TQString& group)
 	{
 		TQString name = group + "_" + *it;
 		if (!config->findItem(name))
-			config->addItem(new KConfigSkeleton::ItemString(group, *it, *new TQString()), name);
+			config->addItem(new TDEConfigSkeleton::ItemString(group, *it, *new TQString()), name);
 	}
 	config->readConfig();
 	list->clear();
@@ -117,10 +117,10 @@ void ConfigDictionaries::writeDictionaryList(const TQString& group)
 	{
 		names.append(it.current()->text(0));
 		TQString name = group + "_" + it.current()->text(0);
-		KConfigSkeletonItem* item = config->findItem(name);
+		TDEConfigSkeletonItem* item = config->findItem(name);
 		if (!item)
 		{
-			item = new KConfigSkeleton::ItemString(group, it.current()->text(0), *new TQString());
+			item = new TDEConfigSkeleton::ItemString(group, it.current()->text(0), *new TQString());
 			config->addItem(item, name);
 		}
 		item->setProperty(it.current()->text(1));
diff --git a/kiten/configdictionaries.h b/kiten/configdictionaries.h
index d6171edd..22933ed3 100644
--- a/kiten/configdictionaries.h
+++ b/kiten/configdictionaries.h
@@ -32,13 +32,13 @@ public:
 	ConfigDictionaries(TQWidget *parent = 0, const char* name = 0, WFlags f = 0);
 	void readDictionaries();
         
-	// KConfig stuff
+	// TDEConfig stuff
 	void updateWidgets();
 	void updateWidgetsDefault();
 	void updateSettings();
 	bool hasChanged();
 	bool isDefault();
-	// KConfig stuff
+	// TDEConfig stuff
 
 signals:
 	void widgetChanged();
diff --git a/kiten/kloader.cpp b/kiten/kloader.cpp
index 6ae2da6c..a0fa1d60 100644
--- a/kiten/kloader.cpp
+++ b/kiten/kloader.cpp
@@ -85,7 +85,7 @@ bool KLoader::open(void)
 	}
 	else
 	{
-		if(!KIO::NetAccess::download(d->url, d->tempFile))
+		if(!TDEIO::NetAccess::download(d->url, d->tempFile))
 		{
 			d->error = i18n("Could not read from %1.").arg(d->url.prettyURL());
 			return false;
@@ -110,7 +110,7 @@ void KLoader::close(void)
 	d->file = 0;
 
 	if(!d->isLocal)
-		KIO::NetAccess::removeTempFile(d->tempFile);
+		TDEIO::NetAccess::removeTempFile(d->tempFile);
 }
 
 TQString KLoader::error(void)
diff --git a/kiten/kloader.h b/kiten/kloader.h
index 816d29c3..f6f61506 100644
--- a/kiten/kloader.h
+++ b/kiten/kloader.h
@@ -35,7 +35,7 @@ class KLoader
 public:
 	/**
 	 * The constructor takes the url and decides the best way to save,
-	 * which will mean using something like KIO::NetAccess or TQFile.
+	 * which will mean using something like TDEIO::NetAccess or TQFile.
 	 */
 	KLoader(const KURL &_target);
 
diff --git a/kiten/ksaver.cpp b/kiten/ksaver.cpp
index 8e36f6d1..5a92e2b0 100644
--- a/kiten/ksaver.cpp
+++ b/kiten/ksaver.cpp
@@ -118,7 +118,7 @@ bool KSaver::close(void)
 
 		d->tempFile->close();
 
-		bool retval = KIO::NetAccess::upload(d->tempFile->name(), d->url, 0);
+		bool retval = TDEIO::NetAccess::upload(d->tempFile->name(), d->url, 0);
 
 		delete d->tempFile;
 		d->tempFile = 0;
diff --git a/kiten/ksaver.h b/kiten/ksaver.h
index 8c73f7c1..b7a05d89 100644
--- a/kiten/ksaver.h
+++ b/kiten/ksaver.h
@@ -35,7 +35,7 @@ class KSaver
 public:
 	/**
 	 * The constructor takes the url and decides the best way to save,
-	 * which will mean using something like KIO::NetAccess or TQFile.
+	 * which will mean using something like TDEIO::NetAccess or TQFile.
 	 */
 	KSaver(const KURL &_target);
 
diff --git a/kiten/learn.cpp b/kiten/learn.cpp
index cc65cd35..b834e643 100644
--- a/kiten/learn.cpp
+++ b/kiten/learn.cpp
@@ -461,7 +461,7 @@ void Learn::write(const KURL &url)
 
 void Learn::saveScores()
 {
-	KConfig &config = *Config::self()->config();
+	TDEConfig &config = *Config::self()->config();
 	config.setGroup("Learn Scores");
 	for (TQListViewItemIterator it(List); it.current(); ++it)
 		config.writeEntry(it.current()->text(0), it.current()->text(4).toInt());
@@ -493,7 +493,7 @@ void Learn::add(Dict::Entry toAdd, bool noEmit)
 
 	statusBar()->message(i18n("%1 added to your list").arg(kanji));
 
-	KConfig &config = *Config::self()->config();
+	TDEConfig &config = *Config::self()->config();
 	int score = 0;
 	config.setGroup("Learn Scores");
 	score = config.readNumEntry(kanji, score);
@@ -633,7 +633,7 @@ void Learn::answerClicked(int i)
 		return;
 		
 	int newscore = 0;
-//	KConfig &config = *Config::self()->config();
+//	TDEConfig &config = *Config::self()->config();
 //	config.setGroup("Learn");
 	bool donew = false;
 
diff --git a/kiten/main.cpp b/kiten/main.cpp
index c4bd017b..e391ec50 100644
--- a/kiten/main.cpp
+++ b/kiten/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 	aboutData.addCredit("Jim Breen", I18N_NOOP("Wrote xjdic, of which Kiten borrows code, and the xjdic index file generator.\nAlso is main author of edict and kanjidic, which Kiten essentially require."), "jwb@csse.monash.edu.au");
 	aboutData.addAuthor("Neil Stevens", I18N_NOOP("Code simplification, UI suggestions."), "neil@qualityassistant.com");
 	aboutData.addCredit("David Vignoni", I18N_NOOP("svg icon"), "david80v@tin.it");
-	aboutData.addCredit("Paul Temple", I18N_NOOP("Porting to KConfig XT, bug fixing"), "paul.temple@gmx.net");
+	aboutData.addCredit("Paul Temple", I18N_NOOP("Porting to TDEConfig XT, bug fixing"), "paul.temple@gmx.net");
 	TDECmdLineArgs::init(argc, argv, &aboutData);
 	TDECmdLineArgs::addCmdLineOptions(options); // Add our own options.
 
diff --git a/kiten/optiondialog.cpp b/kiten/optiondialog.cpp
index 35c48b6e..823b99a7 100644
--- a/kiten/optiondialog.cpp
+++ b/kiten/optiondialog.cpp
@@ -40,7 +40,7 @@
 #include "configlearn.h"
 #include "configsearching.h"
 
-ConfigureDialog::ConfigureDialog(TQWidget *parent, const char *name) : KConfigDialog(parent, name, Config::self())
+ConfigureDialog::ConfigureDialog(TQWidget *parent, const char *name) : TDEConfigDialog(parent, name, Config::self())
 {
 	configDic = new ConfigDictionaries(0, "dictionaries_page");
 	connect(configDic, TQT_SIGNAL(widgetChanged()), this, TQT_SLOT(updateButtons()));
@@ -71,7 +71,7 @@ void ConfigureDialog::updateWidgets()
 {
 	bool changed = hasChanged();
 	configDic->updateSettings();
-	if (changed) KConfigDialog::settingsChangedSlot();
+	if (changed) TDEConfigDialog::settingsChangedSlot();
 }
 
 //////////////////////////////////////////////////////////////////////
diff --git a/kiten/optiondialog.h b/kiten/optiondialog.h
index 8169a853..7dc1574b 100644
--- a/kiten/optiondialog.h
+++ b/kiten/optiondialog.h
@@ -38,7 +38,7 @@ class DictList;
 #include "kitenconfig.h"
 #include "configdictionaries.h"
 
-class ConfigureDialog : public KConfigDialog
+class ConfigureDialog : public TDEConfigDialog
 {
 	Q_OBJECT
   
diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp
index 2a8bf4be..b60c3949 100644
--- a/klatin/klatin/klatin.cpp
+++ b/klatin/klatin/klatin.cpp
@@ -156,10 +156,10 @@ void KLatin::loadRevision()
 
 void KLatin::loadSettings()
 {
-	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());
 	
 	vocabPage = new VocabPage(0); 
 	vocabPage->kcfg_DefaultFile->setMode(KFile::File | KFile::LocalOnly);
diff --git a/klatin/klatin/klatin.h b/klatin/klatin/klatin.h
index 38c6569f..fc1c736b 100644
--- a/klatin/klatin/klatin.h
+++ b/klatin/klatin/klatin.h
@@ -61,7 +61,7 @@ public slots:
 	void resetGUI();
 	
 private slots:
-	/// Slot for when settings are changed in the KConfig XT dialog
+	/// Slot for when settings are changed in the TDEConfig XT dialog
 	void settingsChanged();
 	
 	void slotWriteMsg(const TQString&);
diff --git a/klatin/klatin/klatin.kcfg b/klatin/klatin/klatin.kcfg
index 53ca9a55..38431aa5 100644
--- a/klatin/klatin/klatin.kcfg
+++ b/klatin/klatin/klatin.kcfg
@@ -8,7 +8,7 @@
 			<entry name="UserLanguage" type="String">
 				<label>The language selected by the user</label>
 					<code>
-						KConfigBase *globalConf = TDEGlobal::config();
+						TDEConfigBase *globalConf = TDEGlobal::config();
 						globalConf->setGroup("Locale");
 						TQString m_language = globalConf->readEntry("Language", "en");
 						//keep only the first 2 characters
diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp
index 5ff27ef7..1d577b57 100644
--- a/klatin/klatin/klatinvocab.cpp
+++ b/klatin/klatin/klatinvocab.cpp
@@ -87,7 +87,7 @@ void KLatinVocab::parseVocab(TQString customFile)
 	// Check whether file exists or not
 	// If not then regenerate working default
 	if (TQFile::exists(fileName) == FALSE) {
-		KConfigBase *globalConf = TDEGlobal::config();
+		TDEConfigBase *globalConf = TDEGlobal::config();
 		globalConf->setGroup("Locale");
 		
 		TQString language = globalConf->readEntry("Language", "en");
diff --git a/klettres/AUTHORS b/klettres/AUTHORS
index 25f799a8..55626169 100644
--- a/klettres/AUTHORS
+++ b/klettres/AUTHORS
@@ -35,4 +35,4 @@ Peter Hedlund
 Code for generating special characters icons
 
 Waldo Bastian
-Port to KConfig XT, coding help
+Port to TDEConfig XT, coding help
diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp
index a4836f58..97a8bf0e 100644
--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@@ -121,7 +121,7 @@ void KLettres::findLanguages()
 //TODO TEST in FRENCH
     m_languages.sort();
     //write the present languages in config so they cannot be downloaded
-    KConfig *config=kapp->config();
+    TDEConfig *config=kapp->config();
     config->setGroup("KNewStuffStatus");
     for (uint i=0;  i<m_languages.count(); i++)
     {
@@ -132,7 +132,7 @@ void KLettres::findLanguages()
     //we look in $TDEDIR/share/locale/all_languages from /tdelibs/tdecore/all_languages
     //to find the name of the country
     //corresponding to the code and the language the user set
-    KConfig entry(locate("locale", "all_languages"));
+    TDEConfig entry(locate("locale", "all_languages"));
     const TQStringList::ConstIterator itEnd = m_languages.end();
     for (TQStringList::Iterator it = m_languages.begin(); it != m_languages.end(); ++it) {
         if (*it == "hi-ro")
@@ -264,10 +264,10 @@ void KLettres::setupToolbars()
 
 void KLettres::optionsPreferences()
 {
-    if(KConfigDialog::showDialog("settings"))
+    if(TDEConfigDialog::showDialog("settings"))
         return;
 
-    KConfigDialog *dialog = new KConfigDialog(this, "settings", Prefs::self());
+    TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Prefs::self());
     dialog->addPage(new fontsdlg(0, "mFont"), i18n("Font Settings"), "fonts");
     //fontsdlg is the page name, mFont is the widget name, Font Settings is the page display string
     //fonts is the icon
diff --git a/klettres/klettres/main.cpp b/klettres/klettres/main.cpp
index 6f728051..832f5476 100644
--- a/klettres/klettres/main.cpp
+++ b/klettres/klettres/main.cpp
@@ -85,7 +85,7 @@ int main(int argc, char **argv)
     about.addCredit("Peter Hedlund",
                     I18N_NOOP("Code for generating special characters' icons"), "peter.hedlund AT kdemail.net");
     about.addCredit("Waldo Bastian",
-                    I18N_NOOP("Port to KConfig XT, coding help"), "bastian AT kde.org");
+                    I18N_NOOP("Port to TDEConfig XT, coding help"), "bastian AT kde.org");
     about.addCredit("Danny Allen",
                     I18N_NOOP("Kids and grown-up SVG icons"), "danny AT dannyallen.co.uk");
     about.addCredit("Michael Goettsche",
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index 5d69f929..04190ce0 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -99,7 +99,7 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c
 	m_recentFiles->loadEntries( m_config );
 
 	// Let's create a Configure Diloag
-	m_settingsDialog = new KConfigDialog( parentWidget, "settings", Settings::self() );
+	m_settingsDialog = new TDEConfigDialog( parentWidget, "settings", Settings::self() );
 	m_settingsDialog->setHelp("general-config");
 
 	// create and add the page(s)
@@ -268,7 +268,7 @@ void MainDlg::slotSaveas()
 	if ( !url.isEmpty() )
 	{
 		// check if file exists and overwriting is ok.
-		if( !KIO::NetAccess::exists( url,false,m_parent ) || KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue )
+		if( !TDEIO::NetAccess::exists( url,false,m_parent ) || KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue )
 		{
 			if ( !kmplotio->save( url ) )
 				KMessageBox::error(m_parent, i18n("The file could not be saved") );
@@ -293,7 +293,7 @@ void MainDlg::slotExport()
 	if(!url.isEmpty())
 	{
 		// check if file exists and overwriting is ok.
-		if( KIO::NetAccess::exists(url,false,m_parent ) && KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg(url.url() ), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) != KMessageBox::Continue ) return;
+		if( TDEIO::NetAccess::exists(url,false,m_parent ) && KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg(url.url() ), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) != KMessageBox::Continue ) return;
 
 		if( url.fileName().right(4).lower()==".svg")
 		{
@@ -305,7 +305,7 @@ void MainDlg::slotExport()
 			{
 				KTempFile tmp;
 				pic.save( tmp.name(), "SVG");
-				if ( !KIO::NetAccess::upload(tmp.name(), url, 0) )
+				if ( !TDEIO::NetAccess::upload(tmp.name(), url, 0) )
 					KMessageBox::error(m_parent, i18n("The URL could not be saved.") );
 				tmp.unlink();
 			}
@@ -321,7 +321,7 @@ void MainDlg::slotExport()
 			{
 				KTempFile tmp;
 				pic.save( tmp.name(), "BMP");
-				if ( !KIO::NetAccess::upload(tmp.name(), url, 0) )
+				if ( !TDEIO::NetAccess::upload(tmp.name(), url, 0) )
 					KMessageBox::error(m_parent, i18n("The URL could not be saved.") );
 				tmp.unlink();
 			}
@@ -337,7 +337,7 @@ void MainDlg::slotExport()
 			{
 				KTempFile tmp;
 				pic.save( tmp.name(), "PNG");
-				if ( !KIO::NetAccess::upload(tmp.name(), url, 0) )
+				if ( !TDEIO::NetAccess::upload(tmp.name(), url, 0) )
 					KMessageBox::error(m_parent, i18n("The URL could not be saved.") );
 				tmp.unlink();
 			}
@@ -402,7 +402,7 @@ void MainDlg::slotPrint()
 void MainDlg::editColors()
 {
 	// create a config dialog and add a colors page
-	KConfigDialog* colorsDialog = new KConfigDialog( m_parent, "colors", Settings::self() );
+	TDEConfigDialog* colorsDialog = new TDEConfigDialog( m_parent, "colors", Settings::self() );
 	colorsDialog->setHelp("color-config");
 	colorsDialog->addPage( new SettingsPageColor( 0, "colorSettings" ), i18n( "Colors" ), "colorize", i18n( "Edit Colors" ) );
 
@@ -428,7 +428,7 @@ void MainDlg::editAxes()
 void MainDlg::editScaling()
 {
 	// create a config dialog and add a scaling page
-	KConfigDialog *scalingDialog = new KConfigDialog( m_parent, "scaling", Settings::self() );
+	TDEConfigDialog *scalingDialog = new TDEConfigDialog( m_parent, "scaling", Settings::self() );
 	scalingDialog->setHelp("scaling-config");
 	scalingDialog->addPage( new SettingsPageScaling( 0, "scalingSettings" ), i18n( "Scale" ), "scaling", i18n( "Edit Scaling" ) );
 	// User edited the configuration - update your local copies of the
@@ -440,7 +440,7 @@ void MainDlg::editScaling()
 void MainDlg::editFonts()
 {
 	// create a config dialog and add a font page
-	KConfigDialog* fontsDialog = new KConfigDialog( m_parent, "fonts", Settings::self() );
+	TDEConfigDialog* fontsDialog = new TDEConfigDialog( m_parent, "fonts", Settings::self() );
 	fontsDialog->setHelp("font-config");
 	fontsDialog->addPage( new SettingsPageFonts( 0, "fontsSettings" ), i18n( "Fonts" ), "fonts", i18n( "Edit Fonts" ) );
 	// User edited the configuration - update your local copies of the
@@ -599,7 +599,7 @@ void MainDlg::slotSettings()
 	// An instance of your dialog has already been created and has been cached,
 	// so we want to display the cached dialog instead of creating
 	// another one
-	KConfigDialog::showDialog( "settings" );
+	TDEConfigDialog::showDialog( "settings" );
 }
 
 void MainDlg::updateSettings()
diff --git a/kmplot/kmplot/MainDlg.h b/kmplot/kmplot/MainDlg.h
index 9ab99ba2..19370836 100644
--- a/kmplot/kmplot/MainDlg.h
+++ b/kmplot/kmplot/MainDlg.h
@@ -50,7 +50,7 @@
 #include "kmplotio.h"
 #include "MainDlgIface.h"
 
-class KConfigDialog;
+class TDEConfigDialog;
 class KLineEdit;
 class KRecentFilesAction;
 class SettingsPageColor;
@@ -167,11 +167,11 @@ private:
 	/// true == modifications not saved
 	bool m_modified;
 	///An instance of the application config file
-	KConfig* m_config;
+	TDEConfig* m_config;
 	///The KLineEdit which is in the toolbar
 	KLineEdit* m_quickEdit;
 	///A Configure KmPlot dialog instance
-	KConfigDialog* m_settingsDialog;
+	TDEConfigDialog* m_settingsDialog;
 	///The Precision page for the Configure KmPlot dialog
 	SettingsPagePrecision* m_generalSettings;
 	///The Constants page for the Configure KmPlot constants
diff --git a/kmplot/kmplot/View.h b/kmplot/kmplot/View.h
index 7eb09328..b34abf4a 100644
--- a/kmplot/kmplot/View.h
+++ b/kmplot/kmplot/View.h
@@ -76,7 +76,7 @@ public:
 
 	/// Reimplemented to draw all stuff to the view.
 	void draw(TQPaintDevice *, int const);
-	/// Getting all relevant settings using KConfig XT class Settings.
+	/// Getting all relevant settings using TDEConfig XT class Settings.
 	void getSettings();
 	/// Clears all functions in the parser and gets default settings.
 	/// @see getSettings
diff --git a/kmplot/kmplot/coordsconfigdialog.cpp b/kmplot/kmplot/coordsconfigdialog.cpp
index 37e92b16..4a442080 100644
--- a/kmplot/kmplot/coordsconfigdialog.cpp
+++ b/kmplot/kmplot/coordsconfigdialog.cpp
@@ -33,7 +33,7 @@
 #include "coordsconfigdialog.h"
 
 CoordsConfigDialog::CoordsConfigDialog(XParser *p, TQWidget *parent)
-	: KConfigDialog(parent, "coords", Settings::self()), m_parser(p)
+	: TDEConfigDialog(parent, "coords", Settings::self()), m_parser(p)
 {
 	configAxesDialog = new SettingsPageCoords( 0, "coordsSettings" );
 	addPage(configAxesDialog , i18n( "Coords" ), "coords", i18n( "Edit Coordinate System" ) );
@@ -78,13 +78,13 @@ bool CoordsConfigDialog::evalY()
 void CoordsConfigDialog::slotOk()
 {
 	if ( !(configAxesDialog->radioButton1_4->isChecked() && !evalX()) && !(configAxesDialog->radioButton1_4_2->isChecked() && !evalY()))
-		KConfigDialog::slotOk();
+		TDEConfigDialog::slotOk();
 }
 
 void CoordsConfigDialog::slotApply()
 {
 	if ( !(configAxesDialog->radioButton1_4->isChecked() && !evalX()) && !(configAxesDialog->radioButton1_4_2->isChecked() && !evalY()))
-		KConfigDialog::slotApply();
+		TDEConfigDialog::slotApply();
 }
 
 #include "coordsconfigdialog.moc"
diff --git a/kmplot/kmplot/coordsconfigdialog.h b/kmplot/kmplot/coordsconfigdialog.h
index c95b47f5..e480bf53 100644
--- a/kmplot/kmplot/coordsconfigdialog.h
+++ b/kmplot/kmplot/coordsconfigdialog.h
@@ -36,7 +36,7 @@ class SettingsPageCoords;
 @author Fredrik Edemar
 */
 /// 
-class CoordsConfigDialog : public KConfigDialog
+class CoordsConfigDialog : public TDEConfigDialog
 {
 	Q_OBJECT
   
diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp
index b8dd8cdb..831cb612 100644
--- a/kmplot/kmplot/kmplot.cpp
+++ b/kmplot/kmplot/kmplot.cpp
@@ -149,14 +149,14 @@ void KmPlot::setupActions()
 	connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool )));
 }
 
-void KmPlot::saveProperties(KConfig* /*config*/)
+void KmPlot::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 KmPlot::readProperties(KConfig* /*config*/)
+void KmPlot::readProperties(TDEConfig* /*config*/)
 {
 	// the 'config' object points to the session managed
 	// config file.  this function is automatically called whenever
diff --git a/kmplot/kmplot/kmplot.h b/kmplot/kmplot/kmplot.h
index c8ebad71..6ca68451 100644
--- a/kmplot/kmplot/kmplot.h
+++ b/kmplot/kmplot/kmplot.h
@@ -71,14 +71,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 *);
 
 	/// Quits KmPlot after checking if modifications shall be saved.
 	virtual bool queryClose();
diff --git a/kmplot/kmplot/kmplotio.cpp b/kmplot/kmplot/kmplotio.cpp
index 0beb551a..ad9142b2 100644
--- a/kmplot/kmplot/kmplotio.cpp
+++ b/kmplot/kmplot/kmplotio.cpp
@@ -189,7 +189,7 @@ bool KmPlotIO::save( const KURL &url )
 		doc.save( ts, 4 );
 		xmlfile.close();
 
-		if ( !KIO::NetAccess::upload(tmpfile.name(), url,0))
+		if ( !TDEIO::NetAccess::upload(tmpfile.name(), url,0))
 		{
 			tmpfile.unlink();
 			return false;
@@ -224,13 +224,13 @@ bool KmPlotIO::load( const KURL &url )
 	TQFile f;
 	if ( !url.isLocalFile() )
 	{
-		if( !KIO::NetAccess::exists( url, true, 0 ) )
+		if( !TDEIO::NetAccess::exists( url, true, 0 ) )
 		{
 			KMessageBox::error(0,i18n("The file does not exist."));
 			return false;
 		}
 		TQString tmpfile;
-		if( !KIO::NetAccess::download( url, tmpfile, 0 ) )
+		if( !TDEIO::NetAccess::download( url, tmpfile, 0 ) )
 		{
 			KMessageBox::error(0,i18n("An error appeared when opening this file"));
 			return false;
@@ -289,7 +289,7 @@ bool KmPlotIO::load( const KURL &url )
 		KMessageBox::error(0,i18n("The file had an unknown version number"));
 
 	if ( !url.isLocalFile() )
-		KIO::NetAccess::removeTempFile( f.name() );
+		TDEIO::NetAccess::removeTempFile( f.name() );
 	return true;
 }
 
diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp
index dd320ac7..50ed3c02 100644
--- a/kmplot/kmplot/kparametereditor.cpp
+++ b/kmplot/kmplot/kparametereditor.cpp
@@ -138,7 +138,7 @@ void KParameterEditor::cmdImport_clicked()
 	if ( url.isEmpty() )
 		return;
         
-        if (!KIO::NetAccess::exists(url,true,this) )
+        if (!TDEIO::NetAccess::exists(url,true,this) )
         {
                 KMessageBox::error(0,i18n("The file does not exist."));
                 return;
@@ -149,7 +149,7 @@ void KParameterEditor::cmdImport_clicked()
         TQString tmpfile;
         if ( !url.isLocalFile() )
         {
-                if ( !KIO::NetAccess::download(url, tmpfile, this) )
+                if ( !TDEIO::NetAccess::download(url, tmpfile, this) )
                 {
                         KMessageBox::error(0,i18n("An error appeared when opening this file"));
                         return;
@@ -182,7 +182,7 @@ void KParameterEditor::cmdImport_clicked()
 				if ( KMessageBox::warningContinueCancel(this,i18n("Line %1 is not a valid parameter value and will therefore not be included. Do you want to continue?").arg(i) ) == KMessageBox::Cancel)
 				{
 					file.close();
-                                        KIO::NetAccess::removeTempFile( tmpfile );
+                                        TDEIO::NetAccess::removeTempFile( tmpfile );
 					return;
 				}
 				else if (KMessageBox::warningYesNo(this,i18n("Would you like to be informed about other lines that cannot be read?"), TQString(), i18n("Get Informed"), i18n("Ignore Information") ) == KMessageBox::No)
@@ -195,7 +195,7 @@ void KParameterEditor::cmdImport_clicked()
 		KMessageBox::error(0,i18n("An error appeared when opening this file"));
         
         if ( !url.isLocalFile() )
-                KIO::NetAccess::removeTempFile( tmpfile );
+                TDEIO::NetAccess::removeTempFile( tmpfile );
 }
 
 void KParameterEditor::cmdExport_clicked()
@@ -206,7 +206,7 @@ void KParameterEditor::cmdExport_clicked()
         if ( url.isEmpty() )
                 return;
 
-        if( !KIO::NetAccess::exists( url,false,this ) || KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue )
+        if( !TDEIO::NetAccess::exists( url,false,this ) || KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue )
         {
                 TQString tmpfile;
                 TQFile file;
@@ -233,7 +233,7 @@ void KParameterEditor::cmdExport_clicked()
                         else
                                 KMessageBox::error(0,i18n("An error appeared when saving this file"));
                         
-                        if ( !KIO::NetAccess::upload(tmpfile.name(),url, this) )
+                        if ( !TDEIO::NetAccess::upload(tmpfile.name(),url, this) )
                         {
                                 KMessageBox::error(0,i18n("An error appeared when saving this file"));
                                 tmpfile.unlink();
diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp
index 0b3e4193..02bc7969 100644
--- a/kmplot/kmplot/ksliderwindow.cpp
+++ b/kmplot/kmplot/ksliderwindow.cpp
@@ -50,7 +50,7 @@ KSliderWindow::KSliderWindow(TQWidget* parent, int num ) :
 	TQWhatsThis::add( this, i18n( "Move slider to change the parameter of the function plot connected to this slider." ) );
 	
 	// load the min and max value + the current value
-	KConfig config( "kmplotrc" );
+	TDEConfig config( "kmplotrc" );
 	config.setGroup( "slider" + TQString::number(num) );
 	slider->setMinValue( config.readNumEntry( "min", 0) );
 	slider->setMaxValue( config.readNumEntry( "max", 100) );
@@ -70,7 +70,7 @@ KSliderWindow::KSliderWindow(TQWidget* parent, int num ) :
 KSliderWindow::~KSliderWindow()
 {
 	// save the min and max value + the current value
-	KConfig config( "kmplotrc" );
+	TDEConfig config( "kmplotrc" );
 	config.setGroup( "slider" + TQString::number(m_num) );
 	config.writeEntry( "min", slider->minValue() );
 	config.writeEntry( "max", slider->maxValue() );
diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp
index edbc9006..cff58b6c 100644
--- a/kstars/kstars/ccdpreviewwg.cpp
+++ b/kstars/kstars/ccdpreviewwg.cpp
@@ -261,7 +261,7 @@ void CCDPreviewWG::captureImage()
 	if ( tmpfile.name() == fname )
 	{ //need to upload to remote location
 	
-	  if ( ! KIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) )
+	  if ( ! TDEIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) )
 	  {
 		TQString message = i18n( "Could not upload image to remote location: %1" ).arg( currentFileURL.prettyURL() );
 		KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) );
diff --git a/kstars/kstars/colorscheme.cpp b/kstars/kstars/colorscheme.cpp
index 5449c48e..7dbacf05 100644
--- a/kstars/kstars/colorscheme.cpp
+++ b/kstars/kstars/colorscheme.cpp
@@ -290,7 +290,7 @@ bool ColorScheme::save( const TQString &name ) {
 	return true;
 }
 
-void ColorScheme::loadFromConfig( KConfig *conf ) {
+void ColorScheme::loadFromConfig( TDEConfig *conf ) {
 	TQStringList::Iterator it = KeyName.begin();
 	TQStringList::Iterator it_end = KeyName.end();
 	for ( ; it != it_end; ++it )
@@ -300,7 +300,7 @@ void ColorScheme::loadFromConfig( KConfig *conf ) {
 	setStarColorIntensity( conf->readNumEntry( "StarColorIntensity", 5 ) );
 }
 
-void ColorScheme::saveToConfig( KConfig *conf ) {
+void ColorScheme::saveToConfig( TDEConfig *conf ) {
 	TQStringList::Iterator it = KeyName.begin();
 	TQStringList::Iterator it_end = KeyName.end();
 	for ( ; it != it_end; ++it )
diff --git a/kstars/kstars/colorscheme.h b/kstars/kstars/colorscheme.h
index 22edb1e6..696abcc0 100644
--- a/kstars/kstars/colorscheme.h
+++ b/kstars/kstars/colorscheme.h
@@ -21,7 +21,7 @@
 #include <tqmap.h>
 #include <tqstringlist.h>
 
-class KConfig;
+class TDEConfig;
 
 /**
 	*@class ColorScheme
@@ -114,11 +114,11 @@ class ColorScheme {
 
 	/**Read color-scheme data from the Config object.
 		*/
-		void loadFromConfig( KConfig* );
+		void loadFromConfig( TDEConfig* );
 		
 	/**Save color-scheme data to the Config object.
 		*/
-		void saveToConfig( KConfig* );
+		void saveToConfig( TDEConfig* );
 
 	/**@return the number of colors in the color scheme.*/
 		unsigned int numberOfColors() const { return (int)Palette.size(); }
diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp
index 9d07fc64..8b0acacb 100644
--- a/kstars/kstars/imageviewer.cpp
+++ b/kstars/kstars/imageviewer.cpp
@@ -131,11 +131,11 @@ void ImageViewer::loadImageFromURL()
 	if (!saveURL.isValid())
             kdDebug()<<"tempfile-URL is malformed\n";
 
-	downloadJob = KIO::copy (imageURL, saveURL);	// starts the download asynchron
-	connect (downloadJob, TQT_SIGNAL (result (KIO::Job *)), TQT_SLOT (downloadReady (KIO::Job *)));
+	downloadJob = TDEIO::copy (imageURL, saveURL);	// starts the download asynchron
+	connect (downloadJob, TQT_SIGNAL (result (TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *)));
 }
 
-void ImageViewer::downloadReady (KIO::Job *job)
+void ImageViewer::downloadReady (TDEIO::Job *job)
 {
 // set downloadJob to 0, but don't delete it - the job will automatically deleted !!!
 	downloadJob = 0;
@@ -223,7 +223,7 @@ void ImageViewer::saveFileToDisc()
 
 void ImageViewer::saveFile (KURL &url) {
 // synchronous Access to prevent segfaults
-	if (!KIO::NetAccess::copy (KURL (file->name()), url, (TQWidget*) 0))
+	if (!TDEIO::NetAccess::copy (KURL (file->name()), url, (TQWidget*) 0))
 	{
 		TQString text = i18n ("Saving of the image %1 failed.");
 		KMessageBox::error (this, text.arg (url.prettyURL() ));
diff --git a/kstars/kstars/imageviewer.h b/kstars/kstars/imageviewer.h
index fa1873e4..3bae7a27 100644
--- a/kstars/kstars/imageviewer.h
+++ b/kstars/kstars/imageviewer.h
@@ -110,11 +110,11 @@ class ImageViewer : public KMainWindow  {
 		TQString filename;
 		bool ctrl, key_s, key_q;	// the keys
 
-		KIO::Job *downloadJob;  // download job of image -> 0 == no job is running
+		TDEIO::Job *downloadJob;  // download job of image -> 0 == no job is running
 		
 	private slots:
 	/**Make sure download has finished, then make sure file exists, then display the image */
-		void downloadReady (KIO::Job *);
+		void downloadReady (TDEIO::Job *);
 
 	/**Saves. File. To. Disc. */
 		void saveFileToDisc( void );
diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp
index 4e28a5ab..dfa392b3 100644
--- a/kstars/kstars/kstarsactions.cpp
+++ b/kstars/kstars/kstarsactions.cpp
@@ -350,10 +350,10 @@ void KStars::slotViewOps() {
 	//An instance of your dialog could be already created and could be cached,
 	//in which case you want to display the cached dialog instead of creating
 	//another one
-	if ( KConfigDialog::showDialog( "settings" ) ) return;
+	if ( TDEConfigDialog::showDialog( "settings" ) ) return;
 
-	//KConfigDialog didn't find an instance of this dialog, so lets create it :
-	KConfigDialog* dialog = new KConfigDialog( this, "settings",
+	//TDEConfigDialog didn't find an instance of this dialog, so lets create it :
+	TDEConfigDialog* dialog = new TDEConfigDialog( this, "settings",
 					     Options::self() );
 
 	connect( dialog, TQT_SIGNAL( applyClicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplySettings() ) );
@@ -496,11 +496,11 @@ void KStars::slotRunScript() {
 					fname = tmpfile.name();
 				}
 
-				if( KIO::NetAccess::download( fileURL, fname, this ) ) {
+				if( TDEIO::NetAccess::download( fileURL, fname, this ) ) {
 					chmod( fname.ascii(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH ); //make it executable
 
 					if ( tmpfile.name() == fname ) { //upload to remote location
-						if ( ! KIO::NetAccess::upload( tmpfile.name(), fileURL, this ) ) {
+						if ( ! TDEIO::NetAccess::upload( tmpfile.name(), fileURL, this ) ) {
 							TQString message = i18n( "Could not upload image to remote location: %1" ).arg( fileURL.prettyURL() );
 							KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) );
 						}
@@ -519,7 +519,7 @@ void KStars::slotRunScript() {
 
 		if ( ! fileURL.isLocalFile() ) {
 			fname = tmpfile.name();
-			if( KIO::NetAccess::download( fileURL, fname, this ) ) {
+			if( TDEIO::NetAccess::download( fileURL, fname, this ) ) {
 				chmod( fname.ascii(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH );
 				f.setName( fname );
 			}
diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp
index 11f71f17..1c755175 100644
--- a/kstars/kstars/kstarsdcop.cpp
+++ b/kstars/kstars/kstarsdcop.cpp
@@ -210,7 +210,7 @@ TQString KStars::getOption( const TQString &name ) {
 	if ( name == "FocusRA" ) { return TQString::number( map()->focus()->ra()->Hours(), 'f', 6 ); }
 	if ( name == "FocusDec" ) { return TQString::number( map()->focus()->dec()->Degrees(), 'f', 6 ); }
 
-	KConfigSkeletonItem *it = Options::self()->findItem( name );
+	TDEConfigSkeletonItem *it = Options::self()->findItem( name );
 	if ( it ) return it->property().toString();
 	else return TQString();
 }
@@ -451,7 +451,7 @@ void KStars::exportImage( const TQString url, int w, int h ) {
 		else kdDebug() << i18n( "Image saved to file: %1" ).arg( fname ) << endl;
 
 		if ( tmpfile.name() == fname ) { //attempt to upload image to remote location
-			if ( ! KIO::NetAccess::upload( tmpfile.name(), fileURL, this ) ) {
+			if ( ! TDEIO::NetAccess::upload( tmpfile.name(), fileURL, this ) ) {
 				TQString message = i18n( "Could not upload image to remote location: %1" ).arg( fileURL.prettyURL() );
 				KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) );
 			}
diff --git a/kstars/kstars/skymap.h b/kstars/kstars/skymap.h
index 6ad0b86d..5938afe1 100644
--- a/kstars/kstars/skymap.h
+++ b/kstars/kstars/skymap.h
@@ -61,7 +61,7 @@ class SkyMap : public TQWidget  {
   
 public:
 /**
-	*Constructor.  Read stored settings from KConfig object (focus position,
+	*Constructor.  Read stored settings from TDEConfig object (focus position,
 	*zoom factor, sky color, etc.).  Run initPopupMenus().
 	*/
 	SkyMap( KStarsData *d, TQWidget *parent=0, const char *name=0);
diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp
index e6796bcb..86d73a01 100644
--- a/kstars/kstars/streamwg.cpp
+++ b/kstars/kstars/streamwg.cpp
@@ -252,7 +252,7 @@ void StreamWG::captureImage()
 	if ( tmpfile.name() == fname )
 	{ //need to upload to remote location
 	
-	  if ( ! KIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) )
+	  if ( ! TDEIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) )
 	  {
 		TQString message = i18n( "Could not upload image to remote location: %1" ).arg( currentFileURL.prettyURL() );
 		KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) );
diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp
index 237eaa85..f568dbec 100644
--- a/kstars/kstars/thumbnailpicker.cpp
+++ b/kstars/kstars/thumbnailpicker.cpp
@@ -107,15 +107,15 @@ void ThumbnailPicker::slotFillList() {
 	for ( ; itList != itListEnd; ++itList ) {
 		TQString s( *itList );
 		KURL u( s );
-		if ( u.isValid() && KIO::NetAccess::exists(u, true, this) ) {
+		if ( u.isValid() && TDEIO::NetAccess::exists(u, true, this) ) {
 			KTempFile ktf;
 			TQFile *tmpFile = ktf.file();
 			ktf.unlink(); //just need filename
-			JobList.append( KIO::copy( u, KURL( tmpFile->name() ), false ) ); //false = no progress window
+			JobList.append( TDEIO::copy( u, KURL( tmpFile->name() ), false ) ); //false = no progress window
 #if KDE_IS_VERSION( 3, 3, 90 )
-			((KIO::CopyJob*)JobList.current())->setInteractive( false ); // suppress error dialogs
+			((TDEIO::CopyJob*)JobList.current())->setInteractive( false ); // suppress error dialogs
 #endif
-			connect (JobList.current(), TQT_SIGNAL (result(KIO::Job *)), TQT_SLOT (downloadReady (KIO::Job *)));
+			connect (JobList.current(), TQT_SIGNAL (result(TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *)));
 
 		}
 	}
@@ -126,7 +126,7 @@ void ThumbnailPicker::parseGooglePage( TQStringList &ImList, TQString URL ) {
 	TQString PageHTML;
 
 	//Read the google image page's HTML into the PageHTML TQString:
-	if ( KIO::NetAccess::exists(URL, true, this) && KIO::NetAccess::download( URL, tmpFile ) ) {
+	if ( TDEIO::NetAccess::exists(URL, true, this) && TDEIO::NetAccess::download( URL, tmpFile ) ) {
 		TQFile file( tmpFile );
 		if ( file.open( IO_ReadOnly ) ) {
 			TQTextStream instream(&file);
@@ -137,7 +137,7 @@ void ThumbnailPicker::parseGooglePage( TQStringList &ImList, TQString URL ) {
 			return;
 		}
 	} else {
-		kdDebug() << KIO::NetAccess::lastErrorString() << endl;
+		kdDebug() << TDEIO::NetAccess::lastErrorString() << endl;
 		return;
 	}
 
@@ -152,7 +152,7 @@ void ThumbnailPicker::parseGooglePage( TQStringList &ImList, TQString URL ) {
 	}
 }
 
-void ThumbnailPicker::downloadReady(KIO::Job *job) {
+void ThumbnailPicker::downloadReady(TDEIO::Job *job) {
 	//Note: no need to delete the job, it is automatically deleted !
 
 	//Update Progressbar
@@ -170,7 +170,7 @@ void ThumbnailPicker::downloadReady(KIO::Job *job) {
 		return;
 	}
 
-	KIO::CopyJob *cjob = (KIO::CopyJob*)job;
+	TDEIO::CopyJob *cjob = (TDEIO::CopyJob*)job;
 	TQFile tmp( cjob->destURL().path() );
 	tmp.close(); // to get the newest information of the file
 
@@ -335,15 +335,15 @@ void ThumbnailPicker::slotSetFromURL() {
 			ui->ImageList->setCurrentItem( 0 );
 			slotSetFromList(0);
 
-		} else if ( KIO::NetAccess::exists(u, true, this) ) {
+		} else if ( TDEIO::NetAccess::exists(u, true, this) ) {
 			KTempFile ktf;
 			TQFile *tmpFile = ktf.file();
 			ktf.unlink(); //just need filename
-			JobList.append( KIO::copy( u, KURL( tmpFile->name() ), false ) ); //false = no progress window
+			JobList.append( TDEIO::copy( u, KURL( tmpFile->name() ), false ) ); //false = no progress window
 #if KDE_IS_VERSION( 3, 3, 90 )
-			((KIO::CopyJob*)JobList.current())->setInteractive( false ); // suppress error dialogs
+			((TDEIO::CopyJob*)JobList.current())->setInteractive( false ); // suppress error dialogs
 #endif
-			connect (JobList.current(), TQT_SIGNAL (result(KIO::Job *)), TQT_SLOT (downloadReady (KIO::Job *)));
+			connect (JobList.current(), TQT_SIGNAL (result(TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *)));
 
 			//
 		}
diff --git a/kstars/kstars/thumbnailpicker.h b/kstars/kstars/thumbnailpicker.h
index 840e3bd5..89346989 100644
--- a/kstars/kstars/thumbnailpicker.h
+++ b/kstars/kstars/thumbnailpicker.h
@@ -55,7 +55,7 @@ private slots:
 	void slotFillList();
 
 /**Make sure download has finished, then make sure file exists, then add image to list */
-	void downloadReady (KIO::Job *);
+	void downloadReady (TDEIO::Job *);
 
 private:
 	TQPixmap shrinkImage( TQPixmap *original, int newSize, bool setImage=false );
@@ -66,7 +66,7 @@ private:
 	TQPixmap *Image;
 	DetailDialog *dd;
 	SkyObject *Object;
-	TQPtrList<KIO::Job> JobList;
+	TQPtrList<TDEIO::Job> JobList;
 	TQPtrList<TQPixmap> PixList;
 	bool bImageFound;
 	TQRect *ImageRect;
diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp
index b309233e..a07bfc50 100644
--- a/kstars/kstars/tools/lcgenerator.cpp
+++ b/kstars/kstars/tools/lcgenerator.cpp
@@ -426,11 +426,11 @@ void LCGenerator::updateStarList()
 	KURL AAVSOFile("http://www.aavso.org/observing/aids/valaav.txt");
 	KURL saveFile (file->name());
 	
-	downloadJob = KIO::file_copy (AAVSOFile, saveFile, -1, true);
-	connect (downloadJob, TQT_SIGNAL (result (KIO::Job *)), TQT_SLOT (downloadReady (KIO::Job *)));
+	downloadJob = TDEIO::file_copy (AAVSOFile, saveFile, -1, true);
+	connect (downloadJob, TQT_SIGNAL (result (TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *)));
 }
 
-void LCGenerator::downloadReady(KIO::Job * job)
+void LCGenerator::downloadReady(TDEIO::Job * job)
 {
 
 downloadJob = 0;
diff --git a/kstars/kstars/tools/lcgenerator.h b/kstars/kstars/tools/lcgenerator.h
index 8245c04f..04fa8841 100644
--- a/kstars/kstars/tools/lcgenerator.h
+++ b/kstars/kstars/tools/lcgenerator.h
@@ -126,7 +126,7 @@ private:
 	TQHBoxLayout* ButtonHLayout; 
 	
 	
-	KIO::Job *downloadJob;  // download job of image -> 0 == no job is running
+	TDEIO::Job *downloadJob;  // download job of image -> 0 == no job is running
 	
 	TQFile *file;
 	
@@ -155,7 +155,7 @@ public slots:
 	void updateStarList();
 
 /** Reload file and update lists after download */
-	void downloadReady(KIO::Job *);
+	void downloadReady(TDEIO::Job *);
 };
 
 #endif // LCGENERATOR_H
diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp
index 17fa8cce..063e4b5f 100644
--- a/kstars/kstars/tools/observinglist.cpp
+++ b/kstars/kstars/tools/observinglist.cpp
@@ -519,7 +519,7 @@ void ObservingList::slotOpenList() {
 			KTempFile tmpfile;
 			tmpfile.setAutoDelete(true);
 			FileName = tmpfile.name();
-			if( KIO::NetAccess::download( fileURL, FileName, this ) ) 
+			if( TDEIO::NetAccess::download( fileURL, FileName, this ) ) 
 				f.setName( FileName );
 
 		} else {
diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp
index 9e02efe0..7a31fbf1 100644
--- a/kstars/kstars/tools/scriptbuilder.cpp
+++ b/kstars/kstars/tools/scriptbuilder.cpp
@@ -753,7 +753,7 @@ void ScriptBuilder::slotOpen() {
 				fname = currentFileURL.path();
 			} else {
 				fname = tmpfile.name();
-				if ( ! KIO::NetAccess::download( currentFileURL, fname, (TQWidget*) 0 ) )
+				if ( ! TDEIO::NetAccess::download( currentFileURL, fname, (TQWidget*) 0 ) )
 					KMessageBox::sorry( 0, i18n( "Could not download remote file." ), i18n( "Download Error" ) );
 			}
 
@@ -833,7 +833,7 @@ void ScriptBuilder::slotSave() {
 		chmod( fname.ascii(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH );
 
 		if ( tmpfile.name() == fname ) { //need to upload to remote location
-			if ( ! KIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) ) {
+			if ( ! TDEIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) ) {
 				TQString message = i18n( "Could not upload image to remote location: %1" ).arg( currentFileURL.prettyURL() );
 				KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) );
 			}
diff --git a/ktouch/ChangeLog b/ktouch/ChangeLog
index 2a918ddc..b8a9c1e7 100644
--- a/ktouch/ChangeLog
+++ b/ktouch/ChangeLog
@@ -89,13 +89,13 @@
     KTouch is started.
 
 2004-11-01 Andreas Nicolai <andreas.nicolai@gmx.net>
-  * Moved all configuration data to Prefs (using KConfig XT) or
+  * Moved all configuration data to Prefs (using TDEConfig XT) or
     to the KTouch Main Widget
   * Removed the old configuration object completely
   * Changed the startup procedure somewhat
 
 2004-10-29 Andreas Nicolai <andreas.nicolai@gmx.net>
-  * Moved some more configuration entries to the KConfig XT, 
+  * Moved some more configuration entries to the TDEConfig XT, 
     fixed some bugs with the configuration dialog
   * added font override buttons.
 
@@ -115,11 +115,11 @@
     context menu anylonger
   * Fixed the deprecated download/upload routines
   * Revised the configuration class and added new config data (still to 
-    be syncronized with KConfig XT)
+    be syncronized with TDEConfig XT)
   * plus much more...
 
 2004-09-30 Anne-Marie Mahfouf <annemarie.mahfouf@free.fr>
-  * Port to KConfig XT 
+  * Port to TDEConfig XT 
   * Port the Trainig ->Default Lectures, Settings->Keyboard Layouts, 
     Settings->Keyboard Color Schemes to KSelectAction
   * Add tooltips and QWhatsThis help in Config dialogs
diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index d9ee9d9c..278ad3fe 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -420,9 +420,9 @@ void KTouch::trainingStatistics() {
 
 void KTouch::optionsPreferences() {
     trainingPause();
-	if ( KConfigDialog::showDialog( "settings" ) )	return;
-	// KConfigDialog didn't find an instance of this dialog, so lets create it :
-	KConfigDialog* dialog = new KConfigDialog( this, "settings",  Prefs::self() );
+	if ( TDEConfigDialog::showDialog( "settings" ) )	return;
+	// TDEConfigDialog didn't find an instance of this dialog, so lets create it :
+	TDEConfigDialog* dialog = new TDEConfigDialog( this, "settings",  Prefs::self() );
 	m_pageGeneral = new KTouchPrefGeneralLayout(0, "General");
 	dialog->addPage(m_pageGeneral, i18n("General Options"), "style");
 	m_pageTraining = new KTouchPrefTrainingLayout(0, "Training");
@@ -542,7 +542,7 @@ void KTouch::resizeEvent(TQResizeEvent * event) {
 // Will be called when this app is restored due to session management.
 // This function only stored the temperary data of the last session. All permanent
 // settings should be handled by the KTouchConfiguration object.
-void KTouch::readProperties(KConfig *config) {
+void KTouch::readProperties(TDEConfig *config) {
     kdDebug() << "[KTouch::readProperties]  Reading session data..." << endl;
 	// TODO : Session management rewrite
     config->setGroup("TrainingState");
@@ -575,7 +575,7 @@ void KTouch::readProperties(KConfig *config) {
 // ----------------------------------------------------------------------------
 
 // Will be called when the app should save its state for session management purposes.
-void KTouch::saveProperties(KConfig *config) {
+void KTouch::saveProperties(TDEConfig *config) {
     kdDebug() << "[KTouch::saveProperties]  Saving session data..." << endl;
     // We are going down because of session management (most likely because of
     // KDE logout). Let's save the current status so that we can restore it
diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h
index 5a79450f..85697d59 100644
--- a/ktouch/src/ktouch.h
+++ b/ktouch/src/ktouch.h
@@ -121,9 +121,9 @@ class KTouch : public KMainWindow {
   private:
     // *** BEGIN - Session management ***
     /// Will be called when this app is restored due to session management.
-    void readProperties(KConfig *config);
+    void readProperties(TDEConfig *config);
     /// Will be called when the app should save its state for session management purposes.
-    void saveProperties(KConfig *config);
+    void saveProperties(TDEConfig *config);
     // *** END - Session management ***
 	
     /// Initialises the program during a normal startup
diff --git a/ktouch/src/ktouchcolorscheme.cpp b/ktouch/src/ktouchcolorscheme.cpp
index 4104fe14..35def758 100644
--- a/ktouch/src/ktouchcolorscheme.cpp
+++ b/ktouch/src/ktouchcolorscheme.cpp
@@ -147,12 +147,12 @@ bool KTouchColorScheme::readList(TQWidget * window, const KURL& url) {
 	//kdDebug() << "[KTouchColorScheme::readList]  " << endl;
 	//kdDebug() << "  url = '" << url.url() << "'" << endl;
     TQString tmp_file;
-    bool result = KIO::NetAccess::download(url, tmp_file, window);
+    bool result = TDEIO::NetAccess::download(url, tmp_file, window);
     if (result) {
         // Ok, that was successful, try to parse the XML doc now
         TQFile infile(tmp_file);
         if ( !infile.open( IO_ReadOnly ) ) {
-    		KIO::NetAccess::removeTempFile(tmp_file);
+    		TDEIO::NetAccess::removeTempFile(tmp_file);
             return false;   // Bugger it... couldn't open it...
 		}
 		TQDomDocument doc;
@@ -170,7 +170,7 @@ bool KTouchColorScheme::readList(TQWidget * window, const KURL& url) {
 		}
 	
     }
-    KIO::NetAccess::removeTempFile(tmp_file);
+    TDEIO::NetAccess::removeTempFile(tmp_file);
 
     return result;
 }
@@ -211,7 +211,7 @@ bool KTouchColorScheme::writeList(TQWidget * window, const KURL& url) {
     outfile.close();
     // if we have a temporary file, we still need to upload it
     if (temp) {
-        KIO::NetAccess::upload(tmp_file, url, window);
+        TDEIO::NetAccess::upload(tmp_file, url, window);
         delete temp;
     }
     return true;
diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp
index 476a8502..8d9fd4b9 100644
--- a/ktouch/src/ktouchkeyboard.cpp
+++ b/ktouch/src/ktouchkeyboard.cpp
@@ -41,7 +41,7 @@ bool KTouchKeyboard::load(TQWidget * window, const KURL& url) {
     TQString target;
     bool result = false;
     //kdDebug() << "[KTouchKeyboard::load]  " << url << endl;
-    if (KIO::NetAccess::download(url, target, window)) {
+    if (TDEIO::NetAccess::download(url, target, window)) {
         // Ok, that was successful, store the lectureURL and read the file
         TQFile infile(target);
         if ( !infile.open( IO_ReadOnly ) )
@@ -49,7 +49,7 @@ bool KTouchKeyboard::load(TQWidget * window, const KURL& url) {
         TQTextStream in( &infile );
         result = read(in);
     };
-    KIO::NetAccess::removeTempFile(target);
+    TDEIO::NetAccess::removeTempFile(target);
     return result;
 }
 // ----------------------------------------------------------------------------
@@ -60,7 +60,7 @@ bool KTouchKeyboard::loadXML(TQWidget * window, const KURL& url) {
     // File is only downloaded if not local, otherwise it's just opened
     TQString target;
     bool result = false;
-    if (KIO::NetAccess::download(url, target, window)) {
+    if (TDEIO::NetAccess::download(url, target, window)) {
         // Ok, that was successful, store the lectureURL and read the file
         TQFile infile(target);
         if ( !infile.open( IO_ReadOnly ) )
@@ -69,7 +69,7 @@ bool KTouchKeyboard::loadXML(TQWidget * window, const KURL& url) {
 		doc.setContent( &infile );
         result = read(doc);
     }
-    KIO::NetAccess::removeTempFile(target);
+    TDEIO::NetAccess::removeTempFile(target);
     return result;
 }
 // ----------------------------------------------------------------------------
@@ -103,7 +103,7 @@ bool KTouchKeyboard::saveXML(TQWidget * window, const KURL& url) const {
     outfile.close();
     // if we have a temporary file, we still need to upload it
     if (temp) {
-        KIO::NetAccess::upload(tmpFile, url, window);
+        TDEIO::NetAccess::upload(tmpFile, url, window);
         delete temp;
     }
     return true;
@@ -347,10 +347,10 @@ void KTouchKeyboard::updateConnections() {
 
 bool KTouchKeyboard::loadKeyboard(TQWidget * window, const KURL& url, TQString* errorMsg) {
     TQString target;
-    if (KIO::NetAccess::download(url, target, window)) {
+    if (TDEIO::NetAccess::download(url, target, window)) {
         TQString msg;
         bool result = readKeyboard(target, msg);
-        KIO::NetAccess::removeTempFile(target);
+        TDEIO::NetAccess::removeTempFile(target);
         if (!result && errorMsg!=NULL)
             *errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg;
         return result;
@@ -401,7 +401,7 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) {
     }
 
     if (temp) {
-        KIO::NetAccess::upload(tmpFile, url, window);
+        TDEIO::NetAccess::upload(tmpFile, url, window);
         temp->unlink();
         delete temp;
     }
diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp
index 99cc63cc..c5c1e88f 100644
--- a/ktouch/src/ktouchkeyboardwidget.cpp
+++ b/ktouch/src/ktouchkeyboardwidget.cpp
@@ -46,10 +46,10 @@ KTouchKeyboardWidget::KTouchKeyboardWidget(TQWidget *parent)
 
 bool KTouchKeyboardWidget::loadKeyboard(TQWidget * window, const KURL& url, TQString* errorMsg) {
     TQString target;
-    if (KIO::NetAccess::download(url, target, window)) {
+    if (TDEIO::NetAccess::download(url, target, window)) {
         TQString msg;
         bool result = readKeyboard(target, msg);
-        KIO::NetAccess::removeTempFile(target);
+        TDEIO::NetAccess::removeTempFile(target);
         if (!result && errorMsg!=NULL)
             *errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg;
         return result;
@@ -100,7 +100,7 @@ void KTouchKeyboardWidget::saveKeyboard(TQWidget * window, const KURL& url) {
     }
 
     if (temp) {
-        KIO::NetAccess::upload(tmpFile, url, window);
+        TDEIO::NetAccess::upload(tmpFile, url, window);
         temp->unlink();
         delete temp;
     }
diff --git a/ktouch/src/ktouchlecture.cpp b/ktouch/src/ktouchlecture.cpp
index 610c583a..40a86007 100644
--- a/ktouch/src/ktouchlecture.cpp
+++ b/ktouch/src/ktouchlecture.cpp
@@ -27,17 +27,17 @@ bool KTouchLecture::load(TQWidget * window, const KURL& url) {
     // File is only downloaded if not local, otherwise it's just opened
     TQString target;
     bool result = false;
-    if (KIO::NetAccess::download(url, target, window)) {
+    if (TDEIO::NetAccess::download(url, target, window)) {
         // Ok, that was successful, store the lectureURL and read the file
         TQFile infile(target);
         if ( !infile.open( IO_ReadOnly ) ) {
-    		KIO::NetAccess::removeTempFile(target);
+    		TDEIO::NetAccess::removeTempFile(target);
             return false;   // Bugger it... couldn't open it...
 		}
         TQTextStream in( &infile );
         result = readLecture(in);
     };
-    KIO::NetAccess::removeTempFile(target);
+    TDEIO::NetAccess::removeTempFile(target);
     return result;
 }
 // ----------------------------------------------------------------------------
@@ -47,18 +47,18 @@ bool KTouchLecture::loadXML(TQWidget * window, const KURL& url) {
     // File is only downloaded if not local, otherwise it's just opened
     TQString target;
     bool result = false;
-    if (KIO::NetAccess::download(url, target, window)) {
+    if (TDEIO::NetAccess::download(url, target, window)) {
         // Ok, that was successful, store the lectureURL and read the file
         TQFile infile(target);
         if ( !infile.open( IO_ReadOnly ) ) {
-		    KIO::NetAccess::removeTempFile(target);
+		    TDEIO::NetAccess::removeTempFile(target);
             return false;   // Bugger it... couldn't open it...
 		}
 		TQDomDocument doc;
 		doc.setContent( &infile );
         result = readLecture(doc);
     }
-    KIO::NetAccess::removeTempFile(target);
+    TDEIO::NetAccess::removeTempFile(target);
     return result;
 }
 // ----------------------------------------------------------------------------
@@ -92,7 +92,7 @@ bool KTouchLecture::saveXML(TQWidget * window, const KURL& url) const {
     outfile.close();
     // if we have a temporary file, we still need to upload it
     if (temp) {
-        KIO::NetAccess::upload(tmpFile, url, window);
+        TDEIO::NetAccess::upload(tmpFile, url, window);
         delete temp;
     }
     return true;
@@ -270,7 +270,7 @@ bool KTouchLecture::save(TQWidget * window, const KURL& url) const {
     outfile.close();
     // if we have a temporary file, we still need to upload it
     if (temp) {
-        KIO::NetAccess::upload(tmpFile, url, window);
+        TDEIO::NetAccess::upload(tmpFile, url, window);
         delete temp;
     }
     return true;
diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp
index 80c92bef..88171722 100644
--- a/ktouch/src/ktouchstatisticsdata.cpp
+++ b/ktouch/src/ktouchstatisticsdata.cpp
@@ -452,11 +452,11 @@ bool KTouchStatisticsData::read(TQWidget * window, const KURL& url) {
     // File is only downloaded if not local, otherwise it's just opened
     TQString target;
     bool result = false;
-    if (KIO::NetAccess::download(url, target, window)) {
+    if (TDEIO::NetAccess::download(url, target, window)) {
         // Ok, that was successful, store the lectureURL and read the file
         TQFile infile(target);
         if ( !infile.open( IO_ReadOnly ) ) {
-    		KIO::NetAccess::removeTempFile(target);
+    		TDEIO::NetAccess::removeTempFile(target);
             return false;   // Bugger it... couldn't open it...
 		}
 		TQDomDocument doc;
@@ -471,7 +471,7 @@ bool KTouchStatisticsData::read(TQWidget * window, const KURL& url) {
 #endif // COMPRESSED_XML_STATISTICS
 		result = readStats(doc);
 	}
-    KIO::NetAccess::removeTempFile(target);
+    TDEIO::NetAccess::removeTempFile(target);
     return result;
 }
 // ----------------------------------------------------------------------------
@@ -513,7 +513,7 @@ bool KTouchStatisticsData::write(TQWidget * window, const KURL& url) const {
 
     // if we have a temporary file, we still need to upload it
     if (temp) {
-        KIO::NetAccess::upload(tmpFile, url, window);
+        TDEIO::NetAccess::upload(tmpFile, url, window);
         delete temp;
     }
     return true;
diff --git a/kturtle/TODO b/kturtle/TODO
index 8f280acd..0cab39f0 100644
--- a/kturtle/TODO
+++ b/kturtle/TODO
@@ -221,7 +221,7 @@ cies: That is a good plan!  I have tux allready in my sprites dir (I'm a fan too
 - About the language: when user is set to fr (not fr_FR but fr like me being in Canada), the parsing does not   work because Settings::LogoLanguage() is set to fr and NOT to fr_FR.
   Syntax highlighting does not work for fr        DONE annma
  
-- Default does not work in Language ComboBox -> I am not sure your use of KConfig XT is optimum here, Cies
+- Default does not work in Language ComboBox -> I am not sure your use of TDEConfig XT is optimum here, Cies
   and other bug: output: kturtle: desktopLanguage: fr:en_US
   kturtle: defaultLanguage: en_US
   Why is not default Language fr_FR?              DONE annma 02/04/2004
diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp
index 02ecddb8..06f72c53 100644
--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@@ -103,7 +103,7 @@ MainWindow::MainWindow(KTextEditor::Document *document) : editor(0)
 	// init with more usefull size, stolen from kwite (they stole it from konq)
 	if ( !initialGeometrySet() && !kapp->config()->hasGroup("MainWindow Settings") ) resize(640, 480);
 
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	readConfig(config);
 }
 
@@ -490,7 +490,7 @@ bool MainWindow::queryClose()
 			}
 		}
 	}
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("General Options");
 	m_recentFiles->saveEntries(config, "Recent Files");
 	config->sync();
@@ -865,10 +865,10 @@ void MainWindow::slotRestartFullScreen()
 void MainWindow::slotSettings()
 {
 	// Check if there is already a dialog, if so bring it to the foreground.
-	if ( KConfigDialog::showDialog("settings") ) return;
+	if ( TDEConfigDialog::showDialog("settings") ) return;
 
 	// Create a new dialog with the same name as the above checking code.
-	KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self() );
+	TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self() );
 	// connect the help
 	connect( dialog, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( slotSettingsHelp() ) );
 	
@@ -965,7 +965,7 @@ void MainWindow::slotUpdateSettings()
 	slotSetHighlightstyle( selectedLogoLanguage );
 	// set the statusbar to display the language as just updated
 	// TODO maybe this language name can be more pretty by not using ".left(2)", ie "American English" would than be possible... [if this is possible this should be fixed at more places.]
-	KConfig entry(locate("locale", "all_languages"));
+	TDEConfig entry(locate("locale", "all_languages"));
 	entry.setGroup(Settings::logoLanguage().left(2));
 	slotStatusBar(i18n("Command language: %1").arg( entry.readEntry("Name") ), IDS_LANG);
 	
@@ -973,11 +973,11 @@ void MainWindow::slotUpdateSettings()
 	translate = new Translate();
 }
 
-void MainWindow::readConfig(KConfig *config)
+void MainWindow::readConfig(TDEConfig *config)
 {
 	config->setGroup("General Options");
 	m_recentFiles->loadEntries(config, "Recent Files");
-	KConfig entry(locate("locale", "all_languages"));
+	TDEConfig entry(locate("locale", "all_languages"));
 	entry.setGroup(Settings::logoLanguage().left(2));
 	slotStatusBar(i18n("Command language: %1").arg( entry.readEntry("Name") ), IDS_LANG);
 }
diff --git a/kturtle/src/kturtle.h b/kturtle/src/kturtle.h
index 6c3a3099..1cd77f55 100644
--- a/kturtle/src/kturtle.h
+++ b/kturtle/src/kturtle.h
@@ -128,7 +128,7 @@ class MainWindow : public KParts::MainWindow
 		bool queryClose();
 		
 		void finishExecution();
-		void readConfig(KConfig *config);
+		void readConfig(TDEConfig *config);
 		
 		void updateFullScreen();
 		virtual bool event(TQEvent* e);
diff --git a/kturtle/src/kturtle.kcfg b/kturtle/src/kturtle.kcfg
index f3fec672..192d6986 100644
--- a/kturtle/src/kturtle.kcfg
+++ b/kturtle/src/kturtle.kcfg
@@ -52,7 +52,7 @@
           // The KconfigXT framework makes shure the value that is saved in the kturtlerc file will be used in stead of the defaultLanguage that we find here.
 
           // Get the desktops language
-          KConfigBase *globalConf = TDEGlobal::config();
+          TDEConfigBase *globalConf = TDEGlobal::config();
           globalConf->setGroup("Locale");
           TQString desktopLanguage = globalConf->readEntry("Language");
           kdDebug(0) &lt;&lt; "desktopLanguage: "&lt;&lt; desktopLanguage &lt;&lt;endl;
diff --git a/kverbos/kverbos/kverbos.cpp b/kverbos/kverbos/kverbos.cpp
index 1cccb42d..1691a529 100644
--- a/kverbos/kverbos/kverbos.cpp
+++ b/kverbos/kverbos/kverbos.cpp
@@ -283,7 +283,7 @@ void KVerbosApp::readOptions()
   automaticKFeeder = config->readBoolEntry("kfeederAutomatic", true);
 }
 
-void KVerbosApp::saveProperties(KConfig *_cfg)
+void KVerbosApp::saveProperties(TDEConfig *_cfg)
 {
   if(doc->URL().fileName()!=i18n("Untitled") && !doc->isModified())
   {
@@ -303,7 +303,7 @@ void KVerbosApp::saveProperties(KConfig *_cfg)
 }
 
 
-void KVerbosApp::readProperties(KConfig* _cfg)
+void KVerbosApp::readProperties(TDEConfig* _cfg)
 {
   TQString filename = _cfg->readPathEntry("filename");
   KURL url(filename);
diff --git a/kverbos/kverbos/kverbos.h b/kverbos/kverbos/kverbos.h
index 9b92f056..2325d482 100644
--- a/kverbos/kverbos/kverbos.h
+++ b/kverbos/kverbos/kverbos.h
@@ -49,7 +49,7 @@ class KFeederControl;
   * full session management as well as using KActions.
   * @see KMainWindow
   * @see TDEApplication
-  * @see KConfig
+  * @see TDEConfig
   *
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
   * @version KDevelop version 1.2 code generation
@@ -116,12 +116,12 @@ class KVerbosApp : public KMainWindow
      * opened file by a temporary filename provided by TDEApplication.
      * @see KTMainWindow#saveProperties
      */
-    virtual void saveProperties(KConfig *_cfg);
+    virtual void saveProperties(TDEConfig *_cfg);
     /** reads the session config file and restores the application's state including the last opened files and documents by reading the
      * temporary files saved by saveProperties()
      * @see KTMainWindow#readProperties
      */
-    virtual void readProperties(KConfig *_cfg);
+    virtual void readProperties(TDEConfig *_cfg);
 
   signals:
     /** Dieses Signal zeigt dem Dokument an, dass die Statuszeile mit der richtigen
@@ -194,7 +194,7 @@ class KVerbosApp : public KMainWindow
 
   private:
     /** the configuration object of the application */
-    KConfig *config;
+    TDEConfig *config;
     /** in this array are the times stored that should be learned
      */
     bool timeOptions[MAX_TIEMPOS][MAX_SUBTYPES];
diff --git a/kverbos/kverbos/kverbos.kcfg b/kverbos/kverbos/kverbos.kcfg
index 94b2cffc..3c28c9d8 100644
--- a/kverbos/kverbos/kverbos.kcfg
+++ b/kverbos/kverbos/kverbos.kcfg
@@ -8,7 +8,7 @@
     <entry name="UserLanguage" type="String">
       <label>The language selected by the user</label>
             <code>
-          	KConfigBase *globalConf = TDEGlobal::config();
+          	TDEConfigBase *globalConf = TDEGlobal::config();
     		globalConf->setGroup("Locale");
     		TQString m_language = globalConf->readEntry("Language", "en");
     		//keep only the first 2 characters
diff --git a/kverbos/kverbos/kverbosdoc.cpp b/kverbos/kverbos/kverbosdoc.cpp
index 3670b7db..2d820741 100644
--- a/kverbos/kverbos/kverbosdoc.cpp
+++ b/kverbos/kverbos/kverbosdoc.cpp
@@ -160,7 +160,7 @@ bool KVerbosDoc::openDocument(const KURL& url, const char *format /*=0*/)
 {
 	bool b = false;
 	TQString tmpfile;
-	KIO::NetAccess::download( url, tmpfile );
+	TDEIO::NetAccess::download( url, tmpfile );
 
 	TQFile file(url.path());
 	if ( file.open(IO_ReadOnly) ) {    // file opened successfully
@@ -205,7 +205,7 @@ bool KVerbosDoc::openDocument(const KURL& url, const char *format /*=0*/)
     emit changeView();
   };
 
-  KIO::NetAccess::removeTempFile( tmpfile );
+  TDEIO::NetAccess::removeTempFile( tmpfile );
 
   modified=false;
   emit anzahlVerbenGeaendert(getAnzahl());
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
index 73db49ce..eff5b01c 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
@@ -55,9 +55,9 @@ static const char unapplied[] = I18N_NOOP(
     "Do you wish to continue?");
 
 KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *parent,
-  const char *name,  KConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/,
+  const char *name,  TDEConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/,
   bool /*modal*/)
-  : KConfigDialog(parent, name, config, dialogType, Default|Ok|Apply|Cancel|Help|User1, Ok, true), m_langSet(ls)
+  : TDEConfigDialog(parent, name, config, dialogType, Default|Ok|Apply|Cancel|Help|User1, Ok, true), m_langSet(ls)
 {
   m_config = config;
   m_queryManager = m;
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
index d86c0199..6d096c41 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
@@ -38,7 +38,7 @@ class kvoctrainDoc;
 class QueryManager;
 class KComboBox;
 
-class KVocTrainPrefs : public KConfigDialog
+class KVocTrainPrefs : public TDEConfigDialog
 {
   Q_OBJECT
   
@@ -48,7 +48,7 @@ public:
    * Creates a configuration dialog.
    */
   KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *parent=0,
-    const char *name=0, KConfigSkeleton *config=0, DialogType dialogType=IconList,
+    const char *name=0, TDEConfigSkeleton *config=0, DialogType dialogType=IconList,
     int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
 
   /**
@@ -95,7 +95,7 @@ private:
   ThresholdOptions * m_thresholdOptions;
   BlockOptions * m_blockOptions;
 
-  KConfigSkeleton * m_config;
+  TDEConfigSkeleton * m_config;
   LangSet & m_langSet;
   kvoctrainDoc * m_doc;
   KComboBox m_lessons;
diff --git a/kvoctrain/kvoctrain/kva_config.cpp b/kvoctrain/kvoctrain/kva_config.cpp
index ba88b13e..3df5d285 100644
--- a/kvoctrain/kvoctrain/kva_config.cpp
+++ b/kvoctrain/kvoctrain/kva_config.cpp
@@ -34,7 +34,7 @@
 
 void kvoctrainApp::saveOptions()
 {
-  KConfig *config = TDEApplication::kApplication()->config();
+  TDEConfig *config = TDEApplication::kApplication()->config();
   fileOpenRecent->saveEntries(config, "Recent Files");
 
   if (view)
@@ -75,7 +75,7 @@ void kvoctrainApp::saveLanguages()
 
 void kvoctrainApp::readOptions()
 {
-  KConfig *config = TDEApplication::kApplication()->config();
+  TDEConfig *config = TDEApplication::kApplication()->config();
   fileOpenRecent->loadEntries(config, "Recent Files");
   /*
   int ls = Prefs::numPreSetting();
@@ -115,7 +115,7 @@ void kvoctrainApp::readLanguages()
       languageSettings.keyboardLayout());
   }
 }
-void kvoctrainApp::saveProperties(KConfig *config )
+void kvoctrainApp::saveProperties(TDEConfig *config )
 {
   saveOptions();
   if (doc) {
@@ -133,7 +133,7 @@ void kvoctrainApp::saveProperties(KConfig *config )
 }
 
 
-void kvoctrainApp::readProperties(KConfig *config)
+void kvoctrainApp::readProperties(TDEConfig *config)
 {
   querymode = config->readBoolEntry(CFG_QUERYMODE, 0);
 
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index c67347c2..f17411c1 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -103,12 +103,12 @@ public:
   * opened file by a temporary filename provided by TDEApplication.
   * @see KMainWindow#saveProperties
   */
-  virtual void saveProperties(KConfig* );
+  virtual void saveProperties(TDEConfig* );
   /** reads the session config file and restores the application's state including the last opened files and documents by reading the
   * temporary files saved by saveProperties()
   * @see KMainWindow#readProperties
   */
-  virtual void readProperties(KConfig* );
+  virtual void readProperties(TDEConfig* );
 
   /** Whether the user has selected a range of items. **/
   bool hasSelection();
diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.h b/kvoctrain/kvoctrain/kvt-core/QueryManager.h
index 3277bd1b..52019689 100644
--- a/kvoctrain/kvoctrain/kvt-core/QueryManager.h
+++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.h
@@ -33,7 +33,7 @@ using namespace std;
 #include "prefs.h"
 
 class kvoctrainDoc;
-class KConfig;
+class TDEConfig;
 class kvoctrainExpr;
 class Prefs;
 
@@ -124,8 +124,8 @@ class QueryManager
 
   QueryManager ();
 
-  //void loadConfig (KConfig *);
-  //void saveConfig (KConfig *);
+  //void loadConfig (TDEConfig *);
+  //void saveConfig (TDEConfig *);
 
   static vector<TypeRelation> getRelation (bool only_maintypes);
   static void setTypeNames (vector<TQString> names);
diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.h b/kvoctrain/kvoctrain/kvt-core/UsageManager.h
index 647de685..23dec781 100644
--- a/kvoctrain/kvoctrain/kvt-core/UsageManager.h
+++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.h
@@ -33,7 +33,7 @@ using namespace std;
 #include "kvoctraindoc.h"
 
 class kvoctrainDoc;
-class KConfig;
+class TDEConfig;
 class kvoctrainExpr;
 
 // internal usage labels, never change !
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index 24beec1f..e1a1efcc 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -100,7 +100,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
   connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
 
   TQString tmpfile;
-  if (KIO::NetAccess::download( url, tmpfile, 0 ))
+  if (TDEIO::NetAccess::download( url, tmpfile, 0 ))
   {
     TQFile f(tmpfile);
     if (!f.open(IO_ReadOnly))
@@ -177,7 +177,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
       }
     }
     f.close();
-    KIO::NetAccess::removeTempFile( tmpfile );
+    TDEIO::NetAccess::removeTempFile( tmpfile );
   }
 }
 
diff --git a/kvoctrain/kvoctrain/main.cpp b/kvoctrain/kvoctrain/main.cpp
index 612c0bbd..bd692037 100644
--- a/kvoctrain/kvoctrain/main.cpp
+++ b/kvoctrain/kvoctrain/main.cpp
@@ -87,7 +87,7 @@ static const char version[]     = KVOCTRAIN_VERSION_STRING;
                       I18N_NOOP("Patch to implement Leitner learning method"));
 
    aboutData.addCredit("Anne-Marie Mahfouf",
-                       I18N_NOOP("Port to KConfig XT"));
+                       I18N_NOOP("Port to TDEConfig XT"));
 
   aboutData.addCredit(I18N_NOOP("KDE Team"),
                       I18N_NOOP("Many small enhancements"));
diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp
index 10dde982..d84dc96e 100644
--- a/kwordquiz/src/kwordquiz.cpp
+++ b/kwordquiz/src/kwordquiz.cpp
@@ -407,7 +407,7 @@ void KWordQuizApp::readOptions()
   fileOpenRecent->loadEntries(kapp->config(), "Recent Files");
 }
 
-void KWordQuizApp::saveProperties(KConfig *_cfg)
+void KWordQuizApp::saveProperties(TDEConfig *_cfg)
 {
   if(doc->URL().fileName()!=i18n("Untitled") && !doc->isModified())
   {
@@ -427,7 +427,7 @@ void KWordQuizApp::saveProperties(KConfig *_cfg)
 }
 
 
-void KWordQuizApp::readProperties(KConfig* _cfg)
+void KWordQuizApp::readProperties(TDEConfig* _cfg)
 {
   TQString filename = _cfg->readEntry("filename", "");
   KURL url(filename);
@@ -1053,7 +1053,7 @@ void KWordQuizApp::slotConfigure()
   if ( KWordQuizPrefs::showDialog( "settings" ) )
     return;
 
-  //KConfigDialog didn't find an instance of this dialog, so lets create it :
+  //TDEConfigDialog didn't find an instance of this dialog, so lets create it :
   KWordQuizPrefs* dialog = new KWordQuizPrefs( this, "settings",  Prefs::self() );
   connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotApplyPreferences()));
   dialog->show();
diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h
index 36cc270b..c04cd92f 100644
--- a/kwordquiz/src/kwordquiz.h
+++ b/kwordquiz/src/kwordquiz.h
@@ -52,7 +52,7 @@ class KWQNewStuff;
   * full session management as well as using KActions.
   * @see KMainWindow
   * @see TDEApplication
-  * @see KConfig
+  * @see TDEConfig
   *
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
   * @version KDevelop version 1.2 code generation
@@ -117,12 +117,12 @@ class KWordQuizApp : public KMainWindow
      * opened file by a temporary filename provided by TDEApplication.
      * @see KTMainWindow#saveProperties
      */
-    virtual void saveProperties(KConfig *_cfg);
+    virtual void saveProperties(TDEConfig *_cfg);
     /** reads the session config file and restores the application's state including the last opened files and documents by reading the
      * temporary files saved by saveProperties()
      * @see KTMainWindow#readProperties
      */
-    virtual void readProperties(KConfig *_cfg);
+    virtual void readProperties(TDEConfig *_cfg);
 
   signals:
     void settingsChanged();
diff --git a/kwordquiz/src/kwordquizdoc.cpp b/kwordquiz/src/kwordquizdoc.cpp
index 333f7713..9cda99c8 100644
--- a/kwordquiz/src/kwordquizdoc.cpp
+++ b/kwordquiz/src/kwordquizdoc.cpp
@@ -157,7 +157,7 @@ bool KWordQuizDoc::newDocument()
 bool KWordQuizDoc::openDocument(const KURL& url, bool append, int index)
 {
   TQString tmpfile;
-  if (KIO::NetAccess::download( url, tmpfile, 0 ))
+  if (TDEIO::NetAccess::download( url, tmpfile, 0 ))
   {
     TQFile file(tmpfile);
     if (!file.open(IO_ReadOnly))
@@ -302,7 +302,7 @@ bool KWordQuizDoc::openDocument(const KURL& url, bool append, int index)
     }
 
     file.close();
-    KIO::NetAccess::removeTempFile( tmpfile );
+    TDEIO::NetAccess::removeTempFile( tmpfile );
 
     //Apply word wrap to cell with text
     TQTableItem* itm;
diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp
index 61380e68..7487ad0c 100644
--- a/kwordquiz/src/kwordquizprefs.cpp
+++ b/kwordquiz/src/kwordquizprefs.cpp
@@ -41,8 +41,8 @@
 #include "kwordquiz.h"
 #include "dlgspecchar.h"
 
-KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name,  KConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/, bool /*modal*/)
-  : KConfigDialog(parent, name, config, dialogType, Default|Ok|Apply|Cancel|Help, Ok, false)
+KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name,  TDEConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/, bool /*modal*/)
+  : TDEConfigDialog(parent, name, config, dialogType, Default|Ok|Apply|Cancel|Help, Ok, false)
 {
   m_config = config;
 
@@ -66,7 +66,7 @@ KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name,  KConfigSkele
   KWordQuizApp *win=(KWordQuizApp *) parent;
   int i=0;
 
-  KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
+  TDEConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
   TQString ds = item->property().toString();
 
   for ( TQListViewItemIterator it = m_prefCharacter->lstCharacters; it.current(); ++it)
@@ -88,7 +88,7 @@ void KWordQuizPrefs::slotCharListSelectionChanged()
 
 void KWordQuizPrefs::slotSelectSpecChar( )
 {
-  KConfigSkeletonItem * item = m_config->findItem("EditorFont");
+  TDEConfigSkeletonItem * item = m_config->findItem("EditorFont");
   TQString f = item->property().toFont().family();
   TQString s = m_prefCharacter->lstCharacters->currentItem()->text(2);
   TQChar c = s[0];
@@ -130,11 +130,11 @@ bool KWordQuizPrefs::hasChanged()
     s.append(it.current()->text(2));
   }
 
-  KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
+  TDEConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
   TQString ds = item->property().toString();
 
   if (ds == s.stripWhiteSpace())
-    result = KConfigDialog::hasChanged();
+    result = TDEConfigDialog::hasChanged();
   else
     result = true;
 
@@ -152,11 +152,11 @@ bool KWordQuizPrefs::isDefault()
     s.append(it.current()->text(2));
   }
 
-  KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
+  TDEConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
   TQString ds = item->property().toString();
 
   if (ds == s.stripWhiteSpace())
-    result = KConfigDialog::isDefault();
+    result = TDEConfigDialog::isDefault();
   else
     result = false;
 
@@ -172,7 +172,7 @@ void KWordQuizPrefs::updateSettings( )
     s.append(it.current()->text(2));
   }
 
-  KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
+  TDEConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
   item->setProperty(TQVariant(s));
 
   emit settingsChanged();
@@ -188,7 +188,7 @@ void KWordQuizPrefs::updateWidgetsDefault( )
     s.append(it.current()->text(2));
   }
 
-  KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
+  TDEConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
   TQString ds = item->property().toString();
 
   int i=0;
diff --git a/kwordquiz/src/kwordquizprefs.h b/kwordquiz/src/kwordquizprefs.h
index 566604e7..41930d09 100644
--- a/kwordquiz/src/kwordquizprefs.h
+++ b/kwordquiz/src/kwordquizprefs.h
@@ -30,12 +30,12 @@ class PrefCharacter;
 class PrefCardAppearance;
 class DlgSpecChar;
 
-class KWordQuizPrefs : public KConfigDialog
+class KWordQuizPrefs : public TDEConfigDialog
 {
   Q_OBJECT
   
 public:
-  KWordQuizPrefs(TQWidget *parent=0, const char *name=0, KConfigSkeleton *config=0, DialogType dialogType=IconList,
+  KWordQuizPrefs(TQWidget *parent=0, const char *name=0, TDEConfigSkeleton *config=0, DialogType dialogType=IconList,
     int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
 
 protected slots:
@@ -58,7 +58,7 @@ private:
   PrefCharacter* m_prefCharacter;
   DlgSpecChar* m_dlgSpecChar;
   PrefCardAppearance* m_prefCardAppearance;
-  KConfigSkeleton * m_config;
+  TDEConfigSkeleton * m_config;
 };
 
 #endif