From 7d5c87e50cfc4e9c07e88e63053f86bf32f96848 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 14 Feb 2013 17:03:06 -0600
Subject: [PATCH] Rename common header files for consistency with class
 renaming

---
 amarok/src/Options2.ui.h                                    | 2 +-
 amarok/src/Options5.ui.h                                    | 2 +-
 amarok/src/amarokcore/crashhandler.cpp                      | 2 +-
 amarok/src/app.cpp                                          | 4 ++--
 amarok/src/app.h                                            | 2 +-
 amarok/src/browserbar.cpp                                   | 2 +-
 amarok/src/collectionbrowser.cpp                            | 2 +-
 amarok/src/collectionscanner/collectionscanner.h            | 2 +-
 amarok/src/collectionscanner/collectionscannerdcophandler.h | 2 +-
 amarok/src/collectionscanner/main.cpp                       | 6 +++---
 amarok/src/configdialog.cpp                                 | 2 +-
 amarok/src/contextbrowser.cpp                               | 2 +-
 amarok/src/coverfetcher.cpp                                 | 2 +-
 amarok/src/covermanager.cpp                                 | 2 +-
 amarok/src/database_refactor/collectiondb.cpp               | 2 +-
 amarok/src/database_refactor/sqlite/sqlite_dbengine.cpp     | 2 +-
 amarok/src/deviceconfiguredialog.cpp                        | 2 +-
 amarok/src/devicemanager.cpp                                | 2 +-
 amarok/src/dynamicmode.cpp                                  | 2 +-
 amarok/src/engine/kdemm/kdemmengine.cpp                     | 2 +-
 amarok/src/engine/mas/masengine.cpp                         | 2 +-
 amarok/src/enginecontroller.cpp                             | 2 +-
 amarok/src/equalizergraph.cpp                               | 2 +-
 amarok/src/equalizerpresetmanager.cpp                       | 2 +-
 amarok/src/equalizersetup.cpp                               | 2 +-
 amarok/src/filebrowser.cpp                                  | 2 +-
 amarok/src/firstrunwizard.ui.h                              | 2 +-
 amarok/src/htmlview.cpp                                     | 2 +-
 amarok/src/konquisidebar/universalamarok.cpp                | 2 +-
 amarok/src/ktrm.cpp                                         | 2 +-
 amarok/src/main.cpp                                         | 2 +-
 amarok/src/mediabrowser.cpp                                 | 2 +-
 amarok/src/mediadevice/daap/proxy.cpp                       | 2 +-
 amarok/src/mediadevice/generic/genericmediadevice.cpp       | 2 +-
 amarok/src/mediadevice/ifp/ifpmediadevice.cpp               | 2 +-
 amarok/src/mediadevice/ipod/ipodmediadevice.cpp             | 2 +-
 amarok/src/mediadevice/mtp/mtpmediadevice.cpp               | 2 +-
 amarok/src/mediadevice/njb/njbmediadevice.cpp               | 2 +-
 amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp     | 2 +-
 amarok/src/mediadevicemanager.cpp                           | 2 +-
 amarok/src/mediumpluginmanager.cpp                          | 2 +-
 amarok/src/metabundle.cpp                                   | 2 +-
 amarok/src/metabundlesaver.cpp                              | 2 +-
 amarok/src/multitabbar.cpp                                  | 2 +-
 amarok/src/osd.cpp                                          | 2 +-
 amarok/src/pixmapviewer.cpp                                 | 2 +-
 amarok/src/playerwindow.cpp                                 | 2 +-
 amarok/src/playlist.cpp                                     | 2 +-
 amarok/src/playlistbrowser.cpp                              | 2 +-
 amarok/src/playlistbrowseritem.cpp                          | 2 +-
 amarok/src/playlistloader.cpp                               | 2 +-
 amarok/src/playlistselection.cpp                            | 2 +-
 amarok/src/playlistwindow.cpp                               | 2 +-
 amarok/src/prettypopupmenu.cpp                              | 2 +-
 amarok/src/queuemanager.cpp                                 | 2 +-
 amarok/src/scancontroller.cpp                               | 2 +-
 amarok/src/scriptmanager.cpp                                | 4 ++--
 amarok/src/scripts/graphequalizer/eqdialog.ui.h             | 2 +-
 amarok/src/scripts/graphequalizer/equalizercanvasview.cpp   | 2 +-
 amarok/src/scripts/graphequalizer/main.cpp                  | 6 +++---
 amarok/src/scrobbler.cpp                                    | 2 +-
 amarok/src/statistics.cpp                                   | 2 +-
 amarok/src/systray.cpp                                      | 2 +-
 amarok/src/tagdialog.cpp                                    | 2 +-
 amarok/src/tagguesser.cpp                                   | 2 +-
 amarok/src/tagguesserconfigdialog.ui.h                      | 2 +-
 amarok/src/trackpickerdialog.cpp                            | 2 +-
 amarok/src/transferdialog.cpp                               | 2 +-
 doc/sv/develop.docbook                                      | 2 +-
 69 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/amarok/src/Options2.ui.h b/amarok/src/Options2.ui.h
