Rename additional header files to avoid conflicts with KDE4

amarok/src/Options2.ui.h

@@ -17,7 +17,7 @@
 
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knewstuff/downloaddialog.h> // knewstuff theme fetching
 #include <knewstuff/engine.h>         // "
 #include <knewstuff/knewstuff.h>      // "

amarok/src/Options5.ui.h

@@ -24,7 +24,7 @@ email                : fh@ez.no
 *****************************************************************************/
 
 #include "amarokconfig.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include "qstringx.h"
 #include <tqtooltip.h>

amarok/src/actionclasses.cpp

@@ -24,7 +24,7 @@
 #include <tdeaction.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>

amarok/src/amarokcore/amarokdcophandler.cpp

@@ -47,7 +47,7 @@
 
 #include <dcopclient.h>
 #include <tdeactioncollection.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 
 namespace Amarok

amarok/src/amarokcore/crashhandler.cpp

@@ -15,8 +15,8 @@
 #include <tdeapplication.h> //invokeMailer()
 #include <kdebug.h>       //kdBacktrace()
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqfile.h>
 #include <tqregexp.h>

amarok/src/analyzers/analyzerfactory.cpp

@@ -33,7 +33,7 @@
 #endif
 
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //separate from analyzerbase.cpp to save compile time
 

amarok/src/analyzers/blockanalyzer.cpp

@@ -14,9 +14,9 @@
 #include <cmath>
 
 #include <tdeconfig.h>
-#include <kglobalsettings.h> //paletteChange()
+#include <tdeglobalsettings.h> //paletteChange()
 #include <kiconloader.h>     //mousePressEvent
-#include <klocale.h>         //mousePressEvent
+#include <tdelocale.h>         //mousePressEvent
 #include <tdepopupmenu.h>      //mousePressEvent
 
 #include <tqevent.h>          //mousePressEvent

amarok/src/app.cpp

@@ -57,11 +57,11 @@ email                : markey@web.de
 #include <kcursor.h>             //Amarok::OverrideCursor
 #include <kedittoolbar.h>        //slotConfigToolbars()
 #include <kglobalaccel.h>        //initGlobalShortcuts()
-#include <kglobalsettings.h>     //applyColorScheme()
+#include <tdeglobalsettings.h>     //applyColorScheme()
 #include <kiconloader.h>         //amarok Icon
 #include <kkeydialog.h>          //slotConfigShortcuts()
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>         //applySettings(), genericEventHandler()
+#include <tdemessagebox.h>         //applySettings(), genericEventHandler()
 #include <krun.h>                //Amarok::invokeBrowser()
 #include <kstandarddirs.h>
 #include <kurldrag.h>            //genericEventHandler()

amarok/src/browserbar.cpp

@@ -18,7 +18,7 @@
 #include <tdeapplication.h>  //kapp
 #include <tdeconfig.h>
 #include <kiconloader.h>   //multiTabBar icons
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcursor.h>       //for resize cursor
 #include <tqpainter.h>

amarok/src/collectionbrowser.cpp

@@ -58,10 +58,10 @@
 #include <kcombobox.h>
 #include <kcursor.h>
 #include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>    //renderView()
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdetoolbarbutton.h> //ctor
 #include <kurldrag.h>       //dragObject()

amarok/src/collectiondb.cpp

@@ -54,12 +54,12 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>          //checkDatabase()
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>         //setupCoverFetcher()
 #include <klineedit.h>            //setupCoverFetcher()
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <tdeio/job.h>

amarok/src/collectionscanner/collectionscanner.cpp

@@ -41,8 +41,8 @@
 #include <tqtimer.h>
 
 #include <dcopref.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 CollectionScanner::CollectionScanner( const TQStringList& folders,

amarok/src/collectionscanner/main.cpp

@@ -24,7 +24,7 @@
 
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 int main( int argc, char *argv[] )

amarok/src/configdialog.cpp

@@ -55,7 +55,7 @@ email                : markey@web.de
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 

amarok/src/contextbrowser.cpp

@@ -58,12 +58,12 @@
 #include <tdeconfig.h> // suggested/related/favorite box visibility
 #include <kdialog.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <kmdcodec.h> // for data: URLs
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>

