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

118 files changed, 377 insertions, 377 deletions

diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp
index 7ce379a..fc4085c 100644
--- a/atlantikdesigner/designer/designer.cpp
+++ b/atlantikdesigner/designer/designer.cpp
@@ -74,7 +74,7 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name)
 
 	createGUI("atlantikdesignerui.rc");
 
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("General");
 	TQColor defaultColor = colorGroup().background();
 	defaultBg = config->readColorEntry("alternateBackground", &defaultColor);
diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
index 7a80f89..cb9e461 100644
--- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
+++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp
@@ -222,7 +222,7 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
-    return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
+    return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
   } else {
     TQString filename = url.path();
     TQFile file( filename );
diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
index 3d07955..0d0ffbd 100644
--- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
+++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp
@@ -48,7 +48,7 @@ GeoXXPort::GeoXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name
 
 bool GeoXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& )
 {
-  KConfig config( "kworldclockrc" );
+  TDEConfig config( "kworldclockrc" );
 
   // At first we read all exiting flags and compare it with ours to
   // avoid duplicated flags
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
index 4988996..05fbb39 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
@@ -148,7 +148,7 @@ class KatePluginSymbolViewer : public Kate::Plugin, Kate::PluginViewInterface, K
 
   private:
     TQPtrList<KatePluginSymbolViewerView> m_views;
-    KConfig pConfig;
+    TDEConfig pConfig;
 };
 
 /* XPM */
diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp
index 1bfecb6..ccc8afa 100644
--- a/kate/filelistloader/katefll_initplugin.cpp
+++ b/kate/filelistloader/katefll_initplugin.cpp
@@ -50,7 +50,7 @@ int InitPluginKateFileListLoader::initKate()
 {
 	TQString tmpFile;
 	KURL tmpURL;
-	if( KIO::NetAccess::download( configScript(), tmpFile ) )
+	if( TDEIO::NetAccess::download( configScript(), tmpFile ) )
 	{
 		TQFile file(tmpFile);
 		file.open(IO_ReadOnly);
@@ -72,7 +72,7 @@ int InitPluginKateFileListLoader::initKate()
 
 		file.close();
 
-		KIO::NetAccess::removeTempFile( tmpFile );
+		TDEIO::NetAccess::removeTempFile( tmpFile );
 
 	} else application()->documentManager()->openURL(KURL());
 
diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp
index e0a20f1..deec021 100644
--- a/kate/filelistloader/katefll_plugin.cpp
+++ b/kate/filelistloader/katefll_plugin.cpp
@@ -44,7 +44,7 @@ class PluginView : public KXMLGUIClient
 
 PluginKateFileListLoader::PluginKateFileListLoader (TQObject * parent, const char *name,  const TQStringList)
   : Plugin((Kate::Application*)parent,name), PluginViewInterface(),
-    m_config( new KConfig("katefilelistpluginrc") )
+    m_config( new TDEConfig("katefilelistpluginrc") )
 {
   m_config->setGroup("General");
   updateInit();
@@ -141,7 +141,7 @@ void PluginKateFileListLoader::slotOpenList()
 
 void PluginKateFileListLoader::slotOpenList(const KURL& url)
 {
-  if ( url.isValid() && KIO::NetAccess::exists(url, false, 0) )
+  if ( url.isValid() && TDEIO::NetAccess::exists(url, false, 0) )
   {
     addURLToList( url );
     if ( KMessageBox::questionYesNo (0,
@@ -152,7 +152,7 @@ void PluginKateFileListLoader::slotOpenList(const KURL& url)
       application()->documentManager()->closeAllDocuments();
 
     TQString tmpFile;
-    if( KIO::NetAccess::download( url, tmpFile, 0 ) )
+    if( TDEIO::NetAccess::download( url, tmpFile, 0 ) )
     {
       TQFile file(tmpFile);
       file.open(IO_ReadOnly);
@@ -171,7 +171,7 @@ void PluginKateFileListLoader::slotOpenList(const KURL& url)
       if ( ! tmp.isEmpty() )
          application()->activeMainWindow()->viewManager()->openURL(tmp);
 
-      KIO::NetAccess::removeTempFile( tmpFile );
+      TDEIO::NetAccess::removeTempFile( tmpFile );
     } else application()->documentManager()->openURL(KURL());
   }
   else
@@ -223,7 +223,7 @@ void PluginKateFileListLoader::save()
     *file.textStream()<<application()->documentManager()->document(i)->url().url()<<endl;
   }
   file.close();
-  KIO::NetAccess::upload(file.name(), m_saveURL, 0);
+  TDEIO::NetAccess::upload(file.name(), m_saveURL, 0);
   file.unlink();
   addURLToList( m_saveURL );
 }
diff --git a/kate/filelistloader/katefll_plugin.h b/kate/filelistloader/katefll_plugin.h
index 699b45f..dc5a85b 100644
--- a/kate/filelistloader/katefll_plugin.h
+++ b/kate/filelistloader/katefll_plugin.h
@@ -59,7 +59,7 @@ class PluginKateFileListLoader : public Kate::Plugin, Kate::PluginViewInterface
   private:
     TQPtrList<class PluginView> m_views;
     KRecentFilesAction *m_recentFiles;
-    KConfig* m_config;
+    TDEConfig* m_config;
     KURL m_oldInitURL;
     KURL m_saveURL;
     bool m_saveAs;
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index ec68f6e..e1c35be 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -180,7 +180,7 @@ void KateFileTemplates::updateTemplateDirs(const TQString &d)
   TQRegExp re( "\\b(\\w+)\\s*=\\s*(.+)(?:\\s+\\w+=|$)" );
   re.setMinimal( true );
 
-  KConfig *config = kapp->config();
+  TDEConfig *config = kapp->config();
   TQStringList hidden;
   config->readListEntry( "Hidden", hidden, ';' );
 
@@ -371,7 +371,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
   TQString tmpfile;
   TQString filename = url.fileName();
   kdDebug()<<"file: "<<filename<<endl;
-  if ( KIO::NetAccess::download( url, tmpfile, 0L ) )
+  if ( TDEIO::NetAccess::download( url, tmpfile, 0L ) )
   {
     bool isTemplate ( filename.endsWith( ".katetemplate" ) );
     TQString docname;
@@ -383,7 +383,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
       KMessageBox::sorry( application()->activeMainWindow()->viewManager()->activeView(),
                           i18n("<qt>Error opening the file<br><strong>%1</strong><br>for reading. The document will not be created.</qt>").arg(filename),
                           i18n("Template Plugin"), 0 );
-      KIO::NetAccess::removeTempFile( tmpfile );
+      TDEIO::NetAccess::removeTempFile( tmpfile );
       return;
     }
 
@@ -451,7 +451,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
       numlines++;
     }
     file.close();
-    KIO::NetAccess::removeTempFile( tmpfile );
+    TDEIO::NetAccess::removeTempFile( tmpfile );
 
     uint line, col;
     line = col = 0;
@@ -969,7 +969,7 @@ void KateTemplateWizard::accept()
       u = KURL( kft->templates().at( selectedTemplateIdx )->filename );
 
     TQString tmpfile, tmp;
-    if ( KIO::NetAccess::download( u, tmpfile, 0L ) )
+    if ( TDEIO::NetAccess::download( u, tmpfile, 0L ) )
     {
       TQFile file(tmpfile);
       if ( ! file.open( IO_ReadOnly ) )
@@ -979,7 +979,7 @@ void KateTemplateWizard::accept()
             "The document will not be created</qt>").arg(u.prettyURL()),
             i18n("Template Plugin"), 0 );
 
-        KIO::NetAccess::removeTempFile( tmpfile );
+        TDEIO::NetAccess::removeTempFile( tmpfile );
         return;
       }
 
@@ -998,7 +998,7 @@ void KateTemplateWizard::accept()
       }
 
       file.close();
-      KIO::NetAccess::removeTempFile( tmpfile );
+      TDEIO::NetAccess::removeTempFile( tmpfile );
     }
 
     if ( toid == 2 ) // file
@@ -1046,8 +1046,8 @@ void KateTemplateWizard::accept()
       stream << str;
       tmp.close();
 
-      succes = KIO::NetAccess::upload( fn, templateUrl, 0 );
-      KIO::NetAccess::removeTempFile( fn );
+      succes = TDEIO::NetAccess::upload( fn, templateUrl, 0 );
+      TDEIO::NetAccess::removeTempFile( fn );
     }
   }
 
@@ -1188,7 +1188,7 @@ void KateTemplateManager::slotRemoveTemplate()
     // Find all instances of filename, and try to delete them.
     // If it fails (there was a global, unwritable instance), add to a
     // list of removed templates
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     TQString fname = item->templateinfo->filename.section( '/', -1 );
     TQStringList templates = TDEGlobal::dirs()->findAllResources(
         "data", fname.prepend( "kate/plugins/katefiletemplates/templates/" ),
diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h
index a9d53f2..bb7f912 100644
--- a/kate/filetemplates/plugin/filetemplates.h
+++ b/kate/filetemplates/plugin/filetemplates.h
@@ -147,7 +147,7 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface
     TQPtrList<class TemplateInfo> m_templates;
     class KDirWatch *m_dw;
     class KUser *m_user;
-    class KConfig *m_emailstuff;
+    class TDEConfig *m_emailstuff;
     class KActionMenu *m_menu;
 };
 
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index ec5dafc..0d473a4 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -62,7 +62,7 @@ PluginKateInsertCommand::PluginKateInsertCommand( TQObject* parent, const char*
       kv              ( 0 ),
       sh              ( 0 )
 {
-  config = new KConfig("kateinsertcommandpluginrc");
+  config = new TDEConfig("kateinsertcommandpluginrc");
   cmdhist = config->readListEntry("Command History");
   wdlg = 0;
   workingdir = TQDir::currentDirPath();
diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h
index 19c6eb3..eb8b10f 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.h
+++ b/kate/insertcommand/plugin_kateinsertcommand.h
@@ -41,7 +41,7 @@ namespace Kate {
   class PluginConfigPage;
   class PluginView;
 }
-class KConfig;
+class TDEConfig;
 class TDEProcess;
 class KShellProcess;
 class TQButtonGroup;
@@ -87,7 +87,7 @@ class PluginKateInsertCommand : public Kate::Plugin,
     TQStringList cmdhist;
     bool bInsStdErr;
     int dialogSettings;
-    KConfig *config;
+    TDEConfig *config;
 
   public slots:
     void slotInsertCommand();
diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp
index 1ea92a5..f7f69ce 100644
--- a/kate/make/plugin_katemake.cpp
+++ b/kate/make/plugin_katemake.cpp
@@ -371,7 +371,7 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent,
 		TQT_TQOBJECT(this), TQT_SLOT(slotReceivedProcStderr(TDEProcess*, char*, int)));
 
 
-	KConfig c("katemakepluginrc");
+	TDEConfig c("katemakepluginrc");
 	c.setGroup("Prefixes");
 	source_prefix = c.readEntry("Source",TQString());
 	build_prefix = c.readEntry("Build",TQString());
@@ -729,7 +729,7 @@ void PluginKateMakeView::slotConfigure()
 // 		}
 	}
 
-	KConfig c("katemakepluginrc");
+	TDEConfig c("katemakepluginrc");
 	c.setGroup("Prefixes");
 	c.writeEntry("Source",source_prefix);
 	c.writeEntry("Build",build_prefix);
diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp
index 7694d4f..ba5dfb7 100644
--- a/kate/openheader/plugin_kateopenheader.cpp
+++ b/kate/openheader/plugin_kateopenheader.cpp
@@ -108,10 +108,10 @@ void PluginKateOpenHeader::tryOpen( const KURL& url, const TQStringList& extensi
   KURL newURL( url );
   for( TQStringList::ConstIterator it = extensions.begin(); it != extensions.end(); ++it ) {
     newURL.setFileName( basename + "." + *it );
-    if( KIO::NetAccess::exists( newURL ) )
+    if( TDEIO::NetAccess::exists( newURL ) )
       application()->activeMainWindow()->viewManager()->openURL( newURL );
     newURL.setFileName( basename + "." + (*it).upper() );
-    if( KIO::NetAccess::exists( newURL ) )
+    if( TDEIO::NetAccess::exists( newURL ) )
       application()->activeMainWindow()->viewManager()->openURL( newURL );
   }
 }
diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp
index cae9598..f28b944 100644
--- a/kate/snippets/plugin_katesnippets.cpp
+++ b/kate/snippets/plugin_katesnippets.cpp
@@ -63,7 +63,7 @@ KatePluginSnippetsView::KatePluginSnippetsView(Kate::MainWindow *w, TQWidget *do
 
   lSnippets.setAutoDelete( TRUE ); // the list owns the objects
 
-  config = new KConfig("katesnippetspluginrc");
+  config = new TDEConfig("katesnippetspluginrc");
   readConfig();
 
   // set text of selected item at startup
diff --git a/kate/snippets/plugin_katesnippets.h b/kate/snippets/plugin_katesnippets.h
index ef01ca6..d50a851 100644
--- a/kate/snippets/plugin_katesnippets.h
+++ b/kate/snippets/plugin_katesnippets.h
@@ -53,7 +53,7 @@ protected:
   void writeConfig();
 
 private:
-  KConfig                                 *config;
+  TDEConfig                                 *config;
   TQPtrList<CSnippet>                      lSnippets;
 
 public:
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp
index 6687c53..56f7b61 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.cpp
+++ b/kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -84,7 +84,7 @@ TDEInstance* KatePluginFactory::s_instance = 0L;
 KatePluginTabBarExtension::KatePluginTabBarExtension(
     TQObject* parent, const char* name )
   : Kate::Plugin ( (Kate::Application*)parent, name ),
-    pConfig(new KConfig("katetabbarextensionpluginrc"))
+    pConfig(new TDEConfig("katetabbarextensionpluginrc"))
 {
   pConfig->setGroup("global");
 }
diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h
index 0894828..ec808cf 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.h
+++ b/kate/tabbarextension/plugin_katetabbarextension.h
@@ -321,7 +321,7 @@ class KatePluginTabBarExtension : public Kate::Plugin, Kate::PluginViewInterface
 
   private:
     TQPtrList<class PluginView> m_views;
-    KConfig* pConfig;
+    TDEConfig* pConfig;
 };
 
 #endif // _PLUGIN_TABBAREXTENSION_H_
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index 06c1cf9..90108e1 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -484,22 +484,22 @@ void PluginKateXMLTools::getDTD()
     m_docToAssignTo = kv->document();
 
     TQApplication::setOverrideCursor( KCursor::waitCursor() );
-    KIO::Job *job = KIO::get( url );
-    connect( job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotFinished(KIO::Job *)) );
-    connect( job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
-             this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)) );
+    TDEIO::Job *job = TDEIO::get( url );
+    connect( job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotFinished(TDEIO::Job *)) );
+    connect( job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+             this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)) );
   }
   kdDebug()<<"XMLTools::getDTD: Documents: "<<m_docDtds.count()<<", DTDs: "<<m_dtds.count()<<endl;
 }
 