index 178229b6..096ac593 100644
--- a/amarok/src/Options2.ui.h
+++ b/amarok/src/Options2.ui.h
@@ -15,7 +15,7 @@
 #include "debug.h"
 #include "contextbrowser.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <knewstuff/downloaddialog.h> // knewstuff theme fetching
diff --git a/amarok/src/Options5.ui.h b/amarok/src/Options5.ui.h
index deb86fe6..63f37884 100644
--- a/amarok/src/Options5.ui.h
+++ b/amarok/src/Options5.ui.h
@@ -25,7 +25,7 @@ email                : fh@ez.no
 
 #include "amarokconfig.h"
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "qstringx.h"
 #include <tqtooltip.h>
 
diff --git a/amarok/src/amarokcore/crashhandler.cpp b/amarok/src/amarokcore/crashhandler.cpp
index b3849241..930ccef5 100644
--- a/amarok/src/amarokcore/crashhandler.cpp
+++ b/amarok/src/amarokcore/crashhandler.cpp
@@ -12,7 +12,7 @@
 #include "amarokconfig.h"
 #include "crashhandler.h"
 
-#include <kapplication.h> //invokeMailer()
+#include <tdeapplication.h> //invokeMailer()
 #include <kdebug.h>       //kdBacktrace()
 #include <tdeversion.h>
 #include <klocale.h>
diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp
index 4ef86bf3..43d3e761 100644
--- a/amarok/src/app.cpp
+++ b/amarok/src/app.cpp
@@ -53,7 +53,7 @@ email                : markey@web.de
 
 #include <tdeconfigdialogmanager.h>
 #include <kcombobox.h>           //firstRunWizard()
-#include <kcmdlineargs.h>        //initCliArgs()
+#include <tdecmdlineargs.h>        //initCliArgs()
 #include <kcursor.h>             //Amarok::OverrideCursor
 #include <kedittoolbar.h>        //slotConfigToolbars()
 #include <kglobalaccel.h>        //initGlobalShortcuts()
@@ -65,7 +65,7 @@ email                : markey@web.de
 #include <krun.h>                //Amarok::invokeBrowser()
 #include <kstandarddirs.h>
 #include <kurldrag.h>            //genericEventHandler()
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeio/job.h>
 
 #include <tqevent.h>              //genericEventHandler()
diff --git a/amarok/src/app.h b/amarok/src/app.h
index 184cdfc5..4c8ad158 100644
--- a/amarok/src/app.h
+++ b/amarok/src/app.h
@@ -21,7 +21,7 @@
 #include <config.h>
 #include "amarok_export.h"
 #include "engineobserver.h" //baseclass