amarok/src/coverfetcher.cpp

@@ -27,8 +27,8 @@
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <twin.h>

amarok/src/covermanager.cpp

@@ -40,8 +40,8 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>    //showCoverMenu()
+#include <tdemessagebox.h>    //showCoverMenu()
 #include <tdemultipledrag.h>
 #include <tdeio/netaccess.h>
 #include <tdepopupmenu.h>    //showCoverMenu()

amarok/src/cuefile.cpp

@@ -7,7 +7,7 @@
 #include <tqmap.h>
 #include <tqstringlist.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "cuefile.h"
 #include "metabundle.h"

amarok/src/database_refactor/collectiondb.cpp

@@ -30,11 +30,11 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>         //setupCoverFetcher()
 #include <tdeio/job.h>
 #include <klineedit.h>            //setupCoverFetcher()
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 #include <kurl.h>

amarok/src/database_refactor/dbenginebase.cpp

@@ -23,7 +23,7 @@
 #include <dbenginebase.h>
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 //////////////////////////////////////////////////////////////////////////////////////////

amarok/src/deletedialog.cpp

@@ -16,10 +16,10 @@
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <kurl.h>
 

amarok/src/deviceconfiguredialog.cpp

@@ -28,7 +28,7 @@
 
 #include <tdeapplication.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <twin.h>
 

amarok/src/directorylist.cpp

@@ -21,7 +21,7 @@
 #include "mountpointmanager.h"
 
 #include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqlabel.h>

amarok/src/editfilterdialog.cpp

@@ -13,11 +13,11 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdetoolbarbutton.h>
 
 #include "amarokcore/amarokconfig.h"

amarok/src/engine/akode/akode-engine.cpp

@@ -11,7 +11,7 @@
 #include <akode-engine.h>
 #include <akode/decoder.h>
 #include <akode/player.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqapplication.h>
 
 AMAROK_EXPORT_PLUGIN( AkodeEngine )

amarok/src/engine/helix/helix-configdialog.cpp

@@ -23,7 +23,7 @@
 
 #include <klineedit.h>
 #include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 
 #include "helix-configdialog.h"

amarok/src/engine/helix/helix-engine.cpp

@@ -23,8 +23,8 @@
 
 #include "debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqapplication.h>
 #include <tqdir.h>

amarok/src/engine/helix/helix-errors.cpp

@@ -11,7 +11,7 @@
 #include <config.h>
 #include <iostream>
 #include "debug.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <map>
 
 using namespace std;

amarok/src/engine/kdemm/kdemmengine.cpp

@@ -37,8 +37,8 @@ what                 : interface to the KDE Multimedia interface (KDEMM)
 #include <kdebug.h>
 #include <tdefileitem.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <kurl.h>

amarok/src/engine/mas/masengine.cpp

@@ -34,8 +34,8 @@ what                 : interface to the Media Application Server (MAS)
 #include <tdeconfig.h>
 #include <tdefileitem.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <kurl.h>

amarok/src/engine/nmm/HostList.cpp

@@ -26,7 +26,7 @@
 
 #include <tqcursor.h>
 #include <tqheader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "debug.h"
 #include "HostListItem.h"

amarok/src/engine/nmm/HostListItem.cpp

@@ -30,9 +30,9 @@
 #include <tqpainter.h>
 #include <tqwhatsthis.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 #include <kstandarddirs.h>

amarok/src/engine/nmm/nmm_engine.cpp

@@ -50,8 +50,8 @@
 #include <tqtimer.h>
 
 #include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <iostream>
 #include <kurl.h>

amarok/src/engine/void/void-engine.cpp

@@ -16,7 +16,7 @@ copyright            : (C) 2004 by Mark Kretschmann <markey@web.de>
 
 #include "void-engine.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 AMAROK_EXPORT_PLUGIN( VoidEngine )

amarok/src/engine/xine/xine-config.cpp

@@ -13,7 +13,7 @@
 #include "xinecfg.h"
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
 

amarok/src/engine/xine/xine-engine.cpp

@@ -30,8 +30,8 @@ AMAROK_EXPORT_PLUGIN( XineEngine )
 #include <cmath>
 #include "debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include <tqapplication.h>