-void PluginKateXMLTools::slotFinished( KIO::Job *job )
+void PluginKateXMLTools::slotFinished( TDEIO::Job *job )
 {
   if( job->error() )
   {
     //kdDebug() << "XML Plugin error: DTD in XML format (" << filename << " ) could not be loaded" << endl;
     job->showErrorDialog( 0 );
   }
-  else if ( static_cast<KIO::TransferJob *>(job)->isErrorPage() )
+  else if ( static_cast<TDEIO::TransferJob *>(job)->isErrorPage() )
   {
     // catch failed loading loading via http:
     KMessageBox::error(0, i18n("The file '%1' could not be opened. "
@@ -521,7 +521,7 @@ void PluginKateXMLTools::slotFinished( KIO::Job *job )
   TQApplication::restoreOverrideCursor();
 }
 
-void PluginKateXMLTools::slotData( KIO::Job *, const TQByteArray &data )
+void PluginKateXMLTools::slotData( TDEIO::Job *, const TQByteArray &data )
 {
   m_dtdString += TQString( data );
 }
diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h
index 450a1b7..56fff4e 100644
--- a/kate/xmltools/plugin_katexmltools.h
+++ b/kate/xmltools/plugin_katexmltools.h
@@ -69,8 +69,8 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface
     void completionDone( KTextEditor::CompletionEntry completionEntry );
     void completionAborted();
 
-    void slotFinished( KIO::Job *job );
-    void slotData( KIO::Job *, const TQByteArray &data );
+    void slotFinished( TDEIO::Job *job );
+    void slotData( TDEIO::Job *, const TQByteArray &data );
 
     void backspacePressed();
     void emptyKeyEvent();
diff --git a/kfile-plugins/folder/kfile_folder.cpp b/kfile-plugins/folder/kfile_folder.cpp
index fe4ea9a..f4db1f3 100644
--- a/kfile-plugins/folder/kfile_folder.cpp
+++ b/kfile-plugins/folder/kfile_folder.cpp
@@ -67,7 +67,7 @@ bool KFolderPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
     
     TQFileInfo* file;
     int items = 0;
-    KIO::filesize_t bytes = 0;
+    TDEIO::filesize_t bytes = 0;
     
     while ( (file = list.current()) != 0 ) {
         ++list;
diff --git a/kfile-plugins/lnk/read_lnk.cpp b/kfile-plugins/lnk/read_lnk.cpp
index c3825e0..1170f9a 100644
--- a/kfile-plugins/lnk/read_lnk.cpp
+++ b/kfile-plugins/lnk/read_lnk.cpp
@@ -63,7 +63,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
   const char* lnkFile = 0;
 
   TQString tempFile;
-  if ( KIO::NetAccess::download(url, tempFile, 0) )
+  if ( TDEIO::NetAccess::download(url, tempFile, 0) )
     lnkFile = tempFile.latin1();
   else
     return false;
@@ -73,7 +73,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
   if ( !fd )
   {
     kdWarning(7034) << "could not open file " << lnkFile << endl;
-    KIO::NetAccess::removeTempFile(tempFile);
+    TDEIO::NetAccess::removeTempFile(tempFile);
     return false;
   }
 
@@ -83,7 +83,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
   {
     kdWarning(7034) << "wrong header size" << endl;
     fclose(fd);
-    KIO::NetAccess::removeTempFile(tempFile);
+    TDEIO::NetAccess::removeTempFile(tempFile);
     return false;
   }
 
@@ -91,7 +91,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
   {
     kdWarning(7034) << "wrong magic in header" << endl;
     fclose(fd);
-    KIO::NetAccess::removeTempFile(tempFile);
+    TDEIO::NetAccess::removeTempFile(tempFile);
     return false;
   }
 
@@ -104,7 +104,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
     {
       kdWarning(7034) << "could not read shell item id list" << endl;
       fclose(fd);
-      KIO::NetAccess::removeTempFile(tempFile);
+      TDEIO::NetAccess::removeTempFile(tempFile);
       return false;
     }
   }
@@ -124,7 +124,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
     {
       kdWarning(7034) << "could not read file localtion table" << endl;
       fclose(fd);
-      KIO::NetAccess::removeTempFile(tempFile);
+      TDEIO::NetAccess::removeTempFile(tempFile);
       return false;
     }
 
@@ -133,7 +133,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
     if ( (loc.totalLen <= sizeof(loc)) || (loc.totalLen > 4096) )  // 4096 is just an arbitrary number I think shall be enough
     {
       fclose(fd);
-      KIO::NetAccess::removeTempFile(tempFile);
+      TDEIO::NetAccess::removeTempFile(tempFile);
       return false;
     }
 
@@ -146,7 +146,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
       kdWarning(7034) << "could not read pathes data" << endl;
       delete [] data;
       fclose(fd);
-      KIO::NetAccess::removeTempFile(tempFile);
+      TDEIO::NetAccess::removeTempFile(tempFile);
       return false;
     }
 
@@ -197,7 +197,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
       {
         kdWarning(7034) << "could not read description string length" << endl;
         fclose(fd);
-        KIO::NetAccess::removeTempFile(tempFile);
+        TDEIO::NetAccess::removeTempFile(tempFile);
         return false;
       }
 
@@ -208,7 +208,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
         kdWarning(7034) << "could not read description string" << endl;
         delete [] data;
         fclose(fd);
-        KIO::NetAccess::removeTempFile(tempFile);
+        TDEIO::NetAccess::removeTempFile(tempFile);
         return false;
       }
 
@@ -221,7 +221,7 @@ bool readLNK(const KURL &url, LNKInfo &info)
   }
 
   fclose(fd);
-  KIO::NetAccess::removeTempFile(tempFile);
+  TDEIO::NetAccess::removeTempFile(tempFile);
 
   return true;
 }
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 2e84474..c19aff5 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -48,8 +48,8 @@ extern "C"
 	}
 }
 
-KConfigDialogImp::KConfigDialogImp( TQWidget *parent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType, KDialogBase::ButtonCode defaultButton, bool modal) :
-		KConfigDialog(parent, name, prefs, dialogType,(KDialogBase::ButtonCode) (KDialogBase::Default | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel ), defaultButton, modal)
+TDEConfigDialogImp::TDEConfigDialogImp( TQWidget *parent, const char *name, TDEConfigSkeleton *prefs, KDialogBase::DialogType dialogType, KDialogBase::ButtonCode defaultButton, bool modal) :
+		TDEConfigDialog(parent, name, prefs, dialogType,(KDialogBase::ButtonCode) (KDialogBase::Default | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel ), defaultButton, modal)
 {
 	// As a temporary mesure until the kicker applet's app name is set to the
 	// applets name so KDialogBase gets the right info.
@@ -213,10 +213,10 @@ void KBinaryClock::loadSettings(){
  * Show Settings dialog.
  */
 void KBinaryClock::preferences(){
-	if(KConfigDialog::showDialog("settings"))
+	if(TDEConfigDialog::showDialog("settings"))
 		return;
 
-	KConfigDialogImp *dialog = new KConfigDialogImp(this, "settings", prefs, KDialogBase::Swallow);
+	TDEConfigDialogImp *dialog = new TDEConfigDialogImp(this, "settings", prefs, KDialogBase::Swallow);
 	connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings()));
 	dialog->show();
 	dialog->settings->updatePreview();
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.h b/kicker-applets/kbinaryclock/kbinaryclock.h
index e5e28aa..e816056 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.h
+++ b/kicker-applets/kbinaryclock/kbinaryclock.h
@@ -48,10 +48,10 @@ public slots:
 
 };
 
-class KConfigDialogImp : public KConfigDialog {
+class TDEConfigDialogImp : public TDEConfigDialog {
 public:
-	KConfigDialogImp(TQWidget *parent, const char *name,
-		KConfigSkeleton *prefs,
+	TDEConfigDialogImp(TQWidget *parent, const char *name,
+		TDEConfigSkeleton *prefs,
 	KDialogBase::DialogType dialogType = KDialogBase::IconList,
 	KDialogBase::ButtonCode defaultButton = Ok,
 	bool modal=false);
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index 58dc30c..52f1f40 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -71,7 +71,7 @@ KolourPicker::KolourPicker(const TQString& configFile, Type type,
 	about->addAuthor("Malte Starostik", I18N_NOOP("Original Author"), "[email protected]");
 	m_instance = new TDEInstance(about);
 
-	KConfig *conf = config();
+	TDEConfig *conf = config();
 	conf->setGroup("General");
 	TQStringList history = conf->readListEntry("History");
 	for (TQStringList::ConstIterator it = history.begin(); it != history.end(); ++it)
@@ -151,7 +151,7 @@ void KolourPicker::slotHistory()
 		m_history.clear();
 		m_historyButton->setEnabled(false);
 		arrangeButtons();
-		KConfig *conf = config();
+		TDEConfig *conf = config();
 		conf->setGroup("General");
 		conf->writeEntry("History", TQStringList());
 		conf->sync();
@@ -190,7 +190,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e)
 		{
 			history.append((*it).name());
 		}
-		KConfig *conf = config();
+		TDEConfig *conf = config();
 		conf->setGroup("General");
 		conf->writeEntry("History", history);
 		conf->sync();
diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc
index ef32118..3f32558 100644
--- a/kicker-applets/ktimemon/timemon.cc
+++ b/kicker-applets/ktimemon/timemon.cc
@@ -198,7 +198,7 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions,
     mouseAction[1] = NOTHING;
     mouseAction[2] = MENU;
 
-    KConfig* conf = config();
+    TDEConfig* conf = config();
     conf->setGroup("Parameters");
     interval = conf->readUnsignedNumEntry("Interval", 500);
     autoScale = conf->readBoolEntry("AutoScale", true);
@@ -305,7 +305,7 @@ void KTimeMon::cont()
 // Dump the current configuration entries to the data base.
 void KTimeMon::writeConfiguration()
 {
-    KConfig* conf = config();
+    TDEConfig* conf = config();
     conf->setGroup("Interface");
     conf->writeEntry("KernelColour", kernelColour);
     conf->writeEntry("UserColour", userColour);
@@ -369,7 +369,7 @@ void KTimeMon::orientation()
 {
     vertical = !vertical;
 
-    KConfig* conf = config();
+    TDEConfig* conf = config();
     conf->setGroup("Interface");
     conf->writeEntry("Vertical", vertical);
 
diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp
index 7051e68..9efce39 100644
--- a/kicker-applets/math/mathapplet.cpp
+++ b/kicker-applets/math/mathapplet.cpp
@@ -90,7 +90,7 @@ MathApplet::MathApplet(const TQString& configFile, Type type, int actions,
     initContextMenu();    
     useDegrees();
 	    
-    KConfig *c = config();
+    TDEConfig *c = config();
     c->setGroup("General");
 
     
@@ -120,7 +120,7 @@ void MathApplet::initContextMenu()
 
 MathApplet::~MathApplet()
 {
-    KConfig *c = config();
+    TDEConfig *c = config();
     c->setGroup("General");
 
     // save history and completion list
diff --git a/kicker-applets/mediacontrol/configfrontend.cpp b/kicker-applets/mediacontrol/configfrontend.cpp
index 971d4d5..7bebd50 100644
--- a/kicker-applets/mediacontrol/configfrontend.cpp
+++ b/kicker-applets/mediacontrol/configfrontend.cpp
@@ -23,7 +23,7 @@
 
 ConfigFrontend::ConfigFrontend() : TQObject(0, 0)
 {
-	_config = new KConfig(TQString(), true, false);
+	_config = new TDEConfig(TQString(), true, false);
 	_ownConfig = true;
 }
 
@@ -35,7 +35,7 @@ ConfigFrontend::~ConfigFrontend()
     }
 }
 
-ConfigFrontend::ConfigFrontend(KConfig *config) : TQObject(0, 0)
+ConfigFrontend::ConfigFrontend(TDEConfig *config) : TQObject(0, 0)
 {
 	_config = config;
 	_config->setGroup("MediaControl");
diff --git a/kicker-applets/mediacontrol/configfrontend.h b/kicker-applets/mediacontrol/configfrontend.h
index 9a4727f..30d0166 100644
--- a/kicker-applets/mediacontrol/configfrontend.h
+++ b/kicker-applets/mediacontrol/configfrontend.h
@@ -30,7 +30,7 @@ class ConfigFrontend : public TQObject
   
 	public:
 		ConfigFrontend();
-		ConfigFrontend(KConfig *);
+		ConfigFrontend(TDEConfig *);
 		virtual ~ConfigFrontend();
 
 		uint mouseWheelSpeed() const;
@@ -46,7 +46,7 @@ class ConfigFrontend : public TQObject
 		void reparseConfiguration() { _config->reparseConfiguration(); }
 
 	private:
-		KConfig *_config;
+		TDEConfig *_config;
 		bool _ownConfig:1;
 };
 
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.h b/kicker-applets/mediacontrol/mediacontrolconfig.h
index aad3c61..0d020c1 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.h
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.h
@@ -23,7 +23,7 @@
 
 class MediaControlConfigWidget;
 class ConfigFrontend;
-class KConfig;
+class TDEConfig;
 
 class MediaControlConfig: public KDialogBase
 {
diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp
index c18c061..c07a2c1 100644
--- a/konq-plugins/adblock/adblock.cpp
+++ b/konq-plugins/adblock/adblock.cpp
@@ -65,7 +65,7 @@ AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) :
 
     m_menu = new KPopupMenu(m_part->widget());
     m_menu->insertTitle(i18n("Adblock"));
-    m_menu->insertItem(i18n("Configure"), this, TQT_SLOT(showKCModule()));
+    m_menu->insertItem(i18n("Configure"), this, TQT_SLOT(showTDECModule()));
     m_menu->insertItem(i18n("Show Elements"), this, TQT_SLOT(showDialogue()));
 
     connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(initLabel()));
@@ -126,7 +126,7 @@ void AdBlock::showDialogue()
     dialogue->show();
 }
 
-void AdBlock::showKCModule()
+void AdBlock::showTDECModule()
 {
     KCMultiDialog* dialogue = new KCMultiDialog(m_part->widget());
     dialogue->addModule("khtml_filter");
diff --git a/konq-plugins/adblock/adblock.h b/konq-plugins/adblock/adblock.h
index 336fe23..391934c 100644
--- a/konq-plugins/adblock/adblock.h
+++ b/konq-plugins/adblock/adblock.h
@@ -69,7 +69,7 @@ private slots:
     void showDialogue();
     void addAdFilter(const TQString &url);
     void contextMenu();
-    void showKCModule();
+    void showTDECModule();
 };
 
 // ----------------------------------------------------------------------------
diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp
index d5b3e6a..11d6f6c 100644
--- a/konq-plugins/akregator/akregatorplugin.cpp
+++ b/konq-plugins/akregator/akregatorplugin.cpp
@@ -57,7 +57,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const
 
     // Do nothing if user has turned us off.
     // TODO: Not yet implemented in aKregator settings.
-    /*m_conf = new KConfig( "akregatorrc" );
+    /*m_conf = new TDEConfig( "akregatorrc" );
     m_conf->setGroup( "AkregatorKonqPlugin" );
     if ( !m_conf->readBoolEntry( "Enable", true ) )
         return;
diff --git a/konq-plugins/akregator/akregatorplugin.h b/konq-plugins/akregator/akregatorplugin.h
index 2406da4..658730c 100644
--- a/konq-plugins/akregator/akregatorplugin.h
+++ b/konq-plugins/akregator/akregatorplugin.h
@@ -50,7 +50,7 @@ protected:
 
 private:
     TQStringList m_feedMimeTypes;
-    KConfig *m_conf;
+    TDEConfig *m_conf;
     KHTMLPart *m_part;
     TQString m_feedURL;
 };
diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp
index a81d1a1..dd8a8c5 100644
--- a/konq-plugins/akregator/konqfeedicon.cpp
+++ b/konq-plugins/akregator/konqfeedicon.cpp
@@ -71,7 +71,7 @@ void KonqFeedIcon::waitPartToLoad()
 {
     connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(addFeedIcon()));
     connect(m_part, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(addFeedIcon())); // to make pages with metarefresh to work
-    connect(m_part, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(removeFeedIcon()));
+    connect(m_part, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(removeFeedIcon()));
     addFeedIcon();
 }
 
diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index fef5779..acd10f6 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -49,7 +49,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
          || ( KStandardDirs::findExe( "ark" ).isNull() ) )
         return;
 
-    m_conf = new KConfig( "arkrc" );
+    m_conf = new TDEConfig( "arkrc" );
     m_conf->setGroup( "ark" );
 
     if ( !m_conf->readBoolEntry( "KonquerorIntegration", true ) )
@@ -471,7 +471,7 @@ void ArkMenu::slotCompressAs( int pos )
     {
         target = m_dir + i18n("Archive") + m_extensionList[ pos ];
         int i=1;
-        while ( KIO::NetAccess::exists(target, true, 0 ) )
+        while ( TDEIO::NetAccess::exists(target, true, 0 ) )
         {
             target = m_dir + i18n("Archive %1").arg(i) + m_extensionList[ pos ];
             i++;
@@ -515,7 +515,7 @@ void ArkMenu::slotCompressAsDefault()
     {
         name = m_dir + i18n("Archive") + m_ext;
         int i=1;
-        while ( KIO::NetAccess::exists(name, true, 0 ) )
+        while ( TDEIO::NetAccess::exists(name, true, 0 ) )
         {
             name = m_dir + i18n("Archive %1").arg(i) + m_ext;
             i++;
diff --git a/konq-plugins/arkplugin/arkplugin.h b/konq-plugins/arkplugin/arkplugin.h
index 326d298..a1290fa 100644
--- a/konq-plugins/arkplugin/arkplugin.h
+++ b/konq-plugins/arkplugin/arkplugin.h
@@ -65,7 +65,7 @@ private:
     KActionMenu * m_addToMenu;
     TQSignalMapper * m_compAsMapper;
     TQSignalMapper * m_addToMapper;
-    KConfig * m_conf;
+    TDEConfig * m_conf;
     TQString m_dir; //contains the currect directory
 };
 
diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp
index 3848f3b..c4d3f68 100644
--- a/konq-plugins/babelfish/plugin_babelfish.cpp
+++ b/konq-plugins/babelfish/plugin_babelfish.cpp
@@ -2,7 +2,7 @@
    Copyright (C) 2001 Kurt Granroth <[email protected]>
      Original code: plugin code, connecting to Babelfish and support for selected text
    Copyright (C) 2003 Rand2342 <[email protected]>
-     Submenus, KConfig file and support for other translation engines
+     Submenus, TDEConfig file and support for other translation engines
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -181,8 +181,8 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name,
   if ( parent && parent->inherits( "KHTMLPart" ) )
   {
     KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>(parent);
-    connect( part, TQT_SIGNAL(started(KIO::Job*)), this,
-             TQT_SLOT(slotStarted(KIO::Job*)) );
+    connect( part, TQT_SIGNAL(started(TDEIO::Job*)), this,
+             TQT_SLOT(slotStarted(TDEIO::Job*)) );
   }
 }
 
@@ -191,7 +191,7 @@ PluginBabelFish::~PluginBabelFish()
   delete m_menu;
 }
 
-void PluginBabelFish::slotStarted( KIO::Job* )
+void PluginBabelFish::slotStarted( TDEIO::Job* )
 {
   if ( parent()->inherits("KHTMLPart") &&
   // Babelfish wants http URLs only. No https.
@@ -223,7 +223,7 @@ void PluginBabelFish::translateURL()
   }
 
   // Select engine
-  KConfig cfg( "translaterc", true );
+  TDEConfig cfg( "translaterc", true );
   TQString engine = cfg.readEntry( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(), "babelfish" );
 
   // Get URL
diff --git a/konq-plugins/babelfish/plugin_babelfish.h b/konq-plugins/babelfish/plugin_babelfish.h
index 78b1087..8a8bfd8 100644
--- a/konq-plugins/babelfish/plugin_babelfish.h
+++ b/konq-plugins/babelfish/plugin_babelfish.h
@@ -23,7 +23,7 @@
 #include <klibloader.h>
 
 class KURL;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 class PluginBabelFish : public KParts::Plugin
 {
@@ -37,7 +37,7 @@ public:
 public slots:
   void translateURL();
 protected slots:
-  void slotStarted( KIO::Job* );
+  void slotStarted( TDEIO::Job* );
 
 private:
   KActionMenu* m_menu;
diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp
index 09a3bfb..9a82666 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.cpp
+++ b/konq-plugins/dirfilter/dirfilterplugin.cpp
@@ -117,7 +117,7 @@ void SessionManager::save (const KURL& url, const TQString& typedFilter)
 
 void SessionManager::saveSettings()
 {
-  KConfig cfg ("dirfilterrc", false, false);
+  TDEConfig cfg ("dirfilterrc", false, false);
   cfg.setGroup ("General");
 
   cfg.writeEntry ("ShowCount", showCount);
@@ -130,7 +130,7 @@ void SessionManager::loadSettings()
   if (m_bSettingsLoaded)
     return;
 
-  KConfig cfg ("dirfilterrc", false, false);
+  TDEConfig cfg ("dirfilterrc", false, false);
   cfg.setGroup ("General");
 
   showCount = cfg.readBoolEntry ("ShowCount", false);
diff --git a/konq-plugins/dirfilter/dirfilterplugin.h b/konq-plugins/dirfilter/dirfilterplugin.h
index f9d7d38..56d6aa5 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.h
+++ b/konq-plugins/dirfilter/dirfilterplugin.h
@@ -39,7 +39,7 @@ namespace KParts
   struct URLArgs;
 }
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
 }
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index a13e288..52b7ba0 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -62,7 +62,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
     part_manager = 0;
 
     // set configuration object
-    _config = new KConfig("domtreeviewerrc");
+    _config = new TDEConfig("domtreeviewerrc");
 
     // accept dnd
     setAcceptDrops(true);
@@ -189,7 +189,7 @@ TQPopupMenu *DOMTreeWindow::createDOMTreeViewContextMenu()
   return static_cast<TQPopupMenu *>(w);
 }
 
-void DOMTreeWindow::saveProperties(KConfig *config)
+void DOMTreeWindow::saveProperties(TDEConfig *config)
 {
     // the 'config' object points to the session managed
     // config file.  anything you write here will be available
@@ -206,7 +206,7 @@ void DOMTreeWindow::saveProperties(KConfig *config)
 #endif
 }
 
-void DOMTreeWindow::readProperties(KConfig *config)
+void DOMTreeWindow::readProperties(TDEConfig *config)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/konq-plugins/domtreeviewer/domtreewindow.h b/konq-plugins/domtreeviewer/domtreewindow.h
index c138446..2715eb5 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.h
+++ b/konq-plugins/domtreeviewer/domtreewindow.h
@@ -42,7 +42,7 @@ class DOMTreeView;
 class PluginDomtreeviewer;
 
 class KAction;
-class KConfig;
+class TDEConfig;
 class KPrinter;
 class KURL;
 class KCommandHistory;
@@ -113,7 +113,7 @@ public:
     /**
      * Returns the config object for this plugin.
      */
-    KConfig *config() const { return _config; }
+    TDEConfig *config() const { return _config; }
 
     /** returns the attribute delete action */
     KAction *deleteAttributeAction() const { return del_attr; }
@@ -144,14 +144,14 @@ protected:
      * This function is called when it is time for the app to save its
      * properties for session management purposes.
      */
-    void saveProperties(KConfig *);
+    void saveProperties(TDEConfig *);
 
     /**
-     * This function is called when this app is restored.  The KConfig
+     * This function is called when this app is restored.  The TDEConfig
      * object points to the session management config file that was saved
      * with @ref saveProperties
      */
-    void readProperties(KConfig *);
+    void readProperties(TDEConfig *);
 
 
 private slots:
@@ -185,7 +185,7 @@ private:
     KCommandHistory *m_commandHistory;
     TQPopupMenu *infopanel_ctx;
     TQPopupMenu *domtree_ctx;
-    KConfig *_config;
+    TDEConfig *_config;
 
     KAction *del_tree, *del_attr;
 
diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp
index 49cc4ff..3ad3066 100644
--- a/konq-plugins/fsview/fsview.cpp
+++ b/konq-plugins/fsview/fsview.cpp
@@ -78,17 +78,17 @@ FSView::FSView(Inode* base, TQWidget* parent, const char* name)
   _dirsFinished = 0;
   _lastDir = 0;
 
-  _config = new KConfig("fsviewrc");
+  _config = new TDEConfig("fsviewrc");
 
   // restore TreeMap visualization options of last execution
-  KConfigGroup tmconfig(_config, TQCString("TreeMap"));
+  TDEConfigGroup tmconfig(_config, TQCString("TreeMap"));
   restoreOptions(&tmconfig);
   TQString str = tmconfig.readEntry("ColorMode");
   if (!str.isEmpty()) setColorMode(str);
 
   if (_dirMetric.count() == 0) {
     // restore metric cache
-    KConfigGroup cconfig(_config, TQCString("MetricCache"));
+    TDEConfigGroup cconfig(_config, TQCString("MetricCache"));
     int ccount = cconfig.readNumEntry("Count", 0);
     int i, f, d;
     double s;
@@ -139,7 +139,7 @@ void FSView::setPath(TQString p)
   u.setPath(_path);
   if (!kapp->authorizeURLAction("list", KURL(), u))
   {
-     TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, u.prettyURL());
+     TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, u.prettyURL());
      KMessageBox::queuedMessageBox(this, KMessageBox::Sorry, msg);
   }
 
@@ -326,7 +326,7 @@ void FSView::contextMenu(TreeMapItem* i, const TQPoint& p)
   }
 }
 
