Rename a number of libraries and executables to avoid conflicts with KDE4

72 files changed, 119 insertions, 119 deletions

diff --git a/amarok/src/Options2.ui.h b/amarok/src/Options2.ui.h
index fd437845..178229b6 100644
--- a/amarok/src/Options2.ui.h
+++ b/amarok/src/Options2.ui.h
@@ -16,7 +16,7 @@
 #include "contextbrowser.h"
 
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <knewstuff/downloaddialog.h> // knewstuff theme fetching
 #include <knewstuff/engine.h>         // "
@@ -24,7 +24,7 @@
 #include <knewstuff/provider.h>       // "
 #include <kstandarddirs.h>
 #include <ktar.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqdir.h>
 #include <tqfileinfo.h>
diff --git a/amarok/src/amarok.h b/amarok/src/amarok.h
index d0bce4de..1a3d27f1 100644
--- a/amarok/src/amarok.h
+++ b/amarok/src/amarok.h
@@ -8,7 +8,7 @@
 
 #include <kurl.h> // recursiveUrlExpand
 #include <kprocio.h> //Amarok::ProcIO
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tdeversion.h>
 
 #include "amarok_export.h"
diff --git a/amarok/src/amarokcore/amarokconfig.kcfgc b/amarok/src/amarokcore/amarokconfig.kcfgc
index f8a0c8fd..1ee0fbf0 100644
--- a/amarok/src/amarokcore/amarokconfig.kcfgc
+++ b/amarok/src/amarokcore/amarokconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=amarok.kcfg
 ClassName=AmarokConfig
 Singleton=true
diff --git a/amarok/src/analyzers/blockanalyzer.cpp b/amarok/src/analyzers/blockanalyzer.cpp
index 8c4c0833..c955be60 100644
--- a/amarok/src/analyzers/blockanalyzer.cpp
+++ b/amarok/src/analyzers/blockanalyzer.cpp
@@ -13,7 +13,7 @@
 
 #include <cmath>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h> //paletteChange()
 #include <kiconloader.h>     //mousePressEvent
 #include <klocale.h>         //mousePressEvent
diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp
index a97197d9..77ad4b3a 100644
--- a/amarok/src/app.cpp
+++ b/amarok/src/app.cpp
@@ -51,7 +51,7 @@ email                : markey@web.de
 
 #include <iostream>
 
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 #include <kcombobox.h>           //firstRunWizard()
 #include <kcmdlineargs.h>        //initCliArgs()
 #include <kcursor.h>             //Amarok::OverrideCursor
@@ -66,7 +66,7 @@ email                : markey@web.de
 #include <kstandarddirs.h>
 #include <kurldrag.h>            //genericEventHandler()
 #include <kaboutdata.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tqevent.h>              //genericEventHandler()
 #include <tqeventloop.h>          //applySettings()
diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp
index 0d20000c..88e1af1a 100644
--- a/amarok/src/browserbar.cpp
+++ b/amarok/src/browserbar.cpp
@@ -16,7 +16,7 @@
 #include "multitabbar.h"   //m_tabBar
 
 #include <kapplication.h>  //kapp
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>   //multiTabBar icons
 #include <klocale.h>
 
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index 537c5d6b..3f1517a7 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -54,7 +54,7 @@
 
 #include <kactioncollection.h>
 #include <kapplication.h>   //kapp
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kcursor.h>
 #include <kdialogbase.h>
@@ -65,7 +65,7 @@
 #include <kpopupmenu.h>
 #include <ktoolbarbutton.h> //ctor
 #include <kurldrag.h>       //dragObject()
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kpushbutton.h>
 
 extern "C"
diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp
index 2588b12c..589751f8 100644
--- a/amarok/src/collectiondb.cpp
+++ b/amarok/src/collectiondb.cpp
@@ -52,7 +52,7 @@
 
 #include <kcharsets.h>            //setHTMLLyrics()
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>          //checkDatabase()
 #include <kglobal.h>
 #include <kinputdialog.h>         //setupCoverFetcher()
@@ -62,8 +62,8 @@
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 
 #include <cmath>                 //DbConnection::sqlite_power()
 #include <ctime>                 //query()
diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp
index 11c827dd..8c24bf1b 100644
--- a/amarok/src/configdialog.cpp
+++ b/amarok/src/configdialog.cpp
@@ -62,7 +62,7 @@ email                : markey@web.de
 namespace Amarok {
     int databaseTypeCode( const TQString type )
     {
-        // can't use kconfigxt for the database comboxbox since we need the DBConnection id and not the index
+        // can't use tdeconfigxt for the database comboxbox since we need the DBConnection id and not the index
         int dbType = DbConnection::sqlite;
         if ( type == "MySQL")
             dbType = DbConnection::mysql;
@@ -283,7 +283,7 @@ void AmarokConfigDialog::updateSettings()
     }
 
     if ( m_opt2->styleComboBox->currentText() != AmarokConfig::contextBrowserStyleSheet() ) {
-        //can't use kconfigxt for the style comboxbox's since we need the string, not the index
+        //can't use tdeconfigxt for the style comboxbox's since we need the string, not the index
         AmarokConfig::setContextBrowserStyleSheet( m_opt2->styleComboBox->currentText() );
         ContextBrowser::instance()->reloadStyleSheet();
     }
diff --git a/amarok/src/configdialog.h b/amarok/src/configdialog.h
index 8634041f..779f9aff 100644
--- a/amarok/src/configdialog.h
+++ b/amarok/src/configdialog.h
@@ -19,7 +19,7 @@ email                : markey@web.de
 #include <tqmap.h>
 #include <tqvaluelist.h>
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 class TQComboBox;
 class TQGroupBox;
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index 722ea234..394b2589 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -55,13 +55,13 @@
 #include <kaction.h>
 #include <kapplication.h> //kapp
 #include <kcalendarsystem.h>  // for Amarok::verboseTimeSince()
-#include <kconfig.h> // suggested/related/favorite box visibility
+#include <tdeconfig.h> // suggested/related/favorite box visibility
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kmdcodec.h> // for data: URLs
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp
index 0b66dcc8..fe0e5f05 100644
--- a/amarok/src/coverfetcher.cpp
+++ b/amarok/src/coverfetcher.cpp
@@ -23,9 +23,9 @@
 #include <kcursor.h> //waiting cursor
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp
index 84e65e16..91bf9e53 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -35,15 +35,15 @@
 #include <tqvbox.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>    //showCoverMenu()
 #include <tdemultipledrag.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kpopupmenu.h>    //showCoverMenu()
 #include <kprogress.h>
 #include <kpushbutton.h>
diff --git a/amarok/src/database_refactor/collectiondb.cpp b/amarok/src/database_refactor/collectiondb.cpp
index 250bf9dc..b43a633d 100644
--- a/amarok/src/database_refactor/collectiondb.cpp
+++ b/amarok/src/database_refactor/collectiondb.cpp
@@ -29,16 +29,16 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kinputdialog.h>         //setupCoverFetcher()
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klineedit.h>            //setupCoverFetcher()
 #include <klocale.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <cmath>                 //DbConnection::sqlite_power()
 #include <ctime>                 //query()
diff --git a/amarok/src/deletedialog.cpp b/amarok/src/deletedialog.cpp
index 846a02fa..253313c0 100644
--- a/amarok/src/deletedialog.cpp
+++ b/amarok/src/deletedialog.cpp
@@ -13,12 +13,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kstdguiitem.h>
 #include <kurl.h>
diff --git a/amarok/src/device/massstorage/massstoragedevicehandler.cpp b/amarok/src/device/massstorage/massstoragedevicehandler.cpp
index 98d82758..faff1a6f 100644
--- a/amarok/src/device/massstorage/massstoragedevicehandler.cpp
+++ b/amarok/src/device/massstorage/massstoragedevicehandler.cpp
@@ -24,7 +24,7 @@ AMAROK_EXPORT_PLUGIN( MassStorageDeviceHandlerFactory )
 #include "collectiondb.h"
 #include "debug.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 #include <tqvaluelist.h>
diff --git a/amarok/src/device/nfs/nfsdevicehandler.cpp b/amarok/src/device/nfs/nfsdevicehandler.cpp
index 1e90653a..9ea9f10b 100644
--- a/amarok/src/device/nfs/nfsdevicehandler.cpp
+++ b/amarok/src/device/nfs/nfsdevicehandler.cpp
@@ -21,7 +21,7 @@ AMAROK_EXPORT_PLUGIN( NfsDeviceHandlerFactory )
 
 #include "debug.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 #include <tqvaluelist.h>
diff --git a/amarok/src/device/smb/smbdevicehandler.cpp b/amarok/src/device/smb/smbdevicehandler.cpp
index 3ee45a0e..fbcc92ec 100644
--- a/amarok/src/device/smb/smbdevicehandler.cpp
+++ b/amarok/src/device/smb/smbdevicehandler.cpp
@@ -21,7 +21,7 @@ AMAROK_EXPORT_PLUGIN( SmbDeviceHandlerFactory )
 
 #include "debug.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 #include <tqvaluelist.h>
diff --git a/amarok/src/directorylist.cpp b/amarok/src/directorylist.cpp
index 78cf15d3..414d9989 100644
--- a/amarok/src/directorylist.cpp
+++ b/amarok/src/directorylist.cpp
@@ -20,7 +20,7 @@
 #include "directorylist.h"
 #include "mountpointmanager.h"
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klocale.h>
 
 #include <tqfile.h>
diff --git a/amarok/src/engine/helix/Makefile.test b/amarok/src/engine/helix/Makefile.test
index a2860f35..8f3d6d44 100644
--- a/amarok/src/engine/helix/Makefile.test
+++ b/amarok/src/engine/helix/Makefile.test
@@ -61,7 +61,7 @@ install:
 	install -p -C -m 755 $(SLIBRARY) /usr/lib/trinity/$(SLIBRARY)
 	install -p -C -m 755 $(SLIBRARY:.so=.la) /usr/lib/trinity/$(SLIBRARY:.so=.la)
 	install -p -C -m 644 amarok_helixengine_plugin.desktop /usr/share/services/amarok_helixengine_plugin.desktop
-#	kbuildsycoca
+#	tdebuildsycoca
 
 uninstall:
 	rm -f /usr/lib/trinity/$(SLIBRARY:.so=.la)
diff --git a/amarok/src/engine/helix/config/helixconfig.kcfgc b/amarok/src/engine/helix/config/helixconfig.kcfgc
index c0f6079d..ee1b279c 100644
--- a/amarok/src/engine/helix/config/helixconfig.kcfgc
+++ b/amarok/src/engine/helix/config/helixconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=helixconfig.kcfg
 ClassName=HelixConfig
 Singleton=true
diff --git a/amarok/src/engine/kdemm/kdemmengine.cpp b/amarok/src/engine/kdemm/kdemmengine.cpp
index b39033e0..3dc1aac6 100644
--- a/amarok/src/engine/kdemm/kdemmengine.cpp
+++ b/amarok/src/engine/kdemm/kdemmengine.cpp
@@ -33,9 +33,9 @@ what                 : interface to the KDE Multimedia interface (KDEMM)
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/amarok/src/engine/mas/masengine.cpp b/amarok/src/engine/mas/masengine.cpp
index 91ccffcc..9b9668bd 100644
--- a/amarok/src/engine/mas/masengine.cpp
+++ b/amarok/src/engine/mas/masengine.cpp
@@ -31,8 +31,8 @@ what                 : interface to the Media Application Server (MAS)
 #include <tqfile.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
-#include <kfileitem.h>
+#include <tdeconfig.h>
+#include <tdefileitem.h>
 #include <kgenericfactory.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/amarok/src/engine/nmm/nmm_engine.cpp b/amarok/src/engine/nmm/nmm_engine.cpp
index 77639658..eb0c5fd9 100644
--- a/amarok/src/engine/nmm/nmm_engine.cpp
+++ b/amarok/src/engine/nmm/nmm_engine.cpp
@@ -49,7 +49,7 @@
 #include <tqapplication.h>
 #include <tqtimer.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
diff --git a/amarok/src/engine/nmm/nmm_kdeconfig.kcfgc b/amarok/src/engine/nmm/nmm_kdeconfig.kcfgc
index 8db0f8c5..6568b5cc 100644
--- a/amarok/src/engine/nmm/nmm_kdeconfig.kcfgc
+++ b/amarok/src/engine/nmm/nmm_kdeconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=nmm_kdeconfig.kcfg
 ClassName=NmmKDEConfig
 Singleton=true
diff --git a/amarok/src/engine/xine/xinecfg.kcfgc b/amarok/src/engine/xine/xinecfg.kcfgc
index 127cdf81..9bd6faa1 100644
--- a/amarok/src/engine/xine/xinecfg.kcfgc
+++ b/amarok/src/engine/xine/xinecfg.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=xinecfg.kcfg
 ClassName=XineCfg
 Singleton=true
diff --git a/amarok/src/enginecontroller.cpp b/amarok/src/enginecontroller.cpp
index b6d1ab15..b6cdb27c 100644
--- a/amarok/src/enginecontroller.cpp
+++ b/amarok/src/enginecontroller.cpp
@@ -30,9 +30,9 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kfileitem.h>
-#include <kio/global.h>
-#include <kio/job.h>
+#include <tdefileitem.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
 #include <krun.h>
 
@@ -187,7 +187,7 @@ EngineController::loadEngine( const TQString &engineName )
         }
     }
 