amarok/src/engine/yauap/yauap-engine.cpp

@@ -15,7 +15,7 @@ copyright            : (C) 2006 by Sascha Sommer <saschasommer@freenet.de>
 
 #include <tqapplication.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <iostream>
 #include <sys/types.h>
 #include <sys/stat.h>

amarok/src/enginecontroller.cpp

@@ -33,7 +33,7 @@
 #include <tdefileitem.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 
 #include <cstdlib>

amarok/src/equalizerpresetmanager.cpp

@@ -28,8 +28,8 @@
 #include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h> //locate()
 
 EqualizerPresetManager::EqualizerPresetManager( TQWidget *parent, const char *name )

amarok/src/equalizersetup.cpp

@@ -40,8 +40,8 @@
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>  //presets
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h> //locate()
 #include <twin.h>

amarok/src/filebrowser.cpp

@@ -31,11 +31,11 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include "kbookmarkhandler.h"
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>     ///@see SearchPane
 #include <tdetoolbarbutton.h>  ///@see ctor

amarok/src/filebrowser.h

@@ -25,7 +25,7 @@
 #define FILESELECTOR_WIDGET_H
 
 #include <tqvbox.h>        //baseclass
-#include <kdiroperator.h> //some inline functions
+#include <tdediroperator.h> //some inline functions
 #include <tdetoolbar.h>     //baseclass
 #include <kurl.h>         //stack allocated
 

amarok/src/firstrunwizard.ui.h

@@ -16,7 +16,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpushbutton.h>
 
 namespace Amarok

amarok/src/htmlview.cpp

@@ -16,11 +16,11 @@
 
 #include <tdeapplication.h> //kapp
 #include <tdeactioncollection.h>
-#include <kglobal.h> //kapp
+#include <tdeglobal.h> //kapp
 #include <kimageeffect.h> // gradient background image
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h> //locate file
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 KTempFile *HTMLView::m_bgGradientImage = 0;
 KTempFile *HTMLView::m_headerGradientImage = 0;

amarok/src/k3bexporter.cpp

@@ -20,8 +20,8 @@
 #include "amarok.h"
 
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqcstring.h>

amarok/src/kbookmarkhandler.cpp

@@ -23,7 +23,7 @@
 #include "kbookmarkhandler.h"
 #include <kbookmarkimporter.h>
 #include <kbookmarkmenu.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kstandarddirs.h>
 
 KBookmarkHandler::KBookmarkHandler( KDirOperator *parent, TDEPopupMenu* rootmenu )

amarok/src/konquisidebar/universalamarok.cpp

@@ -24,15 +24,15 @@
 
 #include <tqlabel.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tqwidget.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <dcopclient.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <tqdatetime.h>

amarok/src/ktrm.cpp

@@ -28,7 +28,7 @@
 #include <tdeapplication.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kurl.h>
 #include <kresolver.h>
 

amarok/src/lastfm.cpp

@@ -33,10 +33,10 @@
 #include <tdeaction.h>
 #include <klineedit.h>
 #include <kmdcodec.h>       //md5sum
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <tdeshortcut.h>
 #include <kurl.h>
 

amarok/src/loader/loader.cpp

@@ -23,7 +23,7 @@
 #include <tqprocess.h>
 #include <tqstring.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ksplashscreen.h>
 

amarok/src/magnatunebrowser/magnatunebrowser.cpp

@@ -27,7 +27,7 @@ Boston, MA 02110-1301, USA.
 #include <kstandarddirs.h> //locate()
 #include <kurl.h>
 #include <kiconloader.h>   //multiTabBar icons
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqsplitter.h>
 #include <tqdragobject.h>

amarok/src/magnatunebrowser/magnatunelistview.cpp

@@ -22,7 +22,7 @@
 #include "magnatunelistview.h"
 
 #include <tdeversion.h>  
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcolor.h>
 

amarok/src/magnatunebrowser/magnatunelistviewitems.cpp

@@ -20,9 +20,9 @@
 #include "debug.h"
 #include "magnatunelistviewitems.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h> 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqdatetime.h>
 

amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp

@@ -26,7 +26,7 @@
 
 #include "tqdir.h"
 #include "tqmessagebox.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 