-void FSView::saveMetric(KConfigGroup* g)
+void FSView::saveMetric(TDEConfigGroup* g)
 {
   TQMap<TQString, MetricEntry>::iterator it;
   int c = 1;
@@ -414,14 +414,14 @@ void FSView::colorActivated(int id)
 
 void FSView::saveFSOptions()
 {
-  KConfigGroup tmconfig(_config, TQCString("TreeMap"));
+  TDEConfigGroup tmconfig(_config, TQCString("TreeMap"));
   saveOptions(&tmconfig);
   tmconfig.writeEntry("ColorMode", colorModeString());
 
-  KConfigGroup gconfig(_config, TQCString("General"));
+  TDEConfigGroup gconfig(_config, TQCString("General"));
   gconfig.writeEntry("Path", _path);
 
-  KConfigGroup cconfig(_config, TQCString("MetricCache"));
+  TDEConfigGroup cconfig(_config, TQCString("MetricCache"));
   saveMetric(&cconfig);
 }
 
diff --git a/konq-plugins/fsview/fsview.h b/konq-plugins/fsview/fsview.h
index 2acde99..bcfd726 100644
--- a/konq-plugins/fsview/fsview.h
+++ b/konq-plugins/fsview/fsview.h
@@ -34,7 +34,7 @@
 #include "inode.h"
 #include "scan.h"
 
-class KConfig;
+class TDEConfig;
 
 /* Cached Metric info config */
 class MetricEntry
@@ -66,7 +66,7 @@ public:
   FSView(Inode*, TQWidget* parent=0, const char* name=0);
   ~FSView();
 
-  KConfig* config() { return _config; }
+  TDEConfig* config() { return _config; }
 
   void setPath(TQString);
   TQString path() { return _path; }
@@ -88,7 +88,7 @@ public:
 
   static bool getDirMetric(const TQString&, double&, unsigned int&, unsigned int&);
   static void setDirMetric(const TQString&, double, unsigned int, unsigned int);
-  void saveMetric(KConfigGroup*);
+  void saveMetric(TDEConfigGroup*);
   void saveFSOptions();
 
   // for color mode
@@ -110,7 +110,7 @@ public slots:
   void completed(int dirs);
 
  private:
-  KConfig* _config;
+  TDEConfig* _config;
   ScanManager _sm;
 
   // when a contextMenu is shown, we don't allow async. refreshs
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index 5bef896..33ad518 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -54,7 +54,7 @@ K_EXPORT_COMPONENT_FACTORY( libfsviewpart, FSViewPartFactory )
 // FSJob, for progress
 
 FSJob::FSJob(FSView* v)
-  : KIO::Job(false)
+  : TDEIO::Job(false)
 {
   _view = v;
   TQObject::connect(v, TQT_SIGNAL(progress(int,int,const TQString&)),
@@ -224,7 +224,7 @@ void FSViewPart::completedSlot(int dirs)
     _job = 0;
   }
 
-  KConfigGroup cconfig(_view->config(), TQCString("MetricCache"));
+  TDEConfigGroup cconfig(_view->config(), TQCString("MetricCache"));
   _view->saveMetric(&cconfig);
 
   emit completed();
diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h
index 0919918..891ebfb 100644
--- a/konq-plugins/fsview/fsview_part.h
+++ b/konq-plugins/fsview/fsview_part.h
@@ -62,7 +62,7 @@ private:
   FSView* _view;  
 };
 
-class FSJob: public KIO::Job
+class FSJob: public TDEIO::Job
 {
   Q_OBJECT
   
diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp
index ec24f6d..2906f74 100644
--- a/konq-plugins/fsview/main.cpp
+++ b/konq-plugins/fsview/main.cpp
@@ -31,7 +31,7 @@ int main(int argc, char* argv[])
   TDECmdLineArgs::addCmdLineOptions(options);
   TDEApplication a;
 
-  KConfigGroup gconfig(TDEGlobal::config(), TQCString("General"));
+  TDEConfigGroup gconfig(TDEGlobal::config(), TQCString("General"));
   TQString path = gconfig.readPathEntry("Path", ".");
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/konq-plugins/fsview/scan.cpp b/konq-plugins/fsview/scan.cpp
index 1d3d06a..8f4101b 100644
--- a/konq-plugins/fsview/scan.cpp
+++ b/konq-plugins/fsview/scan.cpp
@@ -120,7 +120,7 @@ ScanFile::ScanFile()
   _listener = 0;
 }
 
-ScanFile::ScanFile(const TQString& n, KIO::fileoffset_t s)
+ScanFile::ScanFile(const TQString& n, TDEIO::fileoffset_t s)
 {
   _name = n;
   _size = s;
diff --git a/konq-plugins/fsview/scan.h b/konq-plugins/fsview/scan.h
index ca4ce4f..384a6dc 100644
--- a/konq-plugins/fsview/scan.h
+++ b/konq-plugins/fsview/scan.h
@@ -27,7 +27,7 @@
 #include <tqvaluevector.h>
 #include <tqfile.h>
 
-/* Use KDE_lstat and KIO::fileoffset_t for 64-bit sizes */
+/* Use KDE_lstat and TDEIO::fileoffset_t for 64-bit sizes */
 #include <klargefile.h>
 #include <kio/global.h>
 
@@ -131,11 +131,11 @@ class ScanFile
 {
  public:
   ScanFile();
-  ScanFile(const TQString& n, KIO::fileoffset_t s);
+  ScanFile(const TQString& n, TDEIO::fileoffset_t s);
   ~ScanFile();
 
   const TQString& name() { return _name; }
-  KIO::fileoffset_t size() { return _size; }
+  TDEIO::fileoffset_t size() { return _size; }
 
   /* set listener to get callbacks from this ScanDir */
   void setListener(ScanListener* l) { _listener = l; }
@@ -143,7 +143,7 @@ class ScanFile
 
  private:
   TQString _name;
-  KIO::fileoffset_t _size;
+  TDEIO::fileoffset_t _size;
   ScanListener* _listener;
 };
 
@@ -189,7 +189,7 @@ class ScanDir
   ScanFileVector& files() { return _files; }
   ScanDirVector& dirs() { return _dirs; }
   const TQString& name() { return _name; }
-  KIO::fileoffset_t size() { update(); return _size; }
+  TDEIO::fileoffset_t size() { update(); return _size; }
   unsigned int fileCount() { update(); return _fileCount; }
   unsigned int dirCount() { update(); return _dirCount; }
   ScanDir* parent() { return _parent; }
@@ -219,7 +219,7 @@ class ScanDir
 
   TQString _name;
   bool _dirty; /* needs a call to update() */
-  KIO::fileoffset_t _size, _fileSize;
+  TDEIO::fileoffset_t _size, _fileSize;
   unsigned int _fileCount, _dirCount;
   int _dirsFinished, _data;
   ScanDir* _parent;
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index 32c52f1..466b91a 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -3117,7 +3117,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
  * Option saving/restoring
  */
 
-void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix)
+void TreeMapWidget::saveOptions(TDEConfigGroup* config, TQString prefix)
 {
   config->writeEntry(prefix+"Nesting", splitModeString());
   config->writeEntry(prefix+"AllowRotation", allowRotation());
@@ -3142,7 +3142,7 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix)
 }
 
 