-#include <kapplication.h>   //baseclass
+#include <tdeapplication.h>   //baseclass
 #include <kurl.h>
 
 namespace Amarok {
diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp
index 88e1af1a..62891c85 100644
--- a/amarok/src/browserbar.cpp
+++ b/amarok/src/browserbar.cpp
@@ -15,7 +15,7 @@
 #include "enginecontroller.h"
 #include "multitabbar.h"   //m_tabBar
 
-#include <kapplication.h>  //kapp
+#include <tdeapplication.h>  //kapp
 #include <tdeconfig.h>
 #include <kiconloader.h>   //multiTabBar icons
 #include <klocale.h>
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index 26244c91..1106b12a 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -53,7 +53,7 @@
 #include <tqregexp.h>
 
 #include <tdeactioncollection.h>
-#include <kapplication.h>   //kapp
+#include <tdeapplication.h>   //kapp
 #include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kcursor.h>
diff --git a/amarok/src/collectionscanner/collectionscanner.h b/amarok/src/collectionscanner/collectionscanner.h
index 7517374f..cd38b241 100644
--- a/amarok/src/collectionscanner/collectionscanner.h
+++ b/amarok/src/collectionscanner/collectionscanner.h
@@ -29,7 +29,7 @@
 #include <tqmap.h>
 #include <tqstringlist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 typedef TQMap<TQString, TQString> AttributeMap;
 
diff --git a/amarok/src/collectionscanner/collectionscannerdcophandler.h b/amarok/src/collectionscanner/collectionscannerdcophandler.h
index c3512702..57638447 100644
--- a/amarok/src/collectionscanner/collectionscannerdcophandler.h
+++ b/amarok/src/collectionscanner/collectionscannerdcophandler.h
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 class DcopCollectionScannerHandler : public TQObject, virtual public CollectionScannerInterface
 {
diff --git a/amarok/src/collectionscanner/main.cpp b/amarok/src/collectionscanner/main.cpp
index b64e0ddb..48c68928 100644
--- a/amarok/src/collectionscanner/main.cpp
+++ b/amarok/src/collectionscanner/main.cpp
@@ -22,10 +22,10 @@
 
 #include <tqfile.h>
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 int main( int argc, char *argv[] )
 {
diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp
index 6f746ebe..41c8477c 100644
--- a/amarok/src/configdialog.cpp
+++ b/amarok/src/configdialog.cpp
@@ -51,7 +51,7 @@ email                : markey@web.de
 #include <tqtooltip.h>
 #include <tqvbox.h>
 
-#include <kapplication.h> //kapp
+#include <tdeapplication.h> //kapp
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index 057e7331..8b3dd7fc 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -53,7 +53,7 @@
 #include <tqtooltip.h>
 
 #include <tdeaction.h>
-#include <kapplication.h> //kapp
+#include <tdeapplication.h> //kapp
 #include <kcalendarsystem.h>  // for Amarok::verboseTimeSince()
 #include <tdeconfig.h> // suggested/related/favorite box visibility
 #include <kdialog.h>
diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp
index 4ffbcc0f..753b8b51 100644
--- a/amarok/src/coverfetcher.cpp
+++ b/amarok/src/coverfetcher.cpp
@@ -18,7 +18,7 @@
 #include <tqlayout.h>
 #include <tqregexp.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kcursor.h> //waiting cursor
 #include <kdialog.h>
diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp
index 03905134..d67dea10 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -34,7 +34,7 @@
 #include <tqtooltip.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <tdefiledialog.h>
diff --git a/amarok/src/database_refactor/collectiondb.cpp b/amarok/src/database_refactor/collectiondb.cpp
index caeb3c17..f02d19d8 100644
--- a/amarok/src/database_refactor/collectiondb.cpp
+++ b/amarok/src/database_refactor/collectiondb.cpp
@@ -28,7 +28,7 @@
 #include <tqimage.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kinputdialog.h>         //setupCoverFetcher()
diff --git a/amarok/src/database_refactor/sqlite/sqlite_dbengine.cpp b/amarok/src/database_refactor/sqlite/sqlite_dbengine.cpp
index 5e1d4477..8026313e 100644
--- a/amarok/src/database_refactor/sqlite/sqlite_dbengine.cpp
+++ b/amarok/src/database_refactor/sqlite/sqlite_dbengine.cpp
@@ -12,7 +12,7 @@
 #include "debug.h"
 #include "sqlite_dbengine.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqfile.h>
 #include <tqimage.h>
diff --git a/amarok/src/deviceconfiguredialog.cpp b/amarok/src/deviceconfiguredialog.cpp
index 3a8c18ed..27f36a53 100644
--- a/amarok/src/deviceconfiguredialog.cpp
+++ b/amarok/src/deviceconfiguredialog.cpp
@@ -26,7 +26,7 @@
 #include <tqbuttongroup.h>
 #include <tqvbuttongroup.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kpushbutton.h>
diff --git a/amarok/src/devicemanager.cpp b/amarok/src/devicemanager.cpp
index b6d40816..c2256f0c 100644
--- a/amarok/src/devicemanager.cpp
+++ b/amarok/src/devicemanager.cpp
@@ -25,7 +25,7 @@
 #include <dcopclient.h>
 #include <dcopobject.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 typedef Medium::List MediumList;
 typedef TQMap<TQString, Medium*>::Iterator MediumIterator;
diff --git a/amarok/src/dynamicmode.cpp b/amarok/src/dynamicmode.cpp
index a0825782..e1603e21 100644
--- a/amarok/src/dynamicmode.cpp
+++ b/amarok/src/dynamicmode.cpp
@@ -28,7 +28,7 @@
 
 #include "dynamicmode.h"
 
-#include <kapplication.h> // random func
+#include <tdeapplication.h> // random func
 
 #include <tqregexp.h>
 #include <tqvaluevector.h>
diff --git a/amarok/src/engine/kdemm/kdemmengine.cpp b/amarok/src/engine/kdemm/kdemmengine.cpp
index 3dc1aac6..185e2e0b 100644
--- a/amarok/src/engine/kdemm/kdemmengine.cpp
+++ b/amarok/src/engine/kdemm/kdemmengine.cpp
@@ -32,7 +32,7 @@ what                 : interface to the KDE Multimedia interface (KDEMM)
 #include <tqtextstream.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefileitem.h>
diff --git a/amarok/src/engine/mas/masengine.cpp b/amarok/src/engine/mas/masengine.cpp
index dce72ad9..ba31a5fa 100644
--- a/amarok/src/engine/mas/masengine.cpp
+++ b/amarok/src/engine/mas/masengine.cpp
@@ -30,7 +30,7 @@ what                 : interface to the Media Application Server (MAS)
 #include <tqtimer.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdefileitem.h>
 #include <kgenericfactory.h>
diff --git a/amarok/src/enginecontroller.cpp b/amarok/src/enginecontroller.cpp
index 23f22065..da966360 100644
--- a/amarok/src/enginecontroller.cpp
+++ b/amarok/src/enginecontroller.cpp
@@ -29,7 +29,7 @@
 #include <tqobjectlist.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefileitem.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
diff --git a/amarok/src/equalizergraph.cpp b/amarok/src/equalizergraph.cpp
index d1849a1f..36156e05 100644
--- a/amarok/src/equalizergraph.cpp
+++ b/amarok/src/equalizergraph.cpp
@@ -23,7 +23,7 @@
 #include <tqpixmap.h>
 #include <tqvaluelist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 EqualizerGraph::EqualizerGraph( TQWidget* parent )
     : TQWidget( parent, 0, TQt::WNoAutoErase )
diff --git a/amarok/src/equalizerpresetmanager.cpp b/amarok/src/equalizerpresetmanager.cpp
index 8387a7ce..c33848ee 100644
--- a/amarok/src/equalizerpresetmanager.cpp
+++ b/amarok/src/equalizerpresetmanager.cpp
@@ -25,7 +25,7 @@
 #include <tqpushbutton.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <tdelistview.h>
 #include <klocale.h>
diff --git a/amarok/src/equalizersetup.cpp b/amarok/src/equalizersetup.cpp
index 3e5f9c0b..f58c6af1 100644
--- a/amarok/src/equalizersetup.cpp
+++ b/amarok/src/equalizersetup.cpp
@@ -36,7 +36,7 @@
 #include <tqtooltip.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>  //presets
diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp
index 1964a92e..b8619e48 100644
--- a/amarok/src/filebrowser.cpp
+++ b/amarok/src/filebrowser.cpp
@@ -29,7 +29,7 @@
 #include "k3bexporter.h"
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kbookmarkhandler.h"
 #include <kdiroperator.h>
 #include <kiconloader.h>
diff --git a/amarok/src/firstrunwizard.ui.h b/amarok/src/firstrunwizard.ui.h
index aed5e9cb..4b450726 100644
--- a/amarok/src/firstrunwizard.ui.h
+++ b/amarok/src/firstrunwizard.ui.h
@@ -14,7 +14,7 @@
 #include "config.h"
 #include "directorylist.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <tqpushbutton.h>
diff --git a/amarok/src/htmlview.cpp b/amarok/src/htmlview.cpp
index 365561b1..f5520703 100644
--- a/amarok/src/htmlview.cpp
+++ b/amarok/src/htmlview.cpp
@@ -14,7 +14,7 @@
 #include <tqfile.h> // External CSS opening
 #include <tqimage.h> // External CSS opening
 
-#include <kapplication.h> //kapp
+#include <tdeapplication.h> //kapp
 #include <tdeactioncollection.h>
 #include <kglobal.h> //kapp
 #include <kimageeffect.h> // gradient background image
diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp
index bb014760..47dfd466 100644
--- a/amarok/src/konquisidebar/universalamarok.cpp
+++ b/amarok/src/konquisidebar/universalamarok.cpp
@@ -38,7 +38,7 @@
 #include <tqdatetime.h>
 #include <tqfileinfo.h>
 #include <tdetoolbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqslider.h>
 #include <kdebug.h>
 #include <kurldrag.h>
diff --git a/amarok/src/ktrm.cpp b/amarok/src/ktrm.cpp
index c068c333..fffaab8f 100644
--- a/amarok/src/ktrm.cpp
+++ b/amarok/src/ktrm.cpp
@@ -25,7 +25,7 @@
 
 #include "ktrm.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <kprotocolmanager.h>
diff --git a/amarok/src/main.cpp b/amarok/src/main.cpp
index 192015e3..d40b5695 100644
--- a/amarok/src/main.cpp
+++ b/amarok/src/main.cpp
@@ -18,7 +18,7 @@
 #include "amarok.h"
 #include "app.h"
 #include "crashhandler.h"
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "metadata/tplugins.h"
 
diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp
index 7d2da609..6ab637a3 100644
--- a/amarok/src/mediabrowser.cpp
+++ b/amarok/src/mediabrowser.cpp
@@ -57,7 +57,7 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>       //TQToolTip::add()
 
-#include <kapplication.h> //kapp
+#include <tdeapplication.h> //kapp
 #include <kcombobox.h>
 #include <kdirlister.h>
 #include <tdefiledialog.h>
diff --git a/amarok/src/mediadevice/daap/proxy.cpp b/amarok/src/mediadevice/daap/proxy.cpp
index d35849d6..63a9bc7c 100644
--- a/amarok/src/mediadevice/daap/proxy.cpp
+++ b/amarok/src/mediadevice/daap/proxy.cpp
@@ -17,7 +17,7 @@
 #include "debug.h"
 #include "proxy.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 using namespace Daap;
 
diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp
index c9b6eb65..858227f8 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.cpp
+++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp
@@ -36,7 +36,7 @@ AMAROK_EXPORT_PLUGIN( GenericMediaDevice )
 #include "transferdialog.h"
 #include "genericmediadeviceconfigdialog.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>           //download saveLocation
 #include <kdiskfreesp.h>
 #include <kiconloader.h>       //smallIcon
diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
index 2958ac84..a21b2f2c 100644
--- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
+++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
@@ -33,7 +33,7 @@ AMAROK_EXPORT_PLUGIN( IfpMediaDevice )
 #include "statusbar/statusbar.h"
 #include "transferdialog.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>           //download saveLocation
 #include <kiconloader.h>       //smallIcon
 #include <kmessagebox.h>
diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
index 43c9014f..340000ce 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
@@ -43,7 +43,7 @@ AMAROK_EXPORT_PLUGIN( IpodMediaDevice )
 #include <hintlineedit.h>
 
 #include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmountpoint.h>
 #include <kpushbutton.h>
 #include <kprogress.h>
diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
index 84314e8e..5d99df71 100644
--- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
+++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
@@ -39,7 +39,7 @@ AMAROK_EXPORT_PLUGIN( MtpMediaDevice )
 #include <collectionbrowser.h>
 
 // KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <kmessagebox.h>
diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp
index df7bb75f..c313dffb 100644
--- a/amarok/src/mediadevice/njb/njbmediadevice.cpp
+++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp
@@ -37,7 +37,7 @@ AMAROK_EXPORT_PLUGIN( NjbMediaDevice )
 
 
 // KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>       //smallIcon
diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
index f6ee15a5..f4466cd5 100644
--- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
+++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
@@ -31,7 +31,7 @@ AMAROK_EXPORT_PLUGIN( RioKarmaMediaDevice )
 #include <statusbar/popupMessage.h>
 
 // KDE
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 
diff --git a/amarok/src/mediadevicemanager.cpp b/amarok/src/mediadevicemanager.cpp
index c9b07110..c39829bf 100644
--- a/amarok/src/mediadevicemanager.cpp
+++ b/amarok/src/mediadevicemanager.cpp
@@ -23,7 +23,7 @@
 
 #include <dcopclient.h>
 #include <dcopobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 typedef Medium::List MediumList;
 
diff --git a/amarok/src/mediumpluginmanager.cpp b/amarok/src/mediumpluginmanager.cpp
index 0557b9cf..73675b38 100644
--- a/amarok/src/mediumpluginmanager.cpp
+++ b/amarok/src/mediumpluginmanager.cpp
@@ -30,7 +30,7 @@
 #include <tqtooltip.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kactivelabel.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
diff --git a/amarok/src/metabundle.cpp b/amarok/src/metabundle.cpp
index 8580952c..7787c503 100644
--- a/amarok/src/metabundle.cpp
+++ b/amarok/src/metabundle.cpp
@@ -21,7 +21,7 @@
 #include "debug.h"
 #include "collectiondb.h"
 #include "metabundlesaver.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefilemetainfo.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
diff --git a/amarok/src/metabundlesaver.cpp b/amarok/src/metabundlesaver.cpp
index 8025ee48..216b6d4e 100644
--- a/amarok/src/metabundlesaver.cpp
+++ b/amarok/src/metabundlesaver.cpp
@@ -19,7 +19,7 @@
 #include "debug.h"
 #include "metabundlesaver.h"
 #include "scancontroller.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefilemetainfo.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp
index 3a8227d7..1a1dca18 100644
--- a/amarok/src/multitabbar.cpp
+++ b/amarok/src/multitabbar.cpp
@@ -39,7 +39,7 @@
 #include <tqstyle.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconeffect.h>
diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp
index e425469d..8f8b7ff7 100644
--- a/amarok/src/osd.cpp
+++ b/amarok/src/osd.cpp
@@ -24,7 +24,7 @@
 #include "qstringx.h"
 #include "starmanager.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 #include <kstandarddirs.h>   //locate
diff --git a/amarok/src/pixmapviewer.cpp b/amarok/src/pixmapviewer.cpp
index 7d421831..4e133a4c 100644
--- a/amarok/src/pixmapviewer.cpp
+++ b/amarok/src/pixmapviewer.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.          *
  ***************************************************************************/
 #include "pixmapviewer.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
 
diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp
index f585ee6d..6f737865 100644
--- a/amarok/src/playerwindow.cpp
+++ b/amarok/src/playerwindow.cpp
@@ -37,7 +37,7 @@ email                : markey@web.de
 #include <tqtimer.h>
 #include <tqtooltip.h>        //analyzer tooltip
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp
index f09e5593..7a318cc0 100644
--- a/amarok/src/playlist.cpp
+++ b/amarok/src/playlist.cpp
@@ -65,7 +65,7 @@
 #include <tqlayout.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>         //setOverrideCursor()
 #include <kdialogbase.h>
 #include <kglobalsettings.h> //rename()
diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp
index 30c6ac18..69368ef6 100644
--- a/amarok/src/playlistbrowser.cpp
+++ b/amarok/src/playlistbrowser.cpp
@@ -44,7 +44,7 @@
 #include <tdeaction.h>
 #include <tdeactionclasses.h>
 #include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>       //openPlaylist()
 #include <tdeio/job.h>           //deleteSelectedPlaylists()
 #include <kiconloader.h>       //smallIcon
diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp
index 7834a2e4..0b649337 100644
--- a/amarok/src/playlistbrowseritem.cpp
+++ b/amarok/src/playlistbrowseritem.cpp
@@ -37,7 +37,7 @@
 #include <tqpixmap.h>           //paintCell()
 #include <tqregexp.h>
 
-#include <kapplication.h>      //Used for Shoutcast random name generation
+#include <tdeapplication.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 <tdeio/jobclasses.h>    //podcast retrieval
diff --git a/amarok/src/playlistloader.cpp b/amarok/src/playlistloader.cpp
index f05ed350..8eb748ec 100644
--- a/amarok/src/playlistloader.cpp
+++ b/amarok/src/playlistloader.cpp
@@ -37,7 +37,7 @@
 #include <tqtextstream.h> //::loadPlaylist()
 
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 
 
diff --git a/amarok/src/playlistselection.cpp b/amarok/src/playlistselection.cpp
index 4127733e..98a1a617 100644
--- a/amarok/src/playlistselection.cpp
+++ b/amarok/src/playlistselection.cpp
@@ -25,7 +25,7 @@
 #include <tqsizepolicy.h>
 #include <tqstringlist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <knuminput.h>
 #include <tdelistview.h>
diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp
index 9bf3ec1f..e8f860e3 100644
--- a/amarok/src/playlistwindow.cpp
+++ b/amarok/src/playlistwindow.cpp
@@ -56,7 +56,7 @@
 #include <tqvbox.h>            //contains the playlist
 
 #include <tdeaction.h>          //m_actionCollection
-#include <kapplication.h>     //kapp
+#include <tdeapplication.h>     //kapp
 #include <tdefiledialog.h>      //savePlaylist(), openPlaylist()
 #include <kglobal.h>
 #include <tdehtml_part.h>       //Welcome Tab
diff --git a/amarok/src/prettypopupmenu.cpp b/amarok/src/prettypopupmenu.cpp
index beb539ba..17132457 100644
--- a/amarok/src/prettypopupmenu.cpp
+++ b/amarok/src/prettypopupmenu.cpp
@@ -24,7 +24,7 @@
 #include <tqpixmap.h>
 #include <tqstyle.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconeffect.h>
 #include <kstandarddirs.h>
diff --git a/amarok/src/queuemanager.cpp b/amarok/src/queuemanager.cpp
index 6813dbe7..1734d7c2 100644
--- a/amarok/src/queuemanager.cpp
+++ b/amarok/src/queuemanager.cpp
@@ -19,7 +19,7 @@
 #include "playlist.h"
 #include "queuemanager.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kguiitem.h>
 #include <klocale.h>
 #include <kpushbutton.h>
diff --git a/amarok/src/scancontroller.cpp b/amarok/src/scancontroller.cpp
index 288f3214..16b71141 100644
--- a/amarok/src/scancontroller.cpp
+++ b/amarok/src/scancontroller.cpp
@@ -35,7 +35,7 @@
 #include <tqtextcodec.h>
 
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp
index 05983c7f..bbd04881 100644
--- a/amarok/src/scriptmanager.cpp
+++ b/amarok/src/scriptmanager.cpp
@@ -43,8 +43,8 @@
 #include <tqtextcodec.h>
 #include <tqtimer.h>
 
-#include <kaboutdialog.h>
-#include <kapplication.h>
+#include <tdeaboutdialog.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
diff --git a/amarok/src/scripts/graphequalizer/eqdialog.ui.h b/amarok/src/scripts/graphequalizer/eqdialog.ui.h
index 7d0e661d..bb87b61a 100644
--- a/amarok/src/scripts/graphequalizer/eqdialog.ui.h
+++ b/amarok/src/scripts/graphequalizer/eqdialog.ui.h
@@ -10,7 +10,7 @@
 ** destructor.
 *****************************************************************************/
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 //#include <kdebug.h>
 
 void EqDialog::init()
diff --git a/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp b/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp
index 68423ddb..9f02ef7f 100644
--- a/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp
+++ b/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp
@@ -11,7 +11,7 @@
 #include <tqpen.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/amarok/src/scripts/graphequalizer/main.cpp b/amarok/src/scripts/graphequalizer/main.cpp
index b532e68a..0f1ff103 100644
--- a/amarok/src/scripts/graphequalizer/main.cpp
+++ b/amarok/src/scripts/graphequalizer/main.cpp
@@ -6,11 +6,11 @@
 #include "etqdialog.h"
 #include "equalizercanvasview.h"
 #include "stdinreader.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 
 #include <tqcanvas.h>
diff --git a/amarok/src/scrobbler.cpp b/amarok/src/scrobbler.cpp
index 553f1df2..8bdd32bc 100644
--- a/amarok/src/scrobbler.cpp
+++ b/amarok/src/scrobbler.cpp
@@ -23,7 +23,7 @@
 #include <tqdatetime.h>
 #include <tqdeepcopy.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <klocale.h>
diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp
index ab9c5035..62b13cf4 100644
--- a/amarok/src/statistics.cpp
+++ b/amarok/src/statistics.cpp
@@ -20,7 +20,7 @@
 #include "statistics.h"
 #include "tagdialog.h"         //showContextMenu()
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeversion.h>        //TDE_VERSION ifndefs.  Remove this once we reach a kde 4 dep
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/amarok/src/systray.cpp b/amarok/src/systray.cpp
index 854b6fc9..69f07e2f 100644
--- a/amarok/src/systray.cpp
+++ b/amarok/src/systray.cpp
@@ -16,7 +16,7 @@
 #include <tqevent.h>
 #include <tqimage.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kiconeffect.h>
 #include <kstandarddirs.h>
diff --git a/amarok/src/tagdialog.cpp b/amarok/src/tagdialog.cpp
index 047a64b4..7f6a15c6 100644
--- a/amarok/src/tagdialog.cpp
+++ b/amarok/src/tagdialog.cpp
@@ -31,7 +31,7 @@
 #include <tqvbox.h>
 #include <tqcheckbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kcursor.h>
 #include <kglobal.h>
diff --git a/amarok/src/tagguesser.cpp b/amarok/src/tagguesser.cpp
index 514b6756..59442dbe 100644
--- a/amarok/src/tagguesser.cpp
+++ b/amarok/src/tagguesser.cpp
@@ -14,7 +14,7 @@
 #include "debug.h"
 #include "tagguesser.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kmacroexpander.h>
diff --git a/amarok/src/tagguesserconfigdialog.ui.h b/amarok/src/tagguesserconfigdialog.ui.h
index fc7be1fc..88f5d0b6 100644
--- a/amarok/src/tagguesserconfigdialog.ui.h
+++ b/amarok/src/tagguesserconfigdialog.ui.h
@@ -25,7 +25,7 @@
 
 #include <tqevent.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 
diff --git a/amarok/src/trackpickerdialog.cpp b/amarok/src/trackpickerdialog.cpp
index 5c202a02..88a0077d 100644
--- a/amarok/src/trackpickerdialog.cpp
+++ b/amarok/src/trackpickerdialog.cpp
@@ -19,7 +19,7 @@
 
 #include <tqlabel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdelistview.h>
 #include <klocale.h>
 
diff --git a/amarok/src/transferdialog.cpp b/amarok/src/transferdialog.cpp
index e000bb93..ce7bf02f 100644
--- a/amarok/src/transferdialog.cpp
+++ b/amarok/src/transferdialog.cpp
@@ -20,7 +20,7 @@
 #include <tqlayout.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <klineedit.h>
diff --git a/doc/sv/develop.docbook b/doc/sv/develop.docbook
index 39084c78..af36495f 100644
--- a/doc/sv/develop.docbook
+++ b/doc/sv/develop.docbook
@@ -61,7 +61,7 @@
 <entry
 >app.cpp</entry>
 <entry
->Det här är klassen som är härledd från kapplication. Den är överliggande klass för många objekt som är grundläggande för att köra &amarok;, t.ex. engine, dcop, systray, grafiska toppnivåkomponenter, etc.</entry>
+>Det här är klassen som är härledd från tdeapplication. Den är överliggande klass för många objekt som är grundläggande för att köra &amarok;, t.ex. engine, dcop, systray, grafiska toppnivåkomponenter, etc.</entry>
 </row>
 
 <row>