-    KRun::runCommand( "kbuildsycoca" );
+    KRun::runCommand( "tdebuildsycoca" );
 
     KMessageBox::error( 0, i18n(
             "<p>Amarok could not find any sound-engine plugins. "
@@ -197,7 +197,7 @@ EngineController::loadEngine( const TQString &engineName )
             "$ cd /path/to/amarok/source-code/<br>"
             "$ su -c \"make uninstall\"<br>"
             "$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\"<br>"
-            "$ kbuildsycoca<br>"
+            "$ tdebuildsycoca<br>"
             "$ amarok</pre>"
             "More information can be found in the README file. For further assistance join us at #amarok on irc.freenode.net.</p>" ) );
 
diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp
index f2a631b5..2c285ba6 100644
--- a/amarok/src/filebrowser.cpp
+++ b/amarok/src/filebrowser.cpp
@@ -33,7 +33,7 @@
 #include "kbookmarkhandler.h"
 #include <kdiroperator.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
diff --git a/amarok/src/filebrowser.h b/amarok/src/filebrowser.h
index 9bad6f24..9331c55b 100644
--- a/amarok/src/filebrowser.h
+++ b/amarok/src/filebrowser.h
@@ -88,7 +88,7 @@ private:
 
 
 
-#include <kfileitem.h> //KFileItemList
+#include <tdefileitem.h> //KFileItemList
 #include <tqregexp.h>
 
 class KDirLister;