-void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix)
+void TreeMapWidget::restoreOptions(TDEConfigGroup* config, TQString prefix)
 {
   bool enabled;
   int num;
diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h
index 994368d..0a86702 100644
--- a/konq-plugins/fsview/treemap.h
+++ b/konq-plugins/fsview/treemap.h
@@ -46,7 +46,7 @@ class TreeMapItem;
 class TreeMapItemList;
 class TQString;
 
-class KConfigGroup;
+class TDEConfigGroup;
 
 
 /**
@@ -599,8 +599,8 @@ public:
   /**
    * Save/restore options.
    */
-  void saveOptions(KConfigGroup*, TQString prefix = TQString());
-  void restoreOptions(KConfigGroup*, TQString prefix = TQString());
+  void saveOptions(TDEConfigGroup*, TQString prefix = TQString());
+  void restoreOptions(TDEConfigGroup*, TQString prefix = TQString());
 
   /**
    * These functions populate given popup menus.
diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp
index af688f1..1d0548c 100644
--- a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp
+++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp
@@ -122,7 +122,7 @@ void SettingsPlugin::showPopup()
     return;
 
   if (!mConfig)
-    mConfig = new KConfig("settingspluginrc", false, false);
+    mConfig = new TDEConfig("settingspluginrc", false, false);
     
   KHTMLPart *part = static_cast<KHTMLPart *>( parent() );
 
@@ -137,20 +137,20 @@ void SettingsPlugin::showPopup()
   ((KToggleAction*)actionCollection()->action("imageloading"))->setChecked( part->autoloadImages() );
   ((KToggleAction*)actionCollection()->action("usecache"))->setChecked(KProtocolManager::useCache());
 
-  KIO::CacheControl cc = KProtocolManager::cacheControl();
+  TDEIO::CacheControl cc = KProtocolManager::cacheControl();
   switch ( cc ) 
   {
-      case KIO::CC_Verify:
+      case TDEIO::CC_Verify:
           ((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 0 );
           break;
-      case KIO::CC_CacheOnly:
+      case TDEIO::CC_CacheOnly:
           ((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 2 );
           break;
-      case KIO::CC_Cache:
+      case TDEIO::CC_Cache:
           ((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 1 );
           break;
-      case KIO::CC_Reload: // nothing for now
-      case KIO::CC_Refresh:
+      case TDEIO::CC_Reload: // nothing for now
+      case TDEIO::CC_Refresh:
       default:
           break;
       
@@ -237,7 +237,7 @@ bool SettingsPlugin::cookiesEnabled( const TQString& url )
         enabled = ( advice == "Accept" );
         if ( !enabled && advice == "Dunno" ) {
             // TODO, check the global setting via dcop
-            KConfig kc( "kcookiejarrc", true, false );
+            TDEConfig kc( "kcookiejarrc", true, false );
             kc.setGroup( "Cookie Policy" );
             enabled =
           (kc.readEntry( "CookieGlobalAdvice", "Reject" ) == "Accept");
@@ -266,7 +266,7 @@ void SettingsPlugin::toggleProxy()
       type = KProtocolManager::NoProxy;
     }
     
-    KConfig config("kioslaverc", false, false);
+    TDEConfig config("kioslaverc", false, false);
     config.setGroup( "Proxy Settings" );    
     config.writeEntry( "ProxyType", type );
 
@@ -278,7 +278,7 @@ void SettingsPlugin::toggleProxy()
 void SettingsPlugin::toggleCache()
 {
     bool usesCache = KProtocolManager::useCache();
-    KConfig config( "kio_httprc", false, false );
+    TDEConfig config( "kio_httprc", false, false );
     config.writeEntry( "UseCache", !usesCache );
 
     ((KToggleAction*)actionCollection()->action("usecache"))->setChecked( !usesCache );
@@ -292,18 +292,18 @@ void SettingsPlugin::cachePolicyChanged( int p )
 
     switch ( p ) {
         case 0:
-            policy = KIO::getCacheControlString( KIO::CC_Verify );
+            policy = TDEIO::getCacheControlString( TDEIO::CC_Verify );
             break;
         case 1:
-            policy = KIO::getCacheControlString( KIO::CC_Cache );
+            policy = TDEIO::getCacheControlString( TDEIO::CC_Cache );
             break;
         case 2:
-            policy = KIO::getCacheControlString( KIO::CC_CacheOnly );
+            policy = TDEIO::getCacheControlString( TDEIO::CC_CacheOnly );
             break;
     };
 
     if ( !policy.isEmpty() ) {
-        KConfig config("kio_httprc", false, false);
+        TDEConfig config("kio_httprc", false, false);
         config.writeEntry("cache", policy);
 
         updateIOSlaves();
@@ -321,7 +321,7 @@ void SettingsPlugin::updateIOSlaves()
 
     TQString protocol; // null -> all of them
     stream << protocol;
-    client->send( "*", "KIO::Scheduler",
+    client->send( "*", "TDEIO::Scheduler",
                   "reparseSlaveConfiguration(TQString)", data );
 }
 
diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.h b/konq-plugins/khtmlsettingsplugin/settingsplugin.h
index 3f29ca1..7f9d8aa 100644
--- a/konq-plugins/khtmlsettingsplugin/settingsplugin.h
+++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.h
@@ -23,7 +23,7 @@
 #include <kparts/plugin.h>
 #include <klibloader.h>
 
-class KConfig;
+class TDEConfig;
 
 class SettingsPlugin : public KParts::Plugin
 {
@@ -51,7 +51,7 @@ private slots:
     void showPopup();
     
 private:
-    KConfig* mConfig;
+    TDEConfig* mConfig;
 };
 
 #endif // SETTINGS_PLUGIN
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
index 77758b1..047e368 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
@@ -52,7 +52,7 @@ KIGPDialog::KIGPDialog(TQWidget *parent, const TQString& path, const char *name
     m_path = path;
     setCaption(i18n("Create Image Gallery"));
     setButtonOK( KGuiItem(i18n("Create"),"imagegallery") );
-    m_config = new KConfig("kimgallerypluginrc", false, false);
+    m_config = new TDEConfig("kimgallerypluginrc", false, false);
     setupLookPage(path);
     setupDirectoryPage(path);
     setupThumbnailPage(path);
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.h b/konq-plugins/kimgalleryplugin/imgallerydialog.h
index add798d..6c767fe 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.h
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.h
@@ -32,7 +32,7 @@ class TQLineEdit;
 class KURLRequester;
 class TQSpinBox;
 class KColorButton;
-class KConfig;
+class TDEConfig;
 
 typedef TQMap<TQString,TQString> CommentMap;
 
@@ -103,7 +103,7 @@ class KIGPDialog : public KDialogBase
   KURLRequester *m_commentFileReq;
   bool m_dialogOk;
 
-  KConfig *m_config;
+  TDEConfig *m_config;
 
  private:
   void setupLookPage(const TQString& path);
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
index 68cccfe..ea343da 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -431,7 +431,7 @@ bool KImGalleryPlugin::createThumb( const TQString& imgName, const TQString& sou
         //kdDebug(90170) << "srcURL: " << srcURL << endl;
         KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::fromLatin1("/images/") + imgName);
         //kdDebug(90170) << "destURL: " << destURL << endl;
-        KIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(parent())->widget());
+        TDEIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(parent())->widget());
     }
 
     const TQString imgNameFormat = imgName + extension(imageFormat);
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
index d8015ce..a2894f9 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
@@ -34,7 +34,7 @@ typedef KGenericFactory<KCMKuick, TQWidget> KuickFactory;
 K_EXPORT_COMPONENT_FACTORY ( kcm_kuick, KuickFactory( "kcmkuick" ) )
 
 KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &)
-:KCModule(parent, name)
+:TDECModule(parent, name)
 {
     TDEAboutData *ab=new TDEAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"),
        "0.2",I18N_NOOP("KControl module for Kuick's configuration"), TDEAboutData::License_GPL,
@@ -66,14 +66,14 @@ void KCMKuick::slotShowToggled()
 
 void KCMKuick::load()
 {
-    KConfig config( "konquerorrc");
+    TDEConfig config( "konquerorrc");
     config.setGroup("kuick-copy");
     dialog->m_sbCopy->setValue(config.readNumEntry("ShowRecent",5) );
 
     config.setGroup("kuick-move" );
     dialog->m_sbMove->setValue(config.readNumEntry("ShowRecent",5) );
     
-    KConfig cfg("kuick_plugin.desktop", true, false, "services");
+    TDEConfig cfg("kuick_plugin.desktop", true, false, "services");
     cfg.setDesktopGroup();
     bool hidden=cfg.readBoolEntry("Hidden", false);
     dialog->m_chkShow->setChecked(!hidden);
@@ -97,7 +97,7 @@ void KCMKuick::configChanged()
 
 void KCMKuick::save()
 {
-    KConfig config("konquerorrc" );
+    TDEConfig config("konquerorrc" );
     config.setGroup("kuick-copy");
 
     config.writeEntry("ShowRecent", dialog->m_sbCopy->value() );
@@ -112,7 +112,7 @@ void KCMKuick::save()
        TQFile::remove(servicespath+"/kuick_plugin.desktop");
     }
     else {
-       KConfig cfg("kuick_plugin.desktop", false, false, "services");
+       TDEConfig cfg("kuick_plugin.desktop", false, false, "services");
        cfg.setDesktopGroup();
        cfg.writeEntry("Hidden", true);
     }
@@ -122,14 +122,14 @@ void KCMKuick::save()
 }
 
 void KCMKuick::slotClearCopyCache( ) {
-    KConfig config("konquerorrc");
+    TDEConfig config("konquerorrc");
     config.setGroup("kuick-copy" );
     config.writePathEntry("Paths", TQStringList() );
     config.sync();		//is it necessary ?
 }
 
 void KCMKuick::slotClearMoveCache() {
-    KConfig config("konquerorrc");
+    TDEConfig config("konquerorrc");
     config.setGroup("kuick-move" );
     config.writePathEntry("Paths", TQStringList() );
     config.sync();		//is it necessary ?
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.h b/konq-plugins/kuick/kcmkuick/kcmkuick.h
index c56250e..9c77d93 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.h
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.h
@@ -21,7 +21,7 @@
 
 
 class KCMKuick
-	: public KCModule
+	: public TDECModule
 {
 	Q_OBJECT
   
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index 76dbd95..cfe19f0 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -133,7 +133,7 @@ void KDirMenu::slotAboutToShow( ) {
         if (kapp->authorizeURLAction("list", u, u))
         {
            insert(new KDirMenu(this, src, (*it)->absFilePath(), name),
-			KIO::decodeFileName( fileName ));
+			TDEIO::decodeFileName( fileName ));
 	}
     }
 }
diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h
index a28501e..3d60b86 100644
--- a/konq-plugins/kuick/kmetamenu.h
+++ b/konq-plugins/kuick/kmetamenu.h
@@ -27,7 +27,7 @@
 
 class TQIconSet;
 class TQStringList;
-class KConfig;
+class TDEConfig;
 class KDirMenu;
 class KIMContactMenu;
 class KIMProxy;
@@ -59,7 +59,7 @@ private:
      KIMProxy *m_proxy;
      KAction *m_browse;
      TQStringList list;
-     KConfig *conf;
+     TDEConfig *conf;
      TQString group;
      TQPtrList<KAction> actions;
 };
diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp
index 1b45791..16e11fd 100644
--- a/konq-plugins/kuick/kuick_plugin.cpp
+++ b/konq-plugins/kuick/kuick_plugin.cpp
@@ -58,14 +58,14 @@ void KTestMenu::slotPopupMaeh( ){
 }
 void KTestMenu::slotStartCopyJob( const TQString &path ) {
      KURL url = KURL::fromPathOrURL( path );
-     KIO::CopyJob *copy;
-     copy = KIO::copy( popup->popupURLList(), url);
+     TDEIO::CopyJob *copy;
+     copy = TDEIO::copy( popup->popupURLList(), url);
      copy->setAutoErrorHandlingEnabled( true );
 }
 void KTestMenu::slotStartMoveJob( const TQString &path) {
      KURL url = KURL::fromPathOrURL( path );
-     KIO::CopyJob *move;
-     move = KIO::move( popup->popupURLList(), url );
+     TDEIO::CopyJob *move;
+     move = TDEIO::move( popup->popupURLList(), url );
      move->setAutoErrorHandlingEnabled( true );
 }
 
diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp
index 38e5c5d..af2c58b 100644
--- a/konq-plugins/microformat/konqmficon.cpp
+++ b/konq-plugins/microformat/konqmficon.cpp
@@ -57,7 +57,7 @@ KonqMFIcon::KonqMFIcon(TQObject *parent, const char *name, const TQStringList &)
 void KonqMFIcon::waitPartToLoad() {
 	connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(addMFIcon()));
 	connect(m_part, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(addMFIcon())); // to make pages with metarefresh to work
-	connect(m_part, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(removeMFIcon()));
+	connect(m_part, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(removeMFIcon()));
 }
 
 
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index 82d35eb..5fd1047 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -113,7 +113,7 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name,
 
 SearchBarPlugin::~SearchBarPlugin()
 {
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("SearchBar");
 	config->writeEntry("Mode", (int) m_searchMode);
 	config->writeEntry("CurrentEngine", m_currentEngine);
@@ -125,7 +125,7 @@ SearchBarPlugin::~SearchBarPlugin()
 
 TQChar delimiter()
 {
-        KConfig config( "kuriikwsfilterrc", true, false );
+        TDEConfig config( "kuriikwsfilterrc", true, false );
         config.setGroup( "General" );
         return config.readNumEntry( "KeywordDelimiter", ':' );
 }
@@ -463,7 +463,7 @@ void SearchBarPlugin::searchEnginesSelected(TDEProcess *process)
 {
 	if(!process || process->exitStatus() == 0)
 	{
-		KConfig *config = kapp->config();
+		TDEConfig *config = kapp->config();
 		config->setGroup("SearchBar");
 		config->writeEntry("CurrentEngine", m_currentEngine);
 		config->sync();
@@ -474,7 +474,7 @@ void SearchBarPlugin::searchEnginesSelected(TDEProcess *process)
 
 void SearchBarPlugin::configurationChanged()
 {
-	KConfig *config = new KConfig("kuriikwsfilterrc");
+	TDEConfig *config = new TDEConfig("kuriikwsfilterrc");
 	config->setGroup("General");
 	TQString engine = config->readEntry("DefaultSearchEngine", "google");
 
@@ -627,7 +627,7 @@ void SearchBarCombo::show()
 void SearchBarPlugin::selectGoogleSuggestMode()
 {
 	m_googleMode = (GoogleMode)m_googleMenu->currentItem();
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("SearchBar");
 	config->writeEntry("GoogleSuggestMode", m_googleMode);
 	config->sync();
@@ -651,14 +651,14 @@ void SearchBarPlugin::gsMakeCompletionList()
 
 	if (!m_searchCombo->currentText().isEmpty())
 	{
-		KIO::TransferJob* tj =
-				KIO::get(KURL("http://www.google.com/complete/search?hl=en&js=true&qu=" + m_searchCombo->currentText()), false, false);
-		connect(tj, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), this, TQT_SLOT(gsDataArrived(KIO::Job*, const TQByteArray&)));
-		connect(tj, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(gsJobFinished(KIO::Job*)));
+		TDEIO::TransferJob* tj =
+				TDEIO::get(KURL("http://www.google.com/complete/search?hl=en&js=true&qu=" + m_searchCombo->currentText()), false, false);
+		connect(tj, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), this, TQT_SLOT(gsDataArrived(TDEIO::Job*, const TQByteArray&)));
+		connect(tj, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(gsJobFinished(TDEIO::Job*)));
 	}
 }
 
-void SearchBarPlugin::gsDataArrived(KIO::Job*, const TQByteArray& data)
+void SearchBarPlugin::gsDataArrived(TDEIO::Job*, const TQByteArray& data)
 {
 	m_gsData += TQString::fromUtf8(data.data());
 }
@@ -676,9 +676,9 @@ static TQString reformatNumber(const TQString& number)
 	return s;
 }
 
-void SearchBarPlugin::gsJobFinished(KIO::Job* job)
+void SearchBarPlugin::gsJobFinished(TDEIO::Job* job)
 {
-	if (((KIO::TransferJob*)job)->error() == 0)
+	if (((TDEIO::TransferJob*)job)->error() == 0)
 	{
 		TQString temp;
 		temp = m_gsData.mid(m_gsData.find('(') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1);
diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h
index fd1f846..bf01e21 100644
--- a/konq-plugins/searchbar/searchbar.h
+++ b/konq-plugins/searchbar/searchbar.h
@@ -159,8 +159,8 @@ class SearchBarPlugin : public KParts::Plugin
 		void selectGoogleSuggestMode();
 		void gsStartDelay();
 		void gsMakeCompletionList();
-		void gsDataArrived(KIO::Job*, const TQByteArray& data);
-		void gsJobFinished(KIO::Job* job);
+		void gsDataArrived(TDEIO::Job*, const TQByteArray& data);
+		void gsJobFinished(TDEIO::Job* job);
 		void gsSetCompletedText(const TQString& text);
 		void gsPutTextInBox(const TQString& text);
 
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 20aaa26..8a591b4 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -42,7 +42,7 @@
 #include <kconfig.h>
 #include <kinputdialog.h>
 
-MainWidget::MainWidget( KConfig * config, TQWidget * parent )
+MainWidget::MainWidget( TDEConfig * config, TQWidget * parent )
     : MainWidget_base( parent ), m_config( config )
 {
     loadTags();
@@ -93,12 +93,12 @@ void MainWidget::slotGetTags()
 {
     kdDebug() << k_funcinfo << endl;
 
-    KIO::StoredTransferJob * job = KIO::storedGet( "http://del.icio.us/api/tags/get" );
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-             this, TQT_SLOT( slotFillTags( KIO::Job * ) ) );
+    TDEIO::StoredTransferJob * job = TDEIO::storedGet( "http://del.icio.us/api/tags/get" );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQT_SLOT( slotFillTags( TDEIO::Job * ) ) );
 }
 
-void MainWidget::slotFillTags( KIO::Job * job )
+void MainWidget::slotFillTags( TDEIO::Job * job )
 {
     kdDebug() << k_funcinfo << endl;
 
@@ -113,7 +113,7 @@ void MainWidget::slotFillTags( KIO::Job * job )
 
     // fill lvTags with job->data()
     TQDomDocument doc;
-    doc.setContent( static_cast<KIO::StoredTransferJob *>( job )->data() );
+    doc.setContent( static_cast<TDEIO::StoredTransferJob *>( job )->data() );
     TQDomNodeList tags = doc.elementsByTagName( "tag" );
     for ( uint i = 0; i < tags.length(); ++i )
     {
@@ -134,12 +134,12 @@ void MainWidget::slotGetBookmarks()
 
     kdDebug() << k_funcinfo << url.url() << endl;
 
-    KIO::StoredTransferJob * job = KIO::storedGet( url );
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
-             this, TQT_SLOT( slotFillBookmarks( KIO::Job * ) ) );
+    TDEIO::StoredTransferJob * job = TDEIO::storedGet( url );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQT_SLOT( slotFillBookmarks( TDEIO::Job * ) ) );
 }
 
-void MainWidget::slotFillBookmarks( KIO::Job * job )
+void MainWidget::slotFillBookmarks( TDEIO::Job * job )
 {
     kdDebug() << k_funcinfo << endl;
 
@@ -153,7 +153,7 @@ void MainWidget::slotFillBookmarks( KIO::Job * job )
 
     // fill lvBookmarks with job->data()
     TQDomDocument doc;
-    doc.setContent( static_cast<KIO::StoredTransferJob *>( job )->data() );
+    doc.setContent( static_cast<TDEIO::StoredTransferJob *>( job )->data() );
     TQDomNodeList posts = doc.elementsByTagName( "post" );
 
     for ( uint i = 0; i < posts.length(); ++i )
@@ -308,7 +308,7 @@ void MainWidget::slotRenameTag()
             KURL url( "http://del.icio.us/api/tags/rename" );
             url.addQueryItem( "old", oldName );
             url.addQueryItem( "new", newName );
-            KIO::get( url );    // rename the tag
+            TDEIO::get( url );    // rename the tag
 
             tag->setName( newName );
         }
@@ -342,7 +342,7 @@ void MainWidget::slotDeleteBookmark()
             KURL url( "http://del.icio.us/api/posts/delete" );
             url.addQueryItem( "url", bookmark->url().url() );
             kdDebug() << k_funcinfo << url << endl;
-            KIO::get( url );
+            TDEIO::get( url );
 
             delete bookmark;
 
diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h
index 62d77bf..2621671 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.h
+++ b/konq-plugins/sidebar/delicious/mainWidget.h
@@ -30,7 +30,7 @@
 
 class TQStringList;
 class KURL;
-class KConfig;
+class TDEConfig;
 
 /**
  * Main widget of the del.icio.us bookmarks panel
@@ -40,7 +40,7 @@ class MainWidget: public MainWidget_base
     Q_OBJECT
   
 public:
-    MainWidget( KConfig * config, TQWidget * parent );
+    MainWidget( TDEConfig * config, TQWidget * parent );
     ~MainWidget();
 
     /**
@@ -76,7 +76,7 @@ private slots:
      * Fill the Tags listview with job->data()
      * (parses the XML returned by the server)
      */
-    void slotFillTags( KIO::Job * job );
+    void slotFillTags( TDEIO::Job * job );
 
     /**
      * Start the job to get the list of bookmarks
@@ -88,7 +88,7 @@ private slots:
      * Fill the Bookmarks listview with job->data()
      * (parses the XML returned by the server)
      */
-    void slotFillBookmarks( KIO::Job * job );
+    void slotFillBookmarks( TDEIO::Job * job );
 
     /**
      * Handle clicking on a bookmark (KDE mode)
@@ -170,7 +170,7 @@ private:
     TQTimer *m_updateTimer;
     KURL m_currentURL;
     TQStringList m_tags;
-    KConfig * m_config;
+    TDEConfig * m_config;
 };
 
 #endif
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index d2cd8c0..a6993ae 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -59,8 +59,8 @@ ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const
 ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name)
 {
   topWidgetName = parent->topLevelWidget()->name();
-  config = new KConfig("metabarrc");
-  iconConfig = new KConfig(locate("data", "metabar/iconsrc"));
+  config = new TDEConfig("metabarrc");
+  iconConfig = new TDEConfig(locate("data", "metabar/iconsrc"));
 
   setCaption(i18n("Configuration - Metabar"));
   setIcon(SmallIcon("metabar"));
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h
index 02f3600..3e10757 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.h
+++ b/konq-plugins/sidebar/metabar/src/configdialog.h
@@ -80,8 +80,8 @@ class ConfigDialog : public TQDialog
     
     TQPtrDict<LinkEntry> linkList;
     
-    KConfig *config;
-    KConfig *iconConfig;
+    TDEConfig *config;
+    TDEConfig *iconConfig;
     
   protected slots:
     void accept();
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index b199b58..3bcf924 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -84,10 +84,10 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node)
   KFileItem *item = m_items.getFirst();
   KURL url = item->url();
   
-  KConfig config("metabarrc", true, false);
+  TDEConfig config("metabarrc", true, false);
   config.setGroup("General");
   
-  KConfig iconConfig(locate("data", "metabar/iconsrc"));
+  TDEConfig iconConfig(locate("data", "metabar/iconsrc"));
   iconConfig.setGroup("Icons");
   
   DOM::DOMString innerHTML;
@@ -170,7 +170,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node)
         
         offers = KTrader::self()->query(item->mimetype(), "Type == 'Application'");
         if(!offers.isEmpty()){
-          KConfig config("metabarrc", true, false);
+          TDEConfig config("metabarrc", true, false);
           config.setGroup("General");
         
           int id = 0;
@@ -219,7 +219,7 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node)
     innerHTML += "<ul class=\"info\"><b>" + i18n("Type") + ": </b>";
     innerHTML += that->determineMimeType()->comment();
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Size") + ": </b>";
-    innerHTML += KIO::convertSize(item->size());
+    innerHTML += TDEIO::convertSize(item->size());
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("User") + ": </b>";
     innerHTML += item->user();
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Group") + ": </b>";
@@ -227,9 +227,9 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node)
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Permissions") + ": </b>";
     innerHTML += (item->permissionsString());
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Modified") + ": </b>";
-    innerHTML += item->timeString(KIO::UDS_MODIFICATION_TIME);
+    innerHTML += item->timeString(TDEIO::UDS_MODIFICATION_TIME);
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Accessed") + ": </b>";
-    innerHTML += item->timeString(KIO::UDS_ACCESS_TIME);
+    innerHTML += item->timeString(TDEIO::UDS_ACCESS_TIME);
     innerHTML += "</ul>";
         
     if(item->isLink()){
@@ -275,7 +275,7 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node)
     node.setInnerHTML(innerHTML);
   }
   else{
-    KIO::filesize_t size = 0;
+    TDEIO::filesize_t size = 0;
     int files = 0;
     int dirs  = 0;
     
@@ -292,7 +292,7 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node)
  
     DOM::DOMString innerHTML;
     innerHTML += "<ul class=\"info\"><b>" + i18n("Size") + ": </b>";
-    innerHTML += KIO::convertSize(size);
+    innerHTML += TDEIO::convertSize(size);
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Files") + ": </b>";
     innerHTML += TQString(TQString().setNum(files));
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Folders") + ": </b>";
@@ -334,11 +334,11 @@ void DefaultPlugin::loadPreview(DOM::HTMLElement node)
         
         //m_functions->show("preview");
       
-        preview_job = KIO::filePreview(KURL::List(url), m_html->view()->width() - 30);
+        preview_job = TDEIO::filePreview(KURL::List(url), m_html->view()->width() - 30);
           
         connect(preview_job, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(slotSetPreview(const KFileItem*, const TQPixmap&)));
         connect(preview_job, TQT_SIGNAL(failed(const KFileItem *)), this, TQT_SLOT(slotPreviewFailed(const KFileItem *)));
-        connect(preview_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobFinished(KIO::Job *)));
+        connect(preview_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobFinished(TDEIO::Job *)));
       }
       
       m_functions->show("preview");
@@ -404,7 +404,7 @@ void DefaultPlugin::slotPreviewFailed(const KFileItem *item)
   m_functions->hide("preview");
 }
 
-void DefaultPlugin::slotJobFinished(KIO::Job *job)
+void DefaultPlugin::slotJobFinished(TDEIO::Job *job)
 {
   if(preview_job && job == preview_job){
     preview_job = 0;
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.h b/konq-plugins/sidebar/metabar/src/defaultplugin.h
index 4df0ae0..b86b12e 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.h
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.h
@@ -52,14 +52,14 @@ class DefaultPlugin : public ProtocolPlugin
       
   private:
     TQMap<int,KService::Ptr> runMap;
-    KIO::PreviewJob *preview_job;
+    TDEIO::PreviewJob *preview_job;
     
     ServiceLoader *services;
     
   private slots:
     void slotSetPreview(const KFileItem*, const TQPixmap&);
     void slotPreviewFailed(const KFileItem *item);
-    void slotJobFinished(KIO::Job *item);
+    void slotJobFinished(TDEIO::Job *item);
 };
 
 #endif
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index 1aaf9e8..adf316c 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
@@ -95,7 +95,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
     DOM::DOMString att = isExpanded ? "false" : "true";
     node.setAttribute("expanded", att);
     
-    KConfig config("metabarrc");
+    TDEConfig config("metabarrc");
     config.setGroup("General");
     
     if(config.readBoolEntry("AnimateResize", false)){
@@ -126,7 +126,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
     if(isExpanded){
       int height = getHeight(node);
       
-      KConfig config("metabarrc");
+      TDEConfig config("metabarrc");
       config.setGroup("General");
     
       if(config.readBoolEntry("AnimateResize", false)){
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 9fe8c86..50749eb 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -81,7 +81,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   currentItems = new KFileItemList;
   currentItems->setAutoDelete(true);
   
-  config = new KConfig("metabarrc");
+  config = new TDEConfig("metabarrc");
   
   dir_watch = new KDirWatch();
   connect(dir_watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&)));
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index 9874c29..bf9c7ad 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -51,7 +51,7 @@ class MetabarWidget : public TQWidget
     
   private:
     KFileItemList *currentItems;
-    KConfig *config;
+    TDEConfig *config;
 
     KHTMLPart *html;
     
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index 8daf5ba..38d0bba 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -112,13 +112,13 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
   }
 
   if(!size.isNull()){
-    KIO::filesize_t s = 0;
+    TDEIO::filesize_t s = 0;
     
     for(KFileItemListIterator it(m_items); it.current(); ++it){
       s += (*it)->size();
     }
 
-    size.setInnerText(KIO::convertSize(s));
+    size.setInnerText(TDEIO::convertSize(s));
   }
   
   if(!actions.isNull()){
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index fd8c02b..af04017 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -58,7 +58,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
   urlList.append(url);
   
   TQStringList dirs = TDEGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" );
-  KConfig config("metabarrc", true, false);
+  TDEConfig config("metabarrc", true, false);
   config.setGroup("General");
   int maxActions = config.readNumEntry("MaxActions");
   bool matchAll = false; // config.readBoolEntry("MatchAll");
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
index 76853c6..95c5119 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
@@ -57,9 +57,9 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node)
   KURL url = m_items.getFirst()->url();
   
   if(url.path().endsWith("/")){
-    list_job = KIO::listDir(url, true, false);
-    connect(list_job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), this, TQT_SLOT(slotGotEntries(KIO::Job *, const KIO::UDSEntryList &)));
-    connect(list_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobFinished(KIO::Job *)));
+    list_job = TDEIO::listDir(url, true, false);
+    connect(list_job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), this, TQT_SLOT(slotGotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
+    connect(list_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobFinished(TDEIO::Job *)));
   
     m_functions->show("actions");
   }
@@ -69,7 +69,7 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node)
     
     KService::Ptr service = KService::serviceByStorageId(name);
     if(service && service->isValid()){
-      KCModuleInfo kcminfo(service);
+      TDECModuleInfo kcminfo(service);
       
       DOM::DOMString innerHTML;      
       MetabarWidget::addEntry(innerHTML, i18n("Run"), "kcmshell:/" + name, kcminfo.icon());
@@ -95,7 +95,7 @@ void SettingsPlugin::loadInformation(DOM::HTMLElement node)
     
     KService::Ptr service = KService::serviceByStorageId(name);
     if(service && service->isValid()){
-      KCModuleInfo kcminfo(service);
+      TDECModuleInfo kcminfo(service);
       
       bool needsRoot = kcminfo.needsRootPrivileges();
     
@@ -141,7 +141,7 @@ bool SettingsPlugin::handleRequest(const KURL &)
   return false;
 }
 
-void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list)
+void SettingsPlugin::slotGotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &list)
 {
   if(!job){
     return;
@@ -151,28 +151,28 @@ void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list
   DOM::HTMLElement node = doc.getElementById("actions");
   DOM::DOMString innerHTML;
   
-  KIO::UDSEntryList::ConstIterator it     = list.begin();
-  KIO::UDSEntryList::ConstIterator it_end = list.end();
+  TDEIO::UDSEntryList::ConstIterator it     = list.begin();
+  TDEIO::UDSEntryList::ConstIterator it_end = list.end();
   for(; it != it_end; ++it){
     TQString name;
     TQString icon;
     TQString url;
     long type;
   
-    KIO::UDSEntry::ConstIterator atomit     = (*it).begin();
-    KIO::UDSEntry::ConstIterator atomit_end = (*it).end();
+    TDEIO::UDSEntry::ConstIterator atomit     = (*it).begin();
+    TDEIO::UDSEntry::ConstIterator atomit_end = (*it).end();
     for(; atomit != atomit_end; ++atomit){
-      if((*atomit).m_uds == KIO::UDS_NAME){
+      if((*atomit).m_uds == TDEIO::UDS_NAME){
         name = (*atomit).m_str;
       }
-      else if((*atomit).m_uds == KIO::UDS_ICON_NAME){
+      else if((*atomit).m_uds == TDEIO::UDS_ICON_NAME){
         icon = (*atomit).m_str;
       }
-      else if((*atomit).m_uds == KIO::UDS_URL){
+      else if((*atomit).m_uds == TDEIO::UDS_URL){
         url = (*atomit).m_str;
       }
       
-      else if((*atomit).m_uds == KIO::UDS_FILE_TYPE){
+      else if((*atomit).m_uds == TDEIO::UDS_FILE_TYPE){
         type = (*atomit).m_long;
       }
     }
@@ -189,7 +189,7 @@ void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list
   node.setInnerHTML(innerHTML);
 }
 
-void SettingsPlugin::slotJobFinished(KIO::Job *job)
+void SettingsPlugin::slotJobFinished(TDEIO::Job *job)
 {
   if(list_job && job == list_job){
     list_job = 0;
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.h b/konq-plugins/sidebar/metabar/src/settingsplugin.h
index 609be74..c8580de 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.h
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.h
@@ -47,11 +47,11 @@ class SettingsPlugin : public ProtocolPlugin
     void loadBookmarks(DOM::HTMLElement node);
     
   private:
-    KIO::ListJob *list_job;
+    TDEIO::ListJob *list_job;
     
   private slots:
-    void slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list);
-    void slotJobFinished(KIO::Job *job);
+    void slotGotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &list);
+    void slotJobFinished(TDEIO::Job *job);
 };
 
 #endif
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp
index 9af7e65..8419dff 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.cpp
+++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp
@@ -57,11 +57,11 @@ namespace KSB_News {
     // 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"))
+    if (TDEConfigDialog::showDialog("settings"))
       return;
 
-    // KConfigDialog didn't find an instance of this dialog, so lets create it
-    m_confdlg = new KConfigDialog(this, "settings", SidebarSettings::self(),
+    // TDEConfigDialog didn't find an instance of this dialog, so lets create it
+    m_confdlg = new TDEConfigDialog(this, "settings", SidebarSettings::self(),
                                   KDialogBase::Plain,
                                   KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Default,
                                   KDialogBase::Ok,
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.h b/konq-plugins/sidebar/newsticker/norsswidget.h
index 62dd437..1bea54c 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.h
+++ b/konq-plugins/sidebar/newsticker/norsswidget.h
@@ -26,7 +26,7 @@
 #define _NORSSWIDGET_H_
 
 
-class KConfigDialog;
+class TDEConfigDialog;
 
 
 namespace KSB_News {
@@ -43,7 +43,7 @@ namespace KSB_News {
     void slotConfigure_okClicked();
 
   private:
-    KConfigDialog *m_confdlg;
+    TDEConfigDialog *m_confdlg;
   };
 
 
diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h
index 2f054bd..6a3ee73 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.h
+++ b/konq-plugins/sidebar/newsticker/nspanel.h
@@ -67,7 +67,7 @@ namespace KSB_News {
     void setListbox(TTListBox *lb);
     void setPixmap(const TQPixmap &pm);
     void setPixmapBuffer(TQBuffer *buf);
-    void setJob(KIO::Job *kio_job);
+    void setJob(TDEIO::Job *kio_job);
 
     TTListBox *listbox() const;
     TQPixmap pixmap();
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index 30aedb4..ecbad6c 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -244,11 +244,11 @@ namespace KSB_News {
     // 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"))
+    if (TDEConfigDialog::showDialog("settings"))
       return;
 
-    // KConfigDialog didn't find an instance of this dialog, so lets create it
-    m_confdlg = new KConfigDialog(this, "settings", SidebarSettings::self(),
+    // TDEConfigDialog didn't find an instance of this dialog, so lets create it
+    m_confdlg = new TDEConfigDialog(this, "settings", SidebarSettings::self(),
                                   KDialogBase::Plain,
                                   KDialogBase::Ok|KDialogBase::Cancel| \
                                                   KDialogBase::Default| \
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
index 53934f4..2be171f 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
@@ -39,7 +39,7 @@ class KPopupMenu;
 class TDEAboutData;
 class KAboutApplication;
 class KBugReport;
-class KConfigDialog;
+class TDEConfigDialog;
 
 namespace KSB_News {
 
@@ -81,7 +81,7 @@ namespace KSB_News {
     KAboutApplication *m_about;
     KBugReport *m_bugreport;
     TQPushButton *m_last_button_rightclicked;
-    KConfigDialog *m_confdlg;
+    TDEConfigDialog *m_confdlg;
     TQStringList m_our_rsssources;
   };
 
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index f26e064..8c8e9c3 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -68,8 +68,8 @@ UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name,
   if ( parent && parent->inherits( "KHTMLPart" ) )
   {
     m_part = static_cast<KHTMLPart*>(parent);
-    connect( m_part, TQT_SIGNAL(started(KIO::Job*)), this,
-             TQT_SLOT(slotStarted(KIO::Job*)) );
+    connect( m_part, TQT_SIGNAL(started(TDEIO::Job*)), this,
+             TQT_SLOT(slotStarted(TDEIO::Job*)) );
   }
 }
 
@@ -179,7 +179,7 @@ void UAChangerPlugin::parseDescFiles()
   }
 }
 
-void UAChangerPlugin::slotStarted( KIO::Job* )
+void UAChangerPlugin::slotStarted( TDEIO::Job* )
 {
   m_currentURL = m_part->url();
 
@@ -201,7 +201,7 @@ void UAChangerPlugin::slotAboutToShow()
 {
   if (!m_config)
   {
-    m_config = new KConfig( "kio_httprc" );
+    m_config = new TDEConfig( "kio_httprc" );
     parseDescFiles();
   }
 
@@ -336,7 +336,7 @@ void UAChangerPlugin::slotDefault()
 void UAChangerPlugin::updateIOSlaves ()
 {
   // Inform running http(s) io-slaves about the change...
-  if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString()))
+  if (!DCOPRef("*", "TDEIO::Scheduler").send("reparseSlaveConfiguration", TQString()))
     kdWarning() << "UAChangerPlugin::updateIOSlaves: Unable to update running application!" << endl;
 }
 
@@ -413,7 +413,7 @@ void UAChangerPlugin::saveSettings()
 {
   if(!m_bSettingsLoaded) return;
 
-  KConfig cfg ("uachangerrc", false, false);
+  TDEConfig cfg ("uachangerrc", false, false);
   cfg.setGroup ("General");
 
   cfg.writeEntry ("applyToDomain", m_bApplyToDomain);
@@ -421,7 +421,7 @@ void UAChangerPlugin::saveSettings()
 
 void UAChangerPlugin::loadSettings()
 {
-  KConfig cfg ("uachangerrc", false, false);
+  TDEConfig cfg ("uachangerrc", false, false);
   cfg.setGroup ("General");
 
   m_bApplyToDomain = cfg.readBoolEntry ("applyToDomain", true);
diff --git a/konq-plugins/uachanger/uachangerplugin.h b/konq-plugins/uachanger/uachangerplugin.h
index 77bb73f..9aaff84 100644
--- a/konq-plugins/uachanger/uachangerplugin.h
+++ b/konq-plugins/uachanger/uachangerplugin.h
@@ -31,9 +31,9 @@
 
 class KHTMLPart;
 class KActionMenu;
-class KConfig;
+class TDEConfig;
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
 }
@@ -57,7 +57,7 @@ protected slots:
   void slotAboutToShow();
   void slotApplyToDomain();
   void slotItemSelected(int);
-  void slotStarted(KIO::Job*);
+  void slotStarted(TDEIO::Job*);
   void slotReloadDescriptions();
 
 protected:
@@ -74,7 +74,7 @@ private:
 
   KHTMLPart* m_part;
   KActionMenu* m_pUAMenu;
-  KConfig* m_config;
+  TDEConfig* m_config;
 
   KURL m_currentURL;
   TQString m_currentUserAgent;
diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp
index 9175402..3d1a6ab 100644
--- a/konq-plugins/validators/plugin_validators.cpp
+++ b/konq-plugins/validators/plugin_validators.cpp
@@ -82,8 +82,8 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name,
       m_configDialog = new ValidatorsDialog( m_part->widget() );
       setURLs();
 
-      connect( m_part, TQT_SIGNAL(started(KIO::Job*)), this,
-             TQT_SLOT(slotStarted(KIO::Job*)) );
+      connect( m_part, TQT_SIGNAL(started(TDEIO::Job*)), this,
+             TQT_SLOT(slotStarted(TDEIO::Job*)) );
     }
 }
 
@@ -109,7 +109,7 @@ void PluginValidators::setURLs()
   m_linkValidatorUrl = KURL(m_configDialog->getLinkValidatorUrl());
 }
 
-void PluginValidators::slotStarted( KIO::Job* )
+void PluginValidators::slotStarted( TDEIO::Job* )
 {
   // The w3c validator can only access http URLs, and upload local files.
   // No https, probably no webdav either.
diff --git a/konq-plugins/validators/plugin_validators.h b/konq-plugins/validators/plugin_validators.h
index d004a83..7cdf2bc 100644
--- a/konq-plugins/validators/plugin_validators.h
+++ b/konq-plugins/validators/plugin_validators.h
@@ -54,7 +54,7 @@ public slots:
   void slotConfigure();
 
 private slots:
-  void slotStarted( KIO::Job* );
+  void slotStarted( TDEIO::Job* );
 
 private:
   KActionMenu *m_menu;
diff --git a/konq-plugins/validators/validatorsdialog.cpp b/konq-plugins/validators/validatorsdialog.cpp
index 864de55..e23b091 100644
--- a/konq-plugins/validators/validatorsdialog.cpp
+++ b/konq-plugins/validators/validatorsdialog.cpp
@@ -93,7 +93,7 @@ ValidatorsDialog::~ValidatorsDialog()
 
 void ValidatorsDialog::load()
 {
-  m_config = new KConfig("validatorsrc");
+  m_config = new TDEConfig("validatorsrc");
   m_config->setGroup("Addresses");
 
   m_WWWValidatorCB->insertStringList(m_config->readListEntry("WWWValidatorUrl"));
diff --git a/konq-plugins/validators/validatorsdialog.h b/konq-plugins/validators/validatorsdialog.h
index 84c0e1b..4d219e7 100644
--- a/konq-plugins/validators/validatorsdialog.h
+++ b/konq-plugins/validators/validatorsdialog.h
@@ -53,7 +53,7 @@ class ValidatorsDialog : public KDialogBase
   TQComboBox *m_CSSValidatorCB;
   TQComboBox *m_CSSValidatorUploadCB;
   TQComboBox *m_linkValidatorCB;
-  KConfig *m_config;
+  TDEConfig *m_config;
 };
 
 #endif
diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index 891e0de..0a3e6a6 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -444,9 +444,9 @@ void ArchiveDialog::downloadNext()
       kdDebug(90110) << "downloading: " << url.url() <<  " to: " << m_tmpFile->name() << endl;
       KURL dsturl;
       dsturl.setPath(m_tmpFile->name());
-      KIO::Job *job=KIO::file_copy(url, dsturl, -1, false, false, false);
+      TDEIO::Job *job=TDEIO::file_copy(url, dsturl, -1, false, false, false);
       job->addMetaData("cache", "cache"); // Use entry from cache if available.
-      connect(job, TQT_SIGNAL(result( KIO::Job *)), this, TQT_SLOT(finishedDownloadingURL( KIO::Job *)) );
+      connect(job, TQT_SIGNAL(result( TDEIO::Job *)), this, TQT_SLOT(finishedDownloadingURL( TDEIO::Job *)) );
 
       m_currentLVI=new TQListViewItem(m_widget->listView, url.prettyURL());
       m_widget->listView->insertItem( m_currentLVI );
@@ -457,7 +457,7 @@ void ArchiveDialog::downloadNext()
 #endif
 }
 
-void ArchiveDialog::finishedDownloadingURL( KIO::Job *job )
+void ArchiveDialog::finishedDownloadingURL( TDEIO::Job *job )
 {
    if ( job->error() )
    {
diff --git a/konq-plugins/webarchiver/archivedialog.h b/konq-plugins/webarchiver/archivedialog.h
index 1f40339..c882529 100644
--- a/konq-plugins/webarchiver/archivedialog.h
+++ b/konq-plugins/webarchiver/archivedialog.h
@@ -50,7 +50,7 @@ public:
    void archive();
 
 public slots:
-   void finishedDownloadingURL( KIO::Job *job );
+   void finishedDownloadingURL( TDEIO::Job *job );
    void setSavingState();
 protected:
    void saveFile( const TQString& fileName);
diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp
index 4f8a0c3..a9d29f1 100644
--- a/ksig/ksig.cpp
+++ b/ksig/ksig.cpp
@@ -128,9 +128,9 @@ void KSig::loadData()
 void KSig::readConfig()
 {
     setAutoSaveSettings();
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     {
-	KConfigGroupSaver saver(config, "Settings");
+	TDEConfigGroupSaver saver(config, "Settings");
 	if(splitter) {
 	    TQValueList<int> sizes;
 
@@ -148,9 +148,9 @@ void KSig::readConfig()
 
 void KSig::writeConfig()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     {
-	KConfigGroupSaver saver(config, "Settings");
+	TDEConfigGroupSaver saver(config, "Settings");
 	if(splitter) {
 	    TQValueList<int> sizes = splitter->sizes();
 
diff --git a/ksig/siggenerator.cpp b/ksig/siggenerator.cpp
index aa2a7f3..9617742 100644
--- a/ksig/siggenerator.cpp
+++ b/ksig/siggenerator.cpp
@@ -36,9 +36,9 @@ SigGenerator::SigGenerator()
 	file.close();
     }
 
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     {
-	KConfigGroupSaver saver(config, "Settings");
+	TDEConfigGroupSaver saver(config, "Settings");
 	header = config->readEntry("Header");
 	footer = config->readEntry("Footer");
     }
diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp
index 9bcffc8..e62ddc8 100644
--- a/noatun-plugins/alarm/wakeup.cpp
+++ b/noatun-plugins/alarm/wakeup.cpp
@@ -67,7 +67,7 @@ Wakeup::~Wakeup()
 
 void Wakeup::update()
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup("Noatun Alarm");
 
 	hour[0]=config->readNumEntry("Hour1",7);
@@ -287,7 +287,7 @@ void WakeupPrefs::slotViewFrame(int state)
 
 void WakeupPrefs::save()
 {
-	KConfig *config=TDEGlobal::config();
+	TDEConfig *config=TDEGlobal::config();
 	config->setGroup("Noatun Alarm");
 	config->writeEntry("Monday",monday->isChecked());
 	config->writeEntry("Tuesday",tuesday->isChecked());
diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp
index 9271616..a619a0e 100644
--- a/noatun-plugins/alsaplayer/configmodule.cpp
+++ b/noatun-plugins/alsaplayer/configmodule.cpp
@@ -53,7 +53,7 @@ AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent)
   void
 AlsaPlayerConfigModule::save()
 {
-  KConfig * c(TDEGlobal::config());
+  TDEConfig * c(TDEGlobal::config());
   c->setGroup("AlsaPlayerInterface");
   c->writeEntry("ScrollTitle", scroll_->isChecked());
   c->sync();
@@ -63,7 +63,7 @@ AlsaPlayerConfigModule::save()
   void
 AlsaPlayerConfigModule::reopen()
 {
-  KConfig * c(TDEGlobal::config());
+  TDEConfig * c(TDEGlobal::config());
   c->setGroup("AlsaPlayerInterface");
   scroll_->setChecked(c->readBoolEntry("ScrollTitle", true));
 }
diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp
index 08056ae..b48f011 100644
--- a/noatun-plugins/charlatan/configmodule.cpp
+++ b/noatun-plugins/charlatan/configmodule.cpp
@@ -53,7 +53,7 @@ CharlatanConfigModule::CharlatanConfigModule(TQObject * parent)
   void
 CharlatanConfigModule::save()
 {
-  KConfig * c(TDEGlobal::config());
+  TDEConfig * c(TDEGlobal::config());
   c->setGroup("CharlatanInterface");
   c->writeEntry("ScrollTitle", scroll_->isChecked());
   c->sync();
@@ -63,7 +63,7 @@ CharlatanConfigModule::save()
   void
 CharlatanConfigModule::reopen()
 {
-  KConfig * c(TDEGlobal::config());
+  TDEConfig * c(TDEGlobal::config());
   c->setGroup("CharlatanInterface");
   scroll_->setChecked(c->readBoolEntry("ScrollTitle", true));
 }
diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index b708f02..91cff44 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -394,7 +394,7 @@ void Charlatan::slotTimeout()
 
 void Charlatan::loadConfig()
 {
-	KConfig * c(TDEGlobal::config());
+	TDEConfig * c(TDEGlobal::config());
 	c->setGroup("CharlatanInterface");
 	titleLabel_->setScroll(c->readBoolEntry("ScrollTitle", true));
 }
diff --git a/noatun-plugins/dub/dub/dubapp.h b/noatun-plugins/dub/dub/dubapp.h
index 670a758..0c4f27d 100644
--- a/noatun-plugins/dub/dub/dubapp.h
+++ b/noatun-plugins/dub/dub/dubapp.h
@@ -59,7 +59,7 @@ protected:
   virtual void closeEvent(TQCloseEvent*e);
 
 private:
-  KConfig *config;
+  TDEConfig *config;
   /** view is the main widget which represents your working area. The View
    * class should handle all events of the view widget.  It is kept empty so
    * you can create your view according to your application's needs by
diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp
index 970e9ad..9e81d45 100644
--- a/noatun-plugins/dub/dub/dubconfigmodule.cpp
+++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp
@@ -47,7 +47,7 @@ DubConfigModule::~DubConfigModule()
 
 void DubConfigModule::save(void)
 {
-  KConfig* config(TDEGlobal::config());
+  TDEConfig* config(TDEGlobal::config());
   config->setGroup("DubPlaylist");
 
   mediaDirectory = prefs->mediaDirectory->url();
@@ -81,7 +81,7 @@ void DubConfigModule::save(void)
 void DubConfigModule::reopen(void)
 {
   kdDebug(90010) << "dubconfig: reopen" << endl;
-  KConfig* config(TDEGlobal::config());
+  TDEConfig* config(TDEGlobal::config());
   config->setGroup("DubPlaylist");
   mediaDirectory = config->readPathEntry("MediaDirectory", "~/");
   kdDebug(90010) << "dub: media home is " << mediaDirectory << endl;
diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp
index 706ade4..a562751 100644
--- a/noatun-plugins/ffrs/ffrs.cpp
+++ b/noatun-plugins/ffrs/ffrs.cpp
@@ -30,7 +30,7 @@ View::View(int width, int height, int block, int unblock, TQColor front, TQColor
 	setPaletteBackgroundColor(back);
 	KWin::setState(handle(), NET::SkipTaskbar);
 
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 
 	TQSize size = napp->desktop()->size();
@@ -80,7 +80,7 @@ View::View(int width, int height, int block, int unblock, TQColor front, TQColor
 
 View::~View()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	c->writeEntry("at"+TQString::number(mChannel), pos());
 }
@@ -234,7 +234,7 @@ FFRSPrefs::FFRSPrefs( TQObject *parent )
 
 void FFRSPrefs::save()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 
 	c->setGroup("FFRS");
 	c->writeEntry("width", mWidth->value());
@@ -251,35 +251,35 @@ void FFRSPrefs::save()
 
 int FFRSPrefs::width()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	return c->readNumEntry("width", 22);
 }
 
 int FFRSPrefs::height()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	return c->readNumEntry("height", 162);
 }
 
 int FFRSPrefs::fgblock()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	return c->readNumEntry("fgblock", 27-12);
 }
 
 int FFRSPrefs::bgblock()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	return c->readNumEntry("bgblock", 12);
 }
 
 int FFRSPrefs::rate()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	return c->readNumEntry("rate", 110);
 }
@@ -287,7 +287,7 @@ int FFRSPrefs::rate()
 
 TQColor FFRSPrefs::bgcolor()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	TQColor dumbass(0, 64, 0);
 	return c->readColorEntry("bgcolor", &dumbass);
@@ -295,7 +295,7 @@ TQColor FFRSPrefs::bgcolor()
 
 TQColor FFRSPrefs::fgcolor()
 {
-	KConfig *c = napp->config();
+	TDEConfig *c = napp->config();
 	c->setGroup("FFRS");
 	TQColor dumbass(0, 255, 0);
 	return c->readColorEntry("fgcolor", &dumbass);
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 1f94dcd..3d5f677 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -178,7 +178,7 @@ void LyricsCModule::queryChanged( const TQString &query ) {
 
 
 void LyricsCModule::save() {
-  KConfig *conf = TDEGlobal::config();
+  TDEConfig *conf = TDEGlobal::config();
   conf->setGroup( "Lyrics" );
   TQStringList queryList, nameList;
   TQValueVector<SearchProvider>::iterator it;
@@ -197,7 +197,7 @@ void LyricsCModule::save() {
 
 void LyricsCModule::reopen() {
   TQStringList queryList, nameList;
-  KConfig *conf = TDEGlobal::config();
+  TDEConfig *conf = TDEGlobal::config();
   mProviders.clear();
   providersBox->clear();
   kdDebug(90020) << "config read" << endl;
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index 9fa4921..cd6754b 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -54,7 +54,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
 
   /* Connect signals/slots */
 	connect( htmlpart->browserExtension(), TQT_SIGNAL(openURLRequestDelayed( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs & )));
-  connect( htmlpart, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(loadingURL(KIO::Job *)) );
+  connect( htmlpart, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(loadingURL(TDEIO::Job *)) );
   connect( htmlpart, TQT_SIGNAL(completed()), this, TQT_SLOT(loadedURL()) );
   connect( history, TQT_SIGNAL(uiChanged(int, bool)), this, TQT_SLOT(changeUI(int, bool)) );
   connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()) );