amarok/src/mediabrowser.cpp

@@ -61,12 +61,12 @@
 #include <kcombobox.h>
 #include <kdirlister.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdemultipledrag.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
@@ -75,7 +75,7 @@
 #include <krun.h>
 #include <kstandarddirs.h> //locate file
 #include <ktabbar.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdetoolbarbutton.h> //ctor
 #include <kurldrag.h>       //dragObject()
 #include <tdeactioncollection.h>

amarok/src/mediadevice/daap/daapclient.cpp

@@ -45,7 +45,7 @@
 #include <tdepopupmenu.h>
 #include <kresolver.h>
 #include <kstandarddirs.h>     //loading icons
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
 

amarok/src/mediadevice/daap/daapclient.h

@@ -20,7 +20,7 @@
 
 #include <tdeversion.h>
 #include <kdialogbase.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #define DNSSD_SUPPORT KDE_IS_VERSION(3,4,0)
 

amarok/src/mediadevice/generic/genericmediadevice.cpp

@@ -43,7 +43,7 @@ AMAROK_EXPORT_PLUGIN( GenericMediaDevice )
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmountpoint.h>
 #include <tdepopupmenu.h>
 #include <kurlrequester.h>     //downloadSelectedItems()

amarok/src/mediadevice/ifp/ifpmediadevice.cpp

@@ -36,7 +36,7 @@ AMAROK_EXPORT_PLUGIN( IfpMediaDevice )
 #include <tdeapplication.h>
 #include <tdeconfig.h>           //download saveLocation
 #include <kiconloader.h>       //smallIcon
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kurlrequester.h>     //downloadSelectedItems()
 #include <kurlrequesterdlg.h>  //downloadSelectedItems()

amarok/src/mediadevice/ipod/ipodmediadevice.cpp

@@ -47,7 +47,7 @@ AMAROK_EXPORT_PLUGIN( IpodMediaDevice )
 #include <kmountpoint.h>
 #include <kpushbutton.h>
 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 

amarok/src/mediadevice/mtp/mtpmediadevice.cpp

@@ -42,7 +42,7 @@ AMAROK_EXPORT_PLUGIN( MtpMediaDevice )
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdetoolbarbutton.h>
 #include <ktempdir.h>
 

amarok/src/mediadevice/njb/njbmediadevice.cpp

@@ -42,8 +42,8 @@ AMAROK_EXPORT_PLUGIN( NjbMediaDevice )
 #include <tdefiledialog.h>
 #include <kiconloader.h>       //smallIcon
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <ktempdir.h>
 #include <tdetoolbarbutton.h>

amarok/src/mediadevice/njb/track.cpp

@@ -26,7 +26,7 @@ static const char* rcsid __attribute__((unused)) =
 #include <tqregexp.h>
 #include <tqptrlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 /* ------------------------------------------------------------------------ */

amarok/src/medium.cpp

@@ -20,7 +20,7 @@
 #include "medium.h"
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 const TQString Medium::SEPARATOR = "---";
 

amarok/src/mediumpluginmanager.cpp

@@ -36,7 +36,7 @@
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 using Amarok::escapeHTML;

amarok/src/mediumpluginmanager.h

@@ -22,7 +22,7 @@
 
 #include <tdeconfig.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class TQButton;
 class TQGroupBox;

amarok/src/metabundle.h

@@ -13,7 +13,7 @@
 
 #include <tqstringlist.h>
 #include <kurl.h>    //inline functions
-#include <klocale.h> //inline functions
+#include <tdelocale.h> //inline functions
 #include <taglib/audioproperties.h>
 #include "expression.h"
 #include "atomicstring.h"

amarok/src/metabundlesaver.h

@@ -7,7 +7,7 @@
 #include <tqobject.h>
 #include <tqstringlist.h>
 #include <kurl.h>    //inline functions
-#include <klocale.h> //inline functions
+#include <tdelocale.h> //inline functions
 #include <taglib/audioproperties.h>
 #include "expression.h"
 #include "atomicstring.h"

amarok/src/mountpointmanager.cpp

@@ -28,7 +28,7 @@
 #include "pluginmanager.h"
 #include "statusbar.h"
 