diff --git a/amarok/src/firstrunwizard.ui.h b/amarok/src/firstrunwizard.ui.h
index 97964e4e..aed5e9cb 100644
--- a/amarok/src/firstrunwizard.ui.h
+++ b/amarok/src/firstrunwizard.ui.h
@@ -15,7 +15,7 @@
 #include "directorylist.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <tqpushbutton.h>
 
diff --git a/amarok/src/ktrm.cpp b/amarok/src/ktrm.cpp
index 22f76889..c068c333 100644
--- a/amarok/src/ktrm.cpp
+++ b/amarok/src/ktrm.cpp
@@ -26,8 +26,8 @@
 #include "ktrm.h"
 
 #include <kapplication.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kprotocolmanager.h>
 #include <kurl.h>
 #include <kresolver.h>
diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp
index 86216c34..5c631ffc 100644
--- a/amarok/src/lastfm.cpp
+++ b/amarok/src/lastfm.cpp
@@ -34,8 +34,8 @@
 #include <klineedit.h>
 #include <kmdcodec.h>       //md5sum
 #include <kmessagebox.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kprotocolmanager.h>
 #include <kshortcut.h>
 #include <kurl.h>
diff --git a/amarok/src/lastfm.h b/amarok/src/lastfm.h
index 2f597d0d..0c2e0666 100644
--- a/amarok/src/lastfm.h
+++ b/amarok/src/lastfm.h
@@ -25,7 +25,7 @@
 #include <tqurl.h>
 #include <tqvaluelist.h>
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 class KLineEdit;
 class KAction;
diff --git a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
index a05150a7..c160cd30 100644
--- a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
+++ b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
@@ -22,8 +22,8 @@
 
 #include "magnatunedownloadinfo.h"
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 #include <tqobject.h>
 
diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
index f1f87ed3..a9b02293 100644
--- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
+++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
@@ -25,8 +25,8 @@
 #include "statusbar.h"
 
 #include <tdehtml_part.h>
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 
 /**
 A specialized KHTMLPart for displaying html info about a Magnatune artist or album
diff --git a/amarok/src/magnatunebrowser/magnatunebrowser.h b/amarok/src/magnatunebrowser/magnatunebrowser.h
index 5c4948ea..91c4f0d1 100644
--- a/amarok/src/magnatunebrowser/magnatunebrowser.h
+++ b/amarok/src/magnatunebrowser/magnatunebrowser.h
@@ -30,8 +30,8 @@
 #include "magnatuneredownloadhandler.h"
 #include "magnatunexmlparser.h"
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp b/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
index 6959139e..60a6c273 100644
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
@@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA.
 #include "debug.h"
 #include "magnatunedownloaddialog.h"
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 
 #include <tqcheckbox.h>
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
index 0f1f02c9..c1bd858e 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
+++ b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
@@ -21,8 +21,8 @@
 #define MAGNATUNEPURCHASEHANDLER_H
 
 #include <tqobject.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 #include "magnatunealbumdownloader.h"
 #include "magnatunedownloaddialog.h"
diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp
index f852cb73..8e7644dd 100644
--- a/amarok/src/mediabrowser.cpp
+++ b/amarok/src/mediabrowser.cpp
@@ -60,11 +60,11 @@
 #include <kapplication.h> //kapp
 #include <kcombobox.h>
 #include <kdirlister.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdemultipledrag.h>
diff --git a/amarok/src/mediabrowser.h b/amarok/src/mediabrowser.h
index 6845b257..87cd4341 100644
--- a/amarok/src/mediabrowser.h
+++ b/amarok/src/mediabrowser.h
@@ -21,7 +21,7 @@
 
 #include <klistview.h>       //baseclass
 #include <kurl.h>            //stack allocated
-#include <kio/global.h>      //filesize_t
+#include <tdeio/global.h>      //filesize_t
 #include "scrobbler.h"       //SubmitItem
 #include "metabundle.h"
 
diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp
index 17843511..1d5c2d9e 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.cpp
+++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp
@@ -37,12 +37,12 @@ AMAROK_EXPORT_PLUGIN( GenericMediaDevice )
 #include "genericmediadeviceconfigdialog.h"
 
 #include <kapplication.h>
-#include <kconfig.h>           //download saveLocation
+#include <tdeconfig.h>           //download saveLocation
 #include <kdiskfreesp.h>
 #include <kiconloader.h>       //smallIcon
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kmountpoint.h>
 #include <kpopupmenu.h>
diff --git a/amarok/src/mediadevice/ifp/CMakeLists.txt b/amarok/src/mediadevice/ifp/CMakeLists.txt
index 6e24a602..d8a46739 100644
--- a/amarok/src/mediadevice/ifp/CMakeLists.txt
+++ b/amarok/src/mediadevice/ifp/CMakeLists.txt
@@ -35,6 +35,6 @@ install( FILES
 
 tde_add_kpart( libamarok_ifp-mediadevice AUTOMOC
   SOURCES ifpmediadevice.cpp
-  LINK amarok-shared kio-shared ${IFP_LIBRARY} ${USB_LIBRARIES}
+  LINK amarok-shared tdeio-shared ${IFP_LIBRARY} ${USB_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
index 89054a26..a14bf31f 100644
--- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
+++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
@@ -34,7 +34,7 @@ AMAROK_EXPORT_PLUGIN( IfpMediaDevice )
 #include "transferdialog.h"
 
 #include <kapplication.h>
-#include <kconfig.h>           //download saveLocation
+#include <tdeconfig.h>           //download saveLocation
 #include <kiconloader.h>       //smallIcon
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.h b/amarok/src/mediadevice/ipod/ipodmediadevice.h
index edfe497c..3eb8fec8 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.h
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.h
@@ -36,7 +36,7 @@ extern "C" {
 #include <tqptrlist.h>
 #include <tqdict.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class TQCheckBox;
 class TQLabel;
diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp
index ec2cf48e..5aab72d4 100644
--- a/amarok/src/mediadevice/njb/njbmediadevice.cpp
+++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp
@@ -39,7 +39,7 @@ AMAROK_EXPORT_PLUGIN( NjbMediaDevice )
 // KDE
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>       //smallIcon
 #include <kinstance.h>
 #include <klocale.h>
diff --git a/amarok/src/mediadevice/njb/njbmediadevice.h b/amarok/src/mediadevice/njb/njbmediadevice.h
index d52d2536..ff14d8dc 100644
--- a/amarok/src/mediadevice/njb/njbmediadevice.h
+++ b/amarok/src/mediadevice/njb/njbmediadevice.h
@@ -41,8 +41,8 @@
 
 // kde
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 /**
   This class is used to manipulate Nomad Creative Jukebox and others media player that works with the njb libraries.
diff --git a/amarok/src/medium.cpp b/amarok/src/medium.cpp
index b20083b2..b05de959 100644
--- a/amarok/src/medium.cpp
+++ b/amarok/src/medium.cpp
@@ -19,7 +19,7 @@
 #include "debug.h"
 #include "medium.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 const TQString Medium::SEPARATOR = "---";
diff --git a/amarok/src/mediumpluginmanager.cpp b/amarok/src/mediumpluginmanager.cpp
index a80d80e1..56960608 100644
--- a/amarok/src/mediumpluginmanager.cpp
+++ b/amarok/src/mediumpluginmanager.cpp
@@ -33,7 +33,7 @@
 #include <kapplication.h>
 #include <kactivelabel.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/amarok/src/mediumpluginmanager.h b/amarok/src/mediumpluginmanager.h
index b34a3fc7..735e4ea9 100644
--- a/amarok/src/mediumpluginmanager.h
+++ b/amarok/src/mediumpluginmanager.h
@@ -20,7 +20,7 @@
 #include <tqmap.h>
 #include <tqhbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 
diff --git a/amarok/src/metabundle.cpp b/amarok/src/metabundle.cpp
index 5e7464ce..8580952c 100644
--- a/amarok/src/metabundle.cpp
+++ b/amarok/src/metabundle.cpp
@@ -22,11 +22,11 @@
 #include "collectiondb.h"
 #include "metabundlesaver.h"
 #include <kapplication.h>
-#include <kfilemetainfo.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdefilemetainfo.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
 #include <kmdcodec.h>
 #include <tqdeepcopy.h>
 #include <tqfile.h> //decodePath()
diff --git a/amarok/src/metabundlesaver.cpp b/amarok/src/metabundlesaver.cpp
index 612d30b9..8025ee48 100644
--- a/amarok/src/metabundlesaver.cpp
+++ b/amarok/src/metabundlesaver.cpp
@@ -20,11 +20,11 @@
 #include "metabundlesaver.h"
 #include "scancontroller.h"
 #include <kapplication.h>
-#include <kfilemetainfo.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdefilemetainfo.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
 #include <kmdcodec.h>
 #include <kurl.h>
 #include <tqfile.h> //decodePath()
diff --git a/amarok/src/metadata/tplugins.cpp b/amarok/src/metadata/tplugins.cpp
index d20e4bcc..a76297f1 100644
--- a/amarok/src/metadata/tplugins.cpp
+++ b/amarok/src/metadata/tplugins.cpp
@@ -39,7 +39,7 @@
 #ifndef TAGLIB_15
 #include "trueaudio/taglib_trueaudiofiletyperesolver.h"
 #include "trueaudio/ttafile.h"
-#include "wavpack/taglib_wavpackfiletyperesolver.h"
+#include "wavpack/taglib_wavpactdefiletyperesolver.h"
 #include "wavpack/wvfile.h"
 #include "speex/taglib_speexfiletyperesolver.h"
 #include "speex/speexfile.h"
diff --git a/amarok/src/metadata/wavpack/Makefile.am b/amarok/src/metadata/wavpack/Makefile.am
index 8a4c2d7a..9a6df253 100644
--- a/amarok/src/metadata/wavpack/Makefile.am
+++ b/amarok/src/metadata/wavpack/Makefile.am
@@ -8,9 +8,9 @@ noinst_LTLIBRARIES = libtagwavpack.la
 libtagwavpack_la_SOURCES = \
                            wvfile.cpp \
                            wvproperties.cpp \
-                           taglib_wavpackfiletyperesolver.cpp
+                           taglib_wavpactdefiletyperesolver.cpp
 
 noinst_HEADERS =     wvfile.h \
                      wvproperties.h \
-                     taglib_wavpackfiletyperesolver.h
+                     taglib_wavpactdefiletyperesolver.h
 
diff --git a/amarok/src/metadata/wavpack/taglib_wavpackfiletyperesolver.cpp b/amarok/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.cpp
index fe289a27..feadd8b2 100644
--- a/amarok/src/metadata/wavpack/taglib_wavpackfiletyperesolver.cpp
+++ b/amarok/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.cpp
@@ -19,7 +19,7 @@
  *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
-#include "taglib_wavpackfiletyperesolver.h"
+#include "taglib_wavpactdefiletyperesolver.h"
 #include "wvfile.h"
 
 #include <string.h>
diff --git a/amarok/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h b/amarok/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.h
index b9d4500a..b9d4500a 100644
--- a/amarok/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h
+++ b/amarok/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.h
diff --git a/amarok/src/mountpointmanager.h b/amarok/src/mountpointmanager.h
index 4ea86920..54cbe8bb 100644
--- a/amarok/src/mountpointmanager.h
+++ b/amarok/src/mountpointmanager.h
@@ -26,7 +26,7 @@
 #include "pluginmanager.h"
 #include "threadmanager.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 #include <tqmap.h>
diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp
index 8a0c7a41..9f8a5013 100644
--- a/amarok/src/multitabbar.cpp
+++ b/amarok/src/multitabbar.cpp
@@ -40,7 +40,7 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconeffect.h>
 #include <kiconloader.h>
diff --git a/amarok/src/mydirlister.h b/amarok/src/mydirlister.h
index eeb8c55a..389391fd 100644
--- a/amarok/src/mydirlister.h
+++ b/amarok/src/mydirlister.h
@@ -8,7 +8,7 @@
 #include "playlistloader.h"
 
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 class MyDirLister : public KDirLister {
 public:
diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp
index 371a0d2c..0c01c1de 100644
--- a/amarok/src/playlist.cpp
+++ b/amarok/src/playlist.cpp
@@ -71,7 +71,7 @@
 #include <kglobalsettings.h> //rename()
 #include <kiconeffect.h>
 #include <kiconloader.h>     //slotShowContextMenu()
-#include <kio/job.h>         //deleteSelectedFiles()
+#include <tdeio/job.h>         //deleteSelectedFiles()
 #include <klineedit.h>       //setCurrentTrack()
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp
index 189b72a2..4ecdba3f 100644
--- a/amarok/src/playlistbrowser.cpp
+++ b/amarok/src/playlistbrowser.cpp
@@ -45,8 +45,8 @@
 #include <kactionclasses.h>
 #include <kactioncollection.h>
 #include <kapplication.h>
-#include <kfiledialog.h>       //openPlaylist()
-#include <kio/job.h>           //deleteSelectedPlaylists()
+#include <tdefiledialog.h>       //openPlaylist()
+#include <tdeio/job.h>           //deleteSelectedPlaylists()
 #include <kiconloader.h>       //smallIcon
 #include <kinputdialog.h>
 #include <klineedit.h>         //rename()
diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp
index 82b1bb22..13e43550 100644
--- a/amarok/src/playlistbrowseritem.cpp
+++ b/amarok/src/playlistbrowseritem.cpp
@@ -40,8 +40,8 @@
 #include <kapplication.h>      //Used for Shoutcast random name generation
 #include <tdeversion.h>        //TDE_VERSION ifndefs.  Remove this once we reach a kde 4 dep
 #include <kiconloader.h>       //smallIcon
-#include <kio/jobclasses.h>    //podcast retrieval
-#include <kio/job.h>           //podcast retrieval
+#include <tdeio/jobclasses.h>    //podcast retrieval
+#include <tdeio/job.h>           //podcast retrieval
 #include <klocale.h>
 #include <kmessagebox.h>       //podcast info box
 #include <kmimetype.h>
diff --git a/amarok/src/playlistbrowseritem.h b/amarok/src/playlistbrowseritem.h
index 376b8003..a37eabff 100644
--- a/amarok/src/playlistbrowseritem.h
+++ b/amarok/src/playlistbrowseritem.h
@@ -15,7 +15,7 @@
 #include "podcastsettings.h"
 
 #include <kdialogbase.h> // StreamEditor baseclass
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klineedit.h>
 #include <klistview.h>
 #include <kurl.h>
diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp
index 75edfbb1..26eca7f4 100644
--- a/amarok/src/playlistitem.cpp
+++ b/amarok/src/playlistitem.cpp
@@ -39,7 +39,7 @@
 #include <tqrect.h>
 
 #include <tdeversion.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <kglobal.h>
 #include <kiconeffect.h>
 #include <kstandarddirs.h>
diff --git a/amarok/src/playlistloader.cpp b/amarok/src/playlistloader.cpp
index 497d2e76..f05ed350 100644
--- a/amarok/src/playlistloader.cpp
+++ b/amarok/src/playlistloader.cpp
@@ -970,7 +970,7 @@ PlaylistFile::loadSMIL( TQTextStream &stream )
 /// @class RemotePlaylistFetcher
 
 #include <ktempfile.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 
 RemotePlaylistFetcher::RemotePlaylistFetcher( const KURL &source, TQListViewItem *after, int options )
diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp
index 03cfc187..9bb693bb 100644
--- a/amarok/src/playlistwindow.cpp
+++ b/amarok/src/playlistwindow.cpp
@@ -57,7 +57,7 @@
 
 #include <kaction.h>          //m_actionCollection
 #include <kapplication.h>     //kapp
-#include <kfiledialog.h>      //savePlaylist(), openPlaylist()
+#include <tdefiledialog.h>      //savePlaylist(), openPlaylist()
 #include <kglobal.h>
 #include <tdehtml_part.h>       //Welcome Tab
 #include <kiconloader.h>      //ClearFilter button
diff --git a/amarok/src/prettypopupmenu.cpp b/amarok/src/prettypopupmenu.cpp
index 4e2d1f21..1b50ff74 100644
--- a/amarok/src/prettypopupmenu.cpp
+++ b/amarok/src/prettypopupmenu.cpp
@@ -25,7 +25,7 @@
 #include <tqstyle.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconeffect.h>
 #include <kstandarddirs.h>
 
diff --git a/amarok/src/refreshimages.cpp b/amarok/src/refreshimages.cpp
index 51ef48d7..4098b83d 100644
--- a/amarok/src/refreshimages.cpp
+++ b/amarok/src/refreshimages.cpp
@@ -17,9 +17,9 @@
 #include <tqvaluelist.h>
 #include <tqvariant.h>
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/scheduler.h>
 
 #include <klocale.h>
 
diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp
index 30fcc75f..67e117f7 100644
--- a/amarok/src/scriptmanager.cpp
+++ b/amarok/src/scriptmanager.cpp
@@ -45,9 +45,9 @@
 
 #include <kaboutdialog.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/amarok/src/scrobbler.cpp b/amarok/src/scrobbler.cpp
index 8039c9bc..553f1df2 100644
--- a/amarok/src/scrobbler.cpp
+++ b/amarok/src/scrobbler.cpp
@@ -24,8 +24,8 @@
 #include <tqdeepcopy.h>
 
 #include <kapplication.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <klocale.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp
index afdd0fb1..b57bbcb1 100644
--- a/amarok/src/statusbar/statusBarBase.cpp
+++ b/amarok/src/statusbar/statusBarBase.cpp
@@ -27,7 +27,7 @@
 #include "threadmanager.h"
 #include "enginecontroller.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kstdguiitem.h>
diff --git a/amarok/src/tagguesser.cpp b/amarok/src/tagguesser.cpp
index d37de53a..514b6756 100644
--- a/amarok/src/tagguesser.cpp
+++ b/amarok/src/tagguesser.cpp
@@ -15,7 +15,7 @@
 #include "tagguesser.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kmacroexpander.h>
 
diff --git a/amarok/src/transferdialog.cpp b/amarok/src/transferdialog.cpp
index b5f258cf..e000bb93 100644
--- a/amarok/src/transferdialog.cpp
+++ b/amarok/src/transferdialog.cpp
@@ -22,7 +22,7 @@
 
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kpushbutton.h>