@@ -69,7 +69,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
   setAutoSaveSettings("Lyrics");
 
   /* Load configuration */
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("Lyrics");
   follow_act->setChecked(config->readBoolEntry("follow", true));
   /* Create config object */
@@ -112,7 +112,7 @@ void Lyrics::attach(bool a) {
   }
 }
 
-void Lyrics::loadingURL(KIO::Job *)
+void Lyrics::loadingURL(TDEIO::Job *)
 {
   statusBar()->changeItem(i18n("Loading..."), 0);
 }
@@ -245,7 +245,7 @@ void Lyrics::openURLRequest( const KURL &url, const KParts::URLArgs & )
 Lyrics::~Lyrics()
 {
   /* Save configurations */
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("Lyrics");
   config->writeEntry("follow", follow_act->isChecked());
   // Force saving, as closeEvent is probably never called
diff --git a/noatun-plugins/lyrics/lyrics.h b/noatun-plugins/lyrics/lyrics.h
index 8da656c..c41e186 100644
--- a/noatun-plugins/lyrics/lyrics.h
+++ b/noatun-plugins/lyrics/lyrics.h
@@ -33,7 +33,7 @@ protected:
 protected slots:
   void changeUI(int, bool);
   void openURLRequest( const KURL &, const KParts::URLArgs & );
-  void loadingURL(KIO::Job *);
+  void loadingURL(TDEIO::Job *);
   void loadedURL();
   void attach(bool);
   void newSong();
diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp
index ec3485e..15e0520 100644
--- a/noatun-plugins/oblique/kdatacollection.cpp
+++ b/noatun-plugins/oblique/kdatacollection.cpp
@@ -28,7 +28,7 @@
 
 
 KDataCollection::KDataCollection(
-		KConfig *config, const TQString &group, const TQString &entry,
+		TDEConfig *config, const TQString &group, const TQString &entry,
 		const char *datadir, const TQString &dir
 	)
 {
@@ -36,7 +36,7 @@ KDataCollection::KDataCollection(
 }
 
 KDataCollection::KDataCollection(
-		KConfig *config, const TQString &group, const TQString &entry,
+		TDEConfig *config, const TQString &group, const TQString &entry,
 		const TQString &dir
 	)
 {
@@ -44,13 +44,13 @@ KDataCollection::KDataCollection(
 }
 
 KDataCollection::KDataCollection(
-		KConfig *config, const TQString &group, const TQString &dir
+		TDEConfig *config, const TQString &group, const TQString &dir
 	)
 {
 	init(config, group, dir, "appdata", dir);
 }
 
-KDataCollection::KDataCollection(KConfig *config, const TQString &dir)
+KDataCollection::KDataCollection(TDEConfig *config, const TQString &dir)
 {
 	init(config, "KDataCollection", dir, "appdata", dir);
 }
@@ -61,7 +61,7 @@ KDataCollection::KDataCollection(const TQString &dir)
 }
 
 void KDataCollection::init(
-		KConfig *config, const TQString &group, const TQString &entry,
+		TDEConfig *config, const TQString &group, const TQString &entry,
 		const char *datadir, const TQString &dir
 	)
 {
@@ -74,7 +74,7 @@ void KDataCollection::init(
 
 TQStringList KDataCollection::names() const
 {
-	KConfigGroup g(mConfig, mGroup);
+	TDEConfigGroup g(mConfig, mGroup);
 
 	// these are the entries I have
 	TQStringList n = g.readListEntry(mEntry);
@@ -96,7 +96,7 @@ TQStringList KDataCollection::names() const
 
 void KDataCollection::remove(const TQString &name)
 {
-	KConfigGroup g(mConfig, mGroup);
+	TDEConfigGroup g(mConfig, mGroup);
 	TQString location = file(name);
 	if (location.isEmpty()) return;
 	if (location == saveFile(name, false))
diff --git a/noatun-plugins/oblique/kdatacollection.h b/noatun-plugins/oblique/kdatacollection.h
index 6230ddb..71a9ea7 100644
--- a/noatun-plugins/oblique/kdatacollection.h
+++ b/noatun-plugins/oblique/kdatacollection.h
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-class KConfig;
+class TDEConfig;
 
 /**
  * This class allows you to have a set of files.  Some of which can be included
@@ -45,7 +45,7 @@ class KConfig;
  **/
 class KDataCollection
 {
-	KConfig *mConfig;
+	TDEConfig *mConfig;
 	TQString mGroup, mEntry, mDir;
 	const char *mDatadir;
 
@@ -60,7 +60,7 @@ public:
 	 * @param datadir is what is passed to locate, this is "appdata" by default
 	 **/
 	KDataCollection(
-			KConfig *config, const TQString &group, const TQString &entry,
+			TDEConfig *config, const TQString &group, const TQString &entry,
 			const char *datadir, const TQString &dir
 		);
 
@@ -69,32 +69,32 @@ public:
 	 * settings, @p dir is the second argument to locate("appdata", ...)
 	 **/
 	KDataCollection(
-			KConfig *config, const TQString &group, const TQString &entry,
+			TDEConfig *config, const TQString &group, const TQString &entry,
 			const TQString &dir
 		);
 
 	/**
-	 * constructor.  The entry in the KConfig group will be named the same as
+	 * constructor.  The entry in the TDEConfig group will be named the same as
 	 * @p dir.
 	 *
 	 * otherwise the same as the previous function
 	 **/
 	KDataCollection(
-			KConfig *config, const TQString &group,
+			TDEConfig *config, const TQString &group,
 			const TQString &dir
 		);
 
 	/**
 	 * constructor.  The group will be "KDataCollection", The entry in the
-	 * KConfig group will be named the same as
+	 * TDEConfig group will be named the same as
 	 * @p dir.
 	 *
 	 * otherwise the same as the previous function
 	 **/
-	KDataCollection(KConfig *config, const TQString &dir);
+	KDataCollection(TDEConfig *config, const TQString &dir);
 
 	/**
-	 * constructor.  the KConfig is assumed to be TDEGlobal::config()
+	 * constructor.  the TDEConfig is assumed to be TDEGlobal::config()
 	 *
 	 * otherwise the same as the previous function
 	 **/
@@ -136,7 +136,7 @@ public:
 
 private:
 	void init(
-			KConfig *config, const TQString &group, const TQString &entry,
+			TDEConfig *config, const TQString &group, const TQString &entry,
 			const char *datadir, const TQString &dir
 		);
 };
diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp
index 4b2b543..f25338a 100644
--- a/noatun-plugins/oblique/oblique.cpp
+++ b/noatun-plugins/oblique/oblique.cpp
@@ -30,7 +30,7 @@ Oblique::Oblique()
 	mView = 0;
 	mAdder = 0;
 	
-	KConfigGroup g(TDEGlobal::config(), "oblique");
+	TDEConfigGroup g(TDEGlobal::config(), "oblique");
 
 	mBase = new Base(::locate("data", "noatun/")+"/oblique-list");
 
@@ -263,25 +263,25 @@ void DirectoryAdder::addNextPending()
 	if (!listJob &&	(pendingIt!= pendingAddDirectories.end()))
 	{
 		currentJobURL= *pendingIt;
-		listJob = KIO::listDir(currentJobURL, false, false);
+		listJob = TDEIO::listDir(currentJobURL, false, false);
 		connect(
-				listJob, TQT_SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)),
-				TQT_SLOT(slotEntries(KIO::Job*, const KIO::UDSEntryList&))
+				listJob, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)),
+				TQT_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&))
 			);
 		connect(
-				listJob, TQT_SIGNAL(result(KIO::Job *)),
-				TQT_SLOT(slotResult(KIO::Job *))
+				listJob, TQT_SIGNAL(result(TDEIO::Job *)),
+				TQT_SLOT(slotResult(TDEIO::Job *))
 			);
 		connect(
-				listJob, TQT_SIGNAL(redirection(KIO::Job *, const KURL &)),
-				TQT_SLOT(slotRedirection(KIO::Job *, const KURL &))
+				listJob, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)),
+				TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &))
 			);
 		pendingAddDirectories.remove(pendingIt);
 		lastAddedSubDirectory = pendingAddDirectories.begin();
 	}
 }
 