-#include <kglobal.h>        //used in init()
+#include <tdeglobal.h>        //used in init()
 #include <ktrader.h>
 
 #include <tqfile.h>

amarok/src/multitabbar.cpp

@@ -44,7 +44,7 @@
 #include <kdebug.h>
 #include <kiconeffect.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>
 

amarok/src/mydiroperator.h

@@ -4,7 +4,7 @@
 #include "mydirlister.h"
 
 #include <tdeaction.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tdepopupmenu.h>
 
 class Medium;

amarok/src/osd.cpp

@@ -604,7 +604,7 @@ OSDWidget::useMoodbar( void )
 
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace Amarok
 {

amarok/src/playerwindow.cpp

@@ -38,8 +38,8 @@ email                : markey@web.de
 #include <tqtooltip.h>        //analyzer tooltip
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <kurldrag.h>

amarok/src/playlist.cpp

@@ -68,13 +68,13 @@
 #include <tdeapplication.h>
 #include <kcursor.h>         //setOverrideCursor()
 #include <kdialogbase.h>
-#include <kglobalsettings.h> //rename()
+#include <tdeglobalsettings.h> //rename()
 #include <kiconeffect.h>
 #include <kiconloader.h>     //slotShowContextMenu()
 #include <tdeio/job.h>         //deleteSelectedFiles()
 #include <klineedit.h>       //setCurrentTrack()
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <krandomsequence.h> //random Mode
 #include <kstandarddirs.h>   //TDEGlobal::dirs()

amarok/src/playlistbrowser.cpp

@@ -50,8 +50,8 @@
 #include <kiconloader.h>       //smallIcon
 #include <kinputdialog.h>
 #include <klineedit.h>         //rename()
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>       //renamePlaylist(), deleteSelectedPlaylist()
+#include <tdemessagebox.h>       //renamePlaylist(), deleteSelectedPlaylist()
 #include <kmimetype.h>
 #include <tdemultipledrag.h>     //dragObject()
 #include <tdepopupmenu.h>

amarok/src/playlistbrowseritem.cpp

@@ -42,8 +42,8 @@
 #include <kiconloader.h>       //smallIcon
 #include <tdeio/jobclasses.h>    //podcast retrieval
 #include <tdeio/job.h>           //podcast retrieval
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>       //podcast info box
+#include <tdemessagebox.h>       //podcast info box
 #include <kmimetype.h>
 #include <tdepopupmenu.h>
 #include <krun.h>

amarok/src/playlistitem.cpp

@@ -40,7 +40,7 @@
 
 #include <tdeversion.h>
 #include <tdefilemetainfo.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconeffect.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>

amarok/src/playlistloader.cpp

@@ -969,9 +969,9 @@ PlaylistFile::loadSMIL( TQTextStream &stream )
 
 /// @class RemotePlaylistFetcher
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 RemotePlaylistFetcher::RemotePlaylistFetcher( const KURL &source, TQListViewItem *after, int options )
         : TQObject( Playlist::instance()->qscrollview() )

amarok/src/playlistselection.cpp

@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <knuminput.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 PlaylistSelection::PlaylistSelection( TQWidget* parent, const char* name )
     : TDEListView( parent, name )

amarok/src/playlistwindow.cpp

@@ -58,13 +58,13 @@
 #include <tdeaction.h>          //m_actionCollection
 #include <tdeapplication.h>     //kapp
 #include <tdefiledialog.h>      //savePlaylist(), openPlaylist()
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdehtml_part.h>       //Welcome Tab
 #include <kiconloader.h>      //ClearFilter button
 #include <kinputdialog.h>     //slotAddStream()
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
-#include <kmessagebox.h>      //savePlaylist()
+#include <tdemessagebox.h>      //savePlaylist()
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>    //Welcome Tab, locate welcome.html

amarok/src/pluginmanager.cpp

@@ -25,8 +25,8 @@ email                : markey@web.de
 #include <tqstring.h>
 
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 using std::vector;
 using Amarok::Plugin;

amarok/src/podcastsettings.cpp

@@ -8,9 +8,9 @@
 
 #include <klineedit.h>
 #include <knuminput.h>
-#include <kmessagebox.h>    //global changes confirmation
+#include <tdemessagebox.h>    //global changes confirmation
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <twin.h>
 

amarok/src/queuemanager.cpp

@@ -21,7 +21,7 @@
 
 #include <tdeapplication.h>
 #include <kguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kurldrag.h>
 #include <twin.h>

amarok/src/refreshimages.cpp

@@ -21,7 +21,7 @@
 #include <tdeio/jobclasses.h>
 #include <tdeio/scheduler.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 RefreshImages::RefreshImages()

amarok/src/scancontroller.cpp

@@ -36,8 +36,8 @@
 
 #include <dcopref.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // class ScanController

amarok/src/scriptmanager.cpp

@@ -49,11 +49,11 @@
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprocio.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kpushbutton.h>
 #include <krun.h>
 #include <kstandarddirs.h>

amarok/src/scripts/graphequalizer/equalizercanvasview.cpp

@@ -13,8 +13,8 @@
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 EqualizerCanvasView::EqualizerCanvasView(TQWidget *parent = 0, const char *name = 0)
     : TQCanvasView(parent, name)

amarok/src/scripts/graphequalizer/main.cpp

@@ -9,7 +9,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 

amarok/src/scrobbler.cpp

@@ -26,7 +26,7 @@
 #include <tdeapplication.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 #include <kurl.h>

amarok/src/sliderwidget.cpp

@@ -36,7 +36,7 @@
 
 #include <kiconloader.h>
 #include <kimageeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpixmapeffect.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>

amarok/src/smartplaylisteditor.cpp

@@ -15,7 +15,7 @@
 
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmountpoint.h>
 #include <knuminput.h>
 

amarok/src/socketserver.cpp

@@ -16,7 +16,7 @@
 #include "enginebase.h"       //to get the scope
 #include "enginecontroller.h" //to get the engine
 #include "statusbar.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>       //Vis::Selector
 #include <kprocess.h>         //Vis::Selector
 #include <twin.h>             //Vis::Selector

amarok/src/statistics.cpp

@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <tdeversion.h>        //TDE_VERSION ifndefs.  Remove this once we reach a kde 4 dep
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemultipledrag.h>     //startDrag()
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>    //paintCell

amarok/src/statusbar/progressBar.cpp

@@ -21,7 +21,7 @@
 #include "progressBar.h"
 #include "statusbar.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 

amarok/src/statusbar/queueLabel.cpp

@@ -32,7 +32,7 @@
 #include <tqtimer.h>
 
 #include <tdeactioncollection.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>

amarok/src/statusbar/selectLabel.h

@@ -28,7 +28,7 @@
 #include "overlayWidget.h"
 #include "popupMessage.h"
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tqiconset.h>
 #include <tqlabel.h>

amarok/src/statusbar/statusBarBase.cpp

@@ -29,7 +29,7 @@
 
 #include <tdeio/job.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 
 #include <tqapplication.h>

amarok/src/statusbar/statusbar.cpp

@@ -29,7 +29,7 @@
 #include "statusbar.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqhbox.h>
 #include <tqlayout.h>

amarok/src/statusbar/toggleLabel.h

@@ -28,7 +28,7 @@
 #include "popupMessage.h"
 
 #include <tdeactionclasses.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tqiconset.h>
 #include <tqlabel.h>

amarok/src/tagdialog.cpp

@@ -34,13 +34,13 @@
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kcursor.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>
 #include <ktabwidget.h>
 #include <ktextedit.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <krun.h>
 #include <kstandarddirs.h>

amarok/src/tagguesser.cpp

@@ -16,7 +16,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kmacroexpander.h>
 
 FileNameScheme::FileNameScheme( const TQString &s )

amarok/src/tooltip.cpp

@@ -22,7 +22,7 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqsimplerichtext.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "debug.h"
 #include "tooltip.h"

amarok/src/trackpickerdialog.cpp

@@ -21,7 +21,7 @@
 
 #include <tdeapplication.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "trackpickerdialog.h"
 #include "trackpickerdialogbase.h"

amarok/src/transferdialog.cpp

@@ -24,7 +24,7 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 TransferDialog::TransferDialog( MediaDevice *mdev )