-void DirectoryAdder::slotResult(KIO::Job *job)
+void DirectoryAdder::slotResult(TDEIO::Job *job)
 {
 	listJob= 0;
 	if (job && job->error())
@@ -291,12 +291,12 @@ void DirectoryAdder::slotResult(KIO::Job *job)
 		emit done();
 }
 
-void DirectoryAdder::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries)
+void DirectoryAdder::slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &entries)
 {
 	TQMap<TQString,KURL> __list; // temp list to sort entries
 
-	KIO::UDSEntryListConstIterator it = entries.begin();
-	KIO::UDSEntryListConstIterator end = entries.end();
+	TDEIO::UDSEntryListConstIterator it = entries.begin();
+	TDEIO::UDSEntryListConstIterator end = entries.end();
 
 	for (; it != end; ++it)
 	{
@@ -316,7 +316,7 @@ void DirectoryAdder::slotEntries(KIO::Job *, const KIO::UDSEntryList &entries)
 	}
 }
 
-void DirectoryAdder::slotRedirection(KIO::Job *, const KURL & url)
+void DirectoryAdder::slotRedirection(TDEIO::Job *, const KURL & url)
 {
 	currentJobURL= url;
 }
diff --git a/noatun-plugins/oblique/oblique.h b/noatun-plugins/oblique/oblique.h
index ad068f1..f5c1798 100644
--- a/noatun-plugins/oblique/oblique.h
+++ b/noatun-plugins/oblique/oblique.h
@@ -18,7 +18,7 @@ class Selector;
 class TreeItem;
 class DirectoryAdder;
 
-namespace KIO
+namespace TDEIO
 {
 	class ListJob;
 	class Job;
@@ -118,7 +118,7 @@ class DirectoryAdder : public TQObject
 	Oblique *mOblique;
 	KURL::List pendingAddDirectories;
 	KURL::List::Iterator lastAddedSubDirectory;
-	KIO::ListJob *listJob;
+	TDEIO::ListJob *listJob;
 	KURL currentJobURL;
 
 public:
@@ -133,9 +133,9 @@ signals:
 	void done();
 
 private slots:
-	void slotResult(KIO::Job *job);
-	void slotEntries(KIO::Job *job, const KIO::UDSEntryList &entries);
-	void slotRedirection(KIO::Job *, const KURL & url);
+	void slotResult(TDEIO::Job *job);
+	void slotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &entries);
+	void slotRedirection(TDEIO::Job *, const KURL & url);
 
 private:
 	
diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp
index b8909a1..04c9cdd 100644
--- a/noatun-plugins/oblique/tree.cpp
+++ b/noatun-plugins/oblique/tree.cpp
@@ -478,7 +478,7 @@ Tree::Tree(Oblique *oblique, TQWidget *parent)
 
 	mSlice = oblique->base()->defaultSlice();
 
-	KConfigGroup g(TDEGlobal::config(), "oblique");
+	TDEConfigGroup g(TDEGlobal::config(), "oblique");
 	mFileOfQuery = g.readEntry("schema", "standard");
 	if (!setSchema(mFileOfQuery))
 	{
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index 15b15e5..c769603 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -92,7 +92,7 @@ View::View(Oblique *oblique)
 	applyMainWindowSettings(TDEGlobal::config(), "Oblique View");
 	createGUI("obliqueui.rc");
 
-	KConfigGroup g(TDEGlobal::config(), "oblique");
+	TDEConfigGroup g(TDEGlobal::config(), "oblique");
 	TQStringList tabids = g.readListEntry("tabids");
 	
 	for (TQStringList::Iterator i(tabids.begin()); i != tabids.end(); ++i)
@@ -142,7 +142,7 @@ View::~View()
 		tabids.append(t);
 	}
 	
-	KConfigGroup g(TDEGlobal::config(), "oblique");
+	TDEConfigGroup g(TDEGlobal::config(), "oblique");
 	g.writeEntry("tabids", tabids);
 	g.sync();
 }
diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp
index 5d64685..ac8c701 100644
--- a/noatun-plugins/synaescope/cmodule.cpp
+++ b/noatun-plugins/synaescope/cmodule.cpp
@@ -62,7 +62,7 @@ void SynaePrefs::save()
 	if(!changed)
 		return;
 
-	KConfig *c = TDEGlobal::config();
+	TDEConfig *c = TDEGlobal::config();
 	c->setGroup("Synaescope");
 	c->writeEntry("xResolution", xRes->value());
 	c->writeEntry("yResolution", yRes->value());
@@ -73,7 +73,7 @@ void SynaePrefs::save()
 void SynaePrefs::reopen()
 {
 //	kdDebug(66666) << k_funcinfo << endl;
-	KConfig *c = TDEGlobal::config();
+	TDEConfig *c = TDEGlobal::config();
 	c->setGroup("Synaescope");
 
 	xRes->setValue(c->readNumEntry("xResolution", 320));
diff --git a/noatun-plugins/synaescope/main.cpp b/noatun-plugins/synaescope/main.cpp
index adbadaa..02ad014 100644
--- a/noatun-plugins/synaescope/main.cpp
+++ b/noatun-plugins/synaescope/main.cpp
@@ -182,7 +182,7 @@ int main(void)
 
 	core = new Core;
 
-	KConfig mConfig("noatunrc");
+	TDEConfig mConfig("noatunrc");
 	mConfig.setGroup("Synaescope");
 
 	core->windWidth = mConfig.readNumEntry("xResolution", 320);
diff --git a/noatun-plugins/synaescope/ui.cpp b/noatun-plugins/synaescope/ui.cpp
index eed8362..cd16408 100644
--- a/noatun-plugins/synaescope/ui.cpp
+++ b/noatun-plugins/synaescope/ui.cpp
@@ -353,7 +353,7 @@ Interface::Interface()
 	static const float SliderSize=0.125;
 
 	{
-		KConfig config("noatun/synaescope", false, false, "data");
+		TDEConfig config("noatun/synaescope", false, false, "data");
 		core->fadeMode=(SymbolID)config.readNumEntry("mode", (int)Stars);
 		core->pointsAreDiamonds=config.readBoolEntry("diamonds", false);
 		core->brightnessTwiddler=config.readDoubleNumEntry("brightness", .4);
@@ -452,7 +452,7 @@ Interface::Interface()
 
 Interface::~Interface()
 {
-	KConfig config("noatun/synaescope", false, false, "data");
+	TDEConfig config("noatun/synaescope", false, false, "data");
 	config.writeEntry("mode",core->fadeMode);
 	config.writeEntry("diamonds", core->pointsAreDiamonds);
 	config.writeEntry("brightness", core->brightnessTwiddler);
diff --git a/noatun-plugins/tippercanoe/ui.cpp b/noatun-plugins/tippercanoe/ui.cpp
index e260d18..b61bf51 100644
--- a/noatun-plugins/tippercanoe/ui.cpp
+++ b/noatun-plugins/tippercanoe/ui.cpp
@@ -266,7 +266,7 @@ Interface::Interface()
 	static const float SliderSize=0.125;
 
 	{
-		KConfig config("noatun/synaescope", false, false, "data");
+		TDEConfig config("noatun/synaescope", false, false, "data");
 		core->fadeMode=(SymbolID)config.readNumEntry("mode", (int)Stars);
 		core->pointsAreDiamonds=config.readBoolEntry("diamonds", false);
 		core->brightnessTwiddler=config.readDoubleNumEntry("brightness", .4);
@@ -349,7 +349,7 @@ Interface::Interface()
 
 Interface::~Interface()
 {
-	KConfig config("noatun/synaescope", false, false, "data");
+	TDEConfig config("noatun/synaescope", false, false, "data");
 	config.writeEntry("mode",core->fadeMode);
 	config.writeEntry("diamonds", core->pointsAreDiamonds);
 	config.writeEntry("brightness", core->brightnessTwiddler);
diff --git a/noatun-plugins/wavecapture/wavecapture.cpp b/noatun-plugins/wavecapture/wavecapture.cpp
index b20ec1e..2e0112e 100644
--- a/noatun-plugins/wavecapture/wavecapture.cpp
+++ b/noatun-plugins/wavecapture/wavecapture.cpp
@@ -141,8 +141,8 @@ void WaveCapture::saveAs()
 			if (url.isValid())
 				KRecentDocument::add( url );
 
-			m_job = KIO::file_move( KURL( filename2 ), url, -1, true );
-			connect( m_job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( copyFinished( KIO::Job* ) ) );
+			m_job = TDEIO::file_move( KURL( filename2 ), url, -1, true );
+			connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( copyFinished( TDEIO::Job* ) ) );
 		}
 		else
 		{
@@ -186,7 +186,7 @@ void WaveCapture::stop()
 	_timer->start( 0, true );
 }
 
-void WaveCapture::copyFinished( KIO::Job* job )
+void WaveCapture::copyFinished( TDEIO::Job* job )
 {
 	if( job == m_job )
 		m_job = 0;
diff --git a/noatun-plugins/wavecapture/wavecapture.h b/noatun-plugins/wavecapture/wavecapture.h
index 28a2a1d..da979ad 100644
--- a/noatun-plugins/wavecapture/wavecapture.h
+++ b/noatun-plugins/wavecapture/wavecapture.h
@@ -26,7 +26,7 @@
 #include <string>
 
 class TQTimer;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
 
 class WaveCapture : public TQObject, public Plugin
 {
@@ -47,7 +47,7 @@ protected slots:
 	void playing();
 	void paused();
 	void saveAs();
-	void copyFinished( KIO::Job* );
+	void copyFinished( TDEIO::Job* );
 
 private:
 	void start();
@@ -65,7 +65,7 @@ private:
 	std::string _filename;
 
 	TQTimer* _timer;
-	KIO::Job* m_job;
+	TDEIO::Job* m_job;
 };
 
 #endif
diff --git a/renamedlgplugins/audio/audio_plugin.cpp b/renamedlgplugins/audio/audio_plugin.cpp
index 1e8ff0a..a1251df 100644
--- a/renamedlgplugins/audio/audio_plugin.cpp
+++ b/renamedlgplugins/audio/audio_plugin.cpp
@@ -37,11 +37,11 @@ class AudioPlugin : public RenameDlgPlugin{
 public:
   AudioPlugin( TQDialog *dialog, const char *name, const TQStringList & );
   ~AudioPlugin();
-  virtual bool initialize( KIO::RenameDlg_Mode /*mod*/, const TQString &/*_src*/, const TQString &/*_dest*/,
+  virtual bool initialize( TDEIO::RenameDlg_Mode /*mod*/, const TQString &/*_src*/, const TQString &/*_dest*/,
 		  const TQString &/*mimeSrc*/,
 		  const TQString &/*mimeDest*/,
-		  KIO::filesize_t /*sizeSrc*/,
-		  KIO::filesize_t /*sizeDest*/,
+		  TDEIO::filesize_t /*sizeSrc*/,
+		  TDEIO::filesize_t /*sizeDest*/,
 		  time_t /*ctimeSrc*/,
 		  time_t /*ctimeDest*/,
 		  time_t /*mtimeSrc*/,
@@ -54,17 +54,17 @@ AudioPlugin::AudioPlugin( TQDialog *dialog, const char *name, const TQStringList
 AudioPlugin::~AudioPlugin()
 {
 }
-bool AudioPlugin::initialize( KIO::RenameDlg_Mode mode, const TQString &_src, const TQString &_dest,
+bool AudioPlugin::initialize( TDEIO::RenameDlg_Mode mode, const TQString &_src, const TQString &_dest,
 		  const TQString &mimeSrc,
 		  const TQString &mimeDest,
-		  KIO::filesize_t /*sizeSrc*/,
-		  KIO::filesize_t /*sizeDest*/,
+		  TDEIO::filesize_t /*sizeSrc*/,
+		  TDEIO::filesize_t /*sizeDest*/,
 		  time_t /*ctimeSrc*/,
 		  time_t /*ctimeDest*/,
 		  time_t mtimeSrc,
 		  time_t mtimeDest ) {
  TQGridLayout *lay = new TQGridLayout(this, 4, 3, 5);
- if( mode & KIO::M_OVERWRITE ){
+ if( mode & TDEIO::M_OVERWRITE ){
    TQLabel *label_head = new TQLabel(this);
    TQLabel *label_src  = new TQLabel(this);
    TQLabel *label_dst  = new TQLabel(this);
diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp
index 4f2936a..d1e1174 100644
--- a/renamedlgplugins/audio/audiopreview.cpp
+++ b/renamedlgplugins/audio/audiopreview.cpp
@@ -64,7 +64,7 @@ AudioPreview::AudioPreview( TQWidget *parent, const char *name, const TQString &
 AudioPreview::~AudioPreview()
 {
   if ( m_isTempFile )
-    KIO::NetAccess::removeTempFile( m_localFile );
+    TDEIO::NetAccess::removeTempFile( m_localFile );
 
   delete m_player;
 }
@@ -125,7 +125,7 @@ void AudioPreview::initView( const TQString& mimeType )
 
 void AudioPreview::downloadFile( const TQString& url )
 {
-  if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), m_localFile , topLevelWidget()) )
+  if( TDEIO::NetAccess::download( KURL::fromPathOrURL( url ), m_localFile , topLevelWidget()) )
   {
     m_isTempFile = true;
     initView( KMimeType::findByPath( m_localFile )->name() );
diff --git a/renamedlgplugins/images/image_plugin.cpp b/renamedlgplugins/images/image_plugin.cpp
index 65023f7..ef3b715 100644
--- a/renamedlgplugins/images/image_plugin.cpp
+++ b/renamedlgplugins/images/image_plugin.cpp
@@ -38,11 +38,11 @@
 class ImagePlugin : public RenameDlgPlugin{
 public:
   ImagePlugin( TQDialog *dialog, const char *name, const TQStringList & );
-  virtual bool initialize( KIO::RenameDlg_Mode /*mod*/, const TQString &/*_src*/, const TQString &/*_dest*/,
+  virtual bool initialize( TDEIO::RenameDlg_Mode /*mod*/, const TQString &/*_src*/, const TQString &/*_dest*/,
 		  const TQString &/*mimeSrc*/,
 		  const TQString &/*mimeDest*/,
-		  KIO::filesize_t /*sizeSrc*/,
-		  KIO::filesize_t /*sizeDest*/,
+		  TDEIO::filesize_t /*sizeSrc*/,
+		  TDEIO::filesize_t /*sizeDest*/,
 		  time_t /*ctimeSrc*/,
 		  time_t /*ctimeDest*/,
 		  time_t /*mtimeSrc*/,
@@ -54,18 +54,18 @@ ImagePlugin::ImagePlugin( TQDialog *dialog, const char *name, const TQStringList
 {
 }
 
-bool ImagePlugin::initialize( KIO::RenameDlg_Mode mode, const TQString &_src, const TQString &_dest,
+bool ImagePlugin::initialize( TDEIO::RenameDlg_Mode mode, const TQString &_src, const TQString &_dest,
 		  const TQString &/*mimeSrc*/,
 		  const TQString &/*mimeDest*/,
-		  KIO::filesize_t /*sizeSrc*/,
-		  KIO::filesize_t /*sizeDest*/,
+		  TDEIO::filesize_t /*sizeSrc*/,
+		  TDEIO::filesize_t /*sizeDest*/,
 		  time_t /*ctimeSrc*/,
 		  time_t /*ctimeDest*/,
 		  time_t /*mtimeSrc*/,
 		  time_t /*mtimeDest*/ ) 
 {
   TQGridLayout *lay = new TQGridLayout(this, 2, 3, 5  );
-  if( mode & KIO::M_OVERWRITE )
+  if( mode & TDEIO::M_OVERWRITE )
   {
     TQLabel *label = new TQLabel(this );
     label->setText(i18n("You want to overwrite the left picture with the one on the right.") );
diff --git a/renamedlgplugins/images/imagevisualizer.cpp b/renamedlgplugins/images/imagevisualizer.cpp
index 009eb8b..1ef7cd5 100644
--- a/renamedlgplugins/images/imagevisualizer.cpp
+++ b/renamedlgplugins/images/imagevisualizer.cpp
@@ -73,10 +73,10 @@ void ImageVisualizer::loadImage( const TQString& path )
 void ImageVisualizer::downloadImage(const TQString& url)
 {
   TQString tmpFile;
-  if( KIO::NetAccess::download( KURL::fromPathOrURL( url ), tmpFile , topLevelWidget()) )
+  if( TDEIO::NetAccess::download( KURL::fromPathOrURL( url ), tmpFile , topLevelWidget()) )
   {
     loadImage( tmpFile );
-    KIO::NetAccess::removeTempFile( tmpFile );
+    TDEIO::NetAccess::removeTempFile( tmpFile );
   }
 }