Rename many classes and header files to avoid conflicts with KDE4

71 files changed, 122 insertions, 122 deletions

diff --git a/amarok/src/CMakeLists.txt b/amarok/src/CMakeLists.txt
index 3b0d94c8..42f6c645 100644
--- a/amarok/src/CMakeLists.txt
+++ b/amarok/src/CMakeLists.txt
@@ -97,7 +97,7 @@ tde_add_library( amarok SHARED AUTOMOC
     scrobbler.cpp sliderwidget.cpp smartplaylisteditor.cpp socketserver.cpp
     starmanager.cpp statistics.cpp systray.cpp tagdialog.cpp tagdialogbase.ui
     tagguesser.cpp tagguesserconfigdialog.ui threadmanager.cpp tooltip.cpp
-    trackpickerdialog.cpp trackpickerdialogbase.ui tracktooltip.cpp
+    trackpickerdialog.cpp trackpickerdialogbase.ui tractdetooltip.cpp
     transferdialog.cpp xmlloader.cpp xspfplaylist.cpp editfilterdialog.cpp
   VERSION 0.0.0
   EMBED
diff --git a/amarok/src/Makefile.am b/amarok/src/Makefile.am
index 938f6962..332c82fd 100644
--- a/amarok/src/Makefile.am
+++ b/amarok/src/Makefile.am
@@ -145,7 +145,7 @@ libamarok_la_SOURCES = \
     tooltip.cpp \
     trackpickerdialog.cpp \
     trackpickerdialogbase.ui \
-    tracktooltip.cpp \
+    tractdetooltip.cpp \
     transferdialog.cpp \
     xmlloader.cpp \
     xspfplaylist.cpp \
diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui
index 8b28ef56..f914ebd5 100644
--- a/amarok/src/Options2.ui
+++ b/amarok/src/Options2.ui
@@ -757,9 +757,9 @@
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kfontrequester.h</includehint>
-    <includehint>kfontrequester.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp
index 4f88d91a..630ccd46 100644
--- a/amarok/src/actionclasses.cpp
+++ b/amarok/src/actionclasses.cpp
@@ -21,13 +21,13 @@
 #include <tqpixmap.h>
 #include <tqtooltip.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kurl.h>
 
 extern TDEAboutData aboutData;
diff --git a/amarok/src/actionclasses.h b/amarok/src/actionclasses.h
index f653cee6..ea4201d6 100644
--- a/amarok/src/actionclasses.h
+++ b/amarok/src/actionclasses.h
@@ -11,8 +11,8 @@
 #include "prettypopupmenu.h"
 #include "sliderwidget.h"
 
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <tqguardedptr.h>
 
 class TDEActionCollection;
diff --git a/amarok/src/amarokcore/amarokdcophandler.cpp b/amarok/src/amarokcore/amarokdcophandler.cpp
index 9d9a45ca..c73261d7 100644
--- a/amarok/src/amarokcore/amarokdcophandler.cpp
+++ b/amarok/src/amarokcore/amarokdcophandler.cpp
@@ -46,7 +46,7 @@
 #include <tqfile.h>
 
 #include <dcopclient.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kstartupinfo.h>
 
 
diff --git a/amarok/src/analyzers/blockanalyzer.cpp b/amarok/src/analyzers/blockanalyzer.cpp
index 9377a344..28252448 100644
--- a/amarok/src/analyzers/blockanalyzer.cpp
+++ b/amarok/src/analyzers/blockanalyzer.cpp
@@ -17,7 +17,7 @@
 #include <kglobalsettings.h> //paletteChange()
 #include <kiconloader.h>     //mousePressEvent
 #include <klocale.h>         //mousePressEvent
-#include <kpopupmenu.h>      //mousePressEvent
+#include <tdepopupmenu.h>      //mousePressEvent
 
 #include <tqevent.h>          //mousePressEvent
 #include <tqpainter.h>        //paletteChange()
diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp
index 9b171fed..4733cd99 100644
--- a/amarok/src/app.cpp
+++ b/amarok/src/app.cpp
@@ -47,7 +47,7 @@ email                : markey@web.de
 #include "statusbar.h"
 #include "systray.h"
 #include "threadmanager.h"
-#include "tracktooltip.h"        //engineNewMetaData()
+#include "tractdetooltip.h"        //engineNewMetaData()
 
 #include <iostream>
 
@@ -427,8 +427,8 @@ void App::initCliArgs( int argc, char *argv[] ) //static
 }
 
 
-#include <kaction.h>
-#include <kshortcutlist.h>
+#include <tdeaction.h>
+#include <tdeshortcutlist.h>
 void App::initGlobalShortcuts()
 {
     EngineController* const ec = EngineController::instance();
@@ -481,7 +481,7 @@ void App::initGlobalShortcuts()
     m_pGlobalAccel->readSettings( kapp->config() );
     m_pGlobalAccel->updateConnections();
 
-    //TODO fix kde accel system so that kactions find appropriate global shortcuts
+    //TODO fix kde accel system so that tdeactions find appropriate global shortcuts
     //     and there is only one configure shortcuts dialog
 
     TDEActionCollection* const ac = Amarok::actionCollection();
diff --git a/amarok/src/browserToolBar.h b/amarok/src/browserToolBar.h
index d0d6f257..2ad8fa82 100644
--- a/amarok/src/browserToolBar.h
+++ b/amarok/src/browserToolBar.h
@@ -11,7 +11,7 @@
 #ifndef BROWSER_TOOLBAR_H
 #define BROWSER_TOOLBAR_H
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 namespace Browser
 {
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index f4a1c954..0fd0006f 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -52,7 +52,7 @@
 #include <tqheader.h>
 #include <tqregexp.h>
 
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kapplication.h>   //kapp
 #include <tdeconfig.h>
 #include <kcombobox.h>
@@ -62,8 +62,8 @@
 #include <kiconloader.h>    //renderView()
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
-#include <ktoolbarbutton.h> //ctor
+#include <tdepopupmenu.h>
+#include <tdetoolbarbutton.h> //ctor
 #include <kurldrag.h>       //dragObject()
 #include <tdeio/job.h>
 #include <kpushbutton.h>
@@ -4374,7 +4374,7 @@ CollectionItem::paintCell ( TQPainter * painter, const TQColorGroup & cg,
 #if KDE_IS_VERSION( 3, 3, 91 )
         if( listView()->shadeSortColumn() && !isSelected() && listView()->columnSorted() == column )
         {
-            /* from klistview.cpp
+            /* from tdelistview.cpp
                Copyright (C) 2000 Reginald Stadlbauer <reggie@kde.org>
                Copyright (C) 2000,2003 Charles Samuels <charles@kde.org>
                Copyright (C) 2000 Peter Putzer */
diff --git a/amarok/src/collectionbrowser.h b/amarok/src/collectionbrowser.h
index 5f9dda0f..e5e60ee1 100644
--- a/amarok/src/collectionbrowser.h
+++ b/amarok/src/collectionbrowser.h
@@ -11,7 +11,7 @@
 #include <tqvaluelist.h>      //stack allocated
 #include <tqvbox.h>           //baseclass
 
-#include <klistview.h>       //baseclass
+#include <tdelistview.h>       //baseclass
 #include <tqstringlist.h>     //stack allocated
 #include <kurl.h>            //stack allocated
 #include <kdialogbase.h>     //baseclass
diff --git a/amarok/src/columnlist.cpp b/amarok/src/columnlist.cpp
index 9106c898..2deff873 100644
--- a/amarok/src/columnlist.cpp
+++ b/amarok/src/columnlist.cpp
@@ -23,7 +23,7 @@
 #include <tqpainter.h>
 #include <tqtooltip.h>
 #include <tqvbox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 #include "amarokconfig.h"
 #include "metabundle.h"
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index 9047f352..95da8984 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -52,7 +52,7 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h> //kapp
 #include <kcalendarsystem.h>  // for Amarok::verboseTimeSince()
 #include <tdeconfig.h> // suggested/related/favorite box visibility
@@ -64,10 +64,10 @@
 #include <tdeio/jobclasses.h>
 #include <kmdcodec.h> // for data: URLs
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 #include <unistd.h> //usleep()
 
diff --git a/amarok/src/contextbrowser.h b/amarok/src/contextbrowser.h
index 56744f72..2f046c5c 100644
--- a/amarok/src/contextbrowser.h
+++ b/amarok/src/contextbrowser.h
@@ -13,7 +13,7 @@
 #include "engineobserver.h"
 
 #include <ktabwidget.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <kurl.h>
 
 class ClickLineEdit;
diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp
index b9cafc97..4ffbcc0f 100644
--- a/amarok/src/coverfetcher.cpp
+++ b/amarok/src/coverfetcher.cpp
@@ -29,7 +29,7 @@
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <twin.h>
 
diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp
index 0b5c80da..e8f9e61f 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -39,19 +39,19 @@
 #include <kcursor.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>    //showCoverMenu()
 #include <tdemultipledrag.h>
 #include <tdeio/netaccess.h>
-#include <kpopupmenu.h>    //showCoverMenu()
+#include <tdepopupmenu.h>    //showCoverMenu()
 #include <kprogress.h>
 #include <kpushbutton.h>
 #include <ksqueezedtextlabel.h> //status label
 #include <kstatusbar.h>
 #include <kstringhandler.h>    //paintItem
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>    //clear filter button
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>    //clear filter button
 #include <kurl.h>
 #include <kurldrag.h>
 #include <twin.h>
diff --git a/amarok/src/deletedialogbase.ui b/amarok/src/deletedialogbase.ui
index 63a678c3..5a21c0b5 100644
--- a/amarok/src/deletedialogbase.ui
+++ b/amarok/src/deletedialogbase.ui
@@ -130,6 +130,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/amarok/src/editfilterdialog.cpp b/amarok/src/editfilterdialog.cpp
index f4dbf49e..e1d7ed4d 100644
--- a/amarok/src/editfilterdialog.cpp
+++ b/amarok/src/editfilterdialog.cpp
@@ -18,7 +18,7 @@
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 #include "amarokcore/amarokconfig.h"
 #include "collectiondb.h"
diff --git a/amarok/src/engine/nmm/HostList.h b/amarok/src/engine/nmm/HostList.h
index fd9f93f9..20a1999d 100644
--- a/amarok/src/engine/nmm/HostList.h
+++ b/amarok/src/engine/nmm/HostList.h
@@ -25,7 +25,7 @@
 #ifndef HOSTLIST_H
 #define HOSTLIST_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class HostListItem;
 
diff --git a/amarok/src/engine/nmm/HostListItem.h b/amarok/src/engine/nmm/HostListItem.h
index 8fa0cc88..569cb098 100644
--- a/amarok/src/engine/nmm/HostListItem.h
+++ b/amarok/src/engine/nmm/HostListItem.h
@@ -25,7 +25,7 @@
 #ifndef HOSTLISTITEM_H
 #define HOSTLISTITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpixmap.h>
 
 class HostListItem : public TDEListViewItem {
diff --git a/amarok/src/equalizerpresetmanager.cpp b/amarok/src/equalizerpresetmanager.cpp
index e45bf812..8387a7ce 100644
--- a/amarok/src/equalizerpresetmanager.cpp
+++ b/amarok/src/equalizerpresetmanager.cpp
@@ -27,7 +27,7 @@
 
 #include <kapplication.h>
 #include <kinputdialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h> //locate()
diff --git a/amarok/src/equalizersetup.cpp b/amarok/src/equalizersetup.cpp
index 4e83421e..3e5f9c0b 100644
--- a/amarok/src/equalizersetup.cpp
+++ b/amarok/src/equalizersetup.cpp
@@ -42,7 +42,7 @@
 #include <kinputdialog.h>  //presets
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h> //locate()
 #include <twin.h>
 
diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp
index 2f04f8e5..1964a92e 100644
--- a/amarok/src/filebrowser.cpp
+++ b/amarok/src/filebrowser.cpp
@@ -28,17 +28,17 @@
 #include "filebrowser.h"
 #include "k3bexporter.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include "kbookmarkhandler.h"
 #include <kdiroperator.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>     ///@see SearchPane
-#include <ktoolbarbutton.h>  ///@see ctor
+#include <tdetoolbarbutton.h>  ///@see ctor
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 
diff --git a/amarok/src/filebrowser.h b/amarok/src/filebrowser.h
index e987c860..61ac95c3 100644
--- a/amarok/src/filebrowser.h
+++ b/amarok/src/filebrowser.h
@@ -26,7 +26,7 @@
 
 #include <tqvbox.h>        //baseclass
 #include <kdiroperator.h> //some inline functions
-#include <ktoolbar.h>     //baseclass
+#include <tdetoolbar.h>     //baseclass
 #include <kurl.h>         //stack allocated
 
 class ClickLineEdit;
diff --git a/amarok/src/htmlview.cpp b/amarok/src/htmlview.cpp
index 4f6ddf3f..365561b1 100644
--- a/amarok/src/htmlview.cpp
+++ b/amarok/src/htmlview.cpp
@@ -15,10 +15,10 @@
 #include <tqimage.h> // External CSS opening
 
 #include <kapplication.h> //kapp
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kglobal.h> //kapp
 #include <kimageeffect.h> // gradient background image
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h> //locate file
 #include <ktempfile.h>
 
diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp
index 11c425bb..bb014760 100644
--- a/amarok/src/konquisidebar/universalamarok.cpp
+++ b/amarok/src/konquisidebar/universalamarok.cpp
@@ -37,7 +37,7 @@
 #include <kiconloader.h>
 #include <tqdatetime.h>
 #include <tqfileinfo.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kapplication.h>
 #include <tqslider.h>
 #include <kdebug.h>
diff --git a/amarok/src/ktrm.cpp b/amarok/src/ktrm.cpp
index c068c333..7973eaa1 100644
--- a/amarok/src/ktrm.cpp
+++ b/amarok/src/ktrm.cpp
@@ -780,11 +780,11 @@ void KTRMLookup::lookupResult( TDEIO::Job* job )
             TQDomElement release = releaseNode.toElement();
 
             tmpResult.d->album = release.namedItem( "title" ).toElement().text();
-            TQDomNode tracklistN = release.namedItem( "track-list" );
-            if ( !tracklistN.isNull() ) {
-                TQDomElement tracklist = tracklistN.toElement();
-                if ( !tracklist.attribute( "offset" ).isEmpty() )
-                    tmpResult.d->track = tracklist.attribute( "offset" ).toInt() + 1;
+            TQDomNode tractdelistN = release.namedItem( "track-list" );
+            if ( !tractdelistN.isNull() ) {
+                TQDomElement tractdelist = tractdelistN.toElement();
+                if ( !tractdelist.attribute( "offset" ).isEmpty() )
+                    tmpResult.d->track = tractdelist.attribute( "offset" ).toInt() + 1;
             }
             //tmpResult.d->year = ???;
             tmpResult.d->relevance =
diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp
index 9c81af6b..aa94755b 100644
--- a/amarok/src/lastfm.cpp
+++ b/amarok/src/lastfm.cpp
@@ -30,14 +30,14 @@
 #include <tqlabel.h>
 #include <tqregexp.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klineedit.h>
 #include <kmdcodec.h>       //md5sum
 #include <kmessagebox.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <kprotocolmanager.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kurl.h>
 
 #include <time.h>
diff --git a/amarok/src/magnatunebrowser/magnatunelistview.h b/amarok/src/magnatunebrowser/magnatunelistview.h
index 9b39120a..328ab9f0 100644
--- a/amarok/src/magnatunebrowser/magnatunelistview.h
+++ b/amarok/src/magnatunebrowser/magnatunelistview.h
@@ -22,7 +22,7 @@
 
 #include "magnatunelistviewitems.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurldrag.h>
 
 /**
diff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.h b/amarok/src/magnatunebrowser/magnatunelistviewitems.h
index a5a4c695..cfc315c7 100644
--- a/amarok/src/magnatunebrowser/magnatunelistviewitems.h
+++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.h
@@ -24,7 +24,7 @@
 #include "magnatunedatabasehandler.h"
 #include "magnatunetypes.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 /**
 A specialized TDEListViewItem that encapsulates a MagnatuneArtist
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
index 2d71ca00..65e995c3 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
@@ -21,7 +21,7 @@
 #include "magnatuneredownloaddialog.h"
 
 #include <tqpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 MagnatuneRedownloadDialog::MagnatuneRedownloadDialog(TQWidget* parent, const char* name, bool modal, WFlags fl)
 : magnatuneReDownloadDialogBase(parent,name, modal,fl)
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
index d2f4bdef..a58a0dda 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
@@ -104,6 +104,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp
index d98697aa..261a92e7 100644
--- a/amarok/src/mediabrowser.cpp
+++ b/amarok/src/mediabrowser.cpp
@@ -68,7 +68,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdemultipledrag.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kprogress.h>
 #include <kpushbutton.h>
@@ -76,9 +76,9 @@
 #include <kstandarddirs.h> //locate file
 #include <ktabbar.h>
 #include <ktempfile.h>
-#include <ktoolbarbutton.h> //ctor
+#include <tdetoolbarbutton.h> //ctor
 #include <kurldrag.h>       //dragObject()
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 
 MediaBrowser *MediaBrowser::s_instance = 0;
diff --git a/amarok/src/mediabrowser.h b/amarok/src/mediabrowser.h
index a50657d9..ad672ade 100644
--- a/amarok/src/mediabrowser.h
+++ b/amarok/src/mediabrowser.h
@@ -19,7 +19,7 @@
 #include <tqvbox.h>           //baseclass
 #include <tqdatetime.h>
 
-#include <klistview.h>       //baseclass
+#include <tdelistview.h>       //baseclass
 #include <kurl.h>            //stack allocated
 #include <tdeio/global.h>      //filesize_t
 #include "scrobbler.h"       //SubmitItem
@@ -592,7 +592,7 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin
         virtual void copyTrackFromDevice(MediaItem *item);
 
         /**
-         * Recursively remove MediaItem from the tracklist and the device
+         * Recursively remove MediaItem from the tractdelist and the device
          * @param item MediaItem to remove
          * @param onlyPlayed True if item should be deleted only if it has been played
          * @return -1 on failure, number of files deleted otherwise
diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp
index 90ada7e7..8c336835 100644
--- a/amarok/src/mediadevice/daap/daapclient.cpp
+++ b/amarok/src/mediadevice/daap/daapclient.cpp
@@ -42,12 +42,12 @@
 #include <klineedit.h>
 #include <knuminput.h>
 #include <kpassdlg.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kresolver.h>
 #include <kstandarddirs.h>     //loading icons
 #include <ktempfile.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 
 #if DNSSD_SUPPORT
     #include <dnssd/remoteservice.h>
diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp
index 5520c75e..c9b6eb65 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.cpp
+++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp
@@ -45,7 +45,7 @@ AMAROK_EXPORT_PLUGIN( GenericMediaDevice )
 #include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kmountpoint.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurlrequester.h>     //downloadSelectedItems()
 #include <kurlrequesterdlg.h>  //downloadSelectedItems()
 
diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
index 8cd04c32..2958ac84 100644
--- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
+++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
@@ -37,7 +37,7 @@ AMAROK_EXPORT_PLUGIN( IfpMediaDevice )
 #include <tdeconfig.h>           //download saveLocation
 #include <kiconloader.h>       //smallIcon
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurlrequester.h>     //downloadSelectedItems()
 #include <kurlrequesterdlg.h>  //downloadSelectedItems()
 
diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
index 81f74f2e..43c9014f 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
@@ -42,14 +42,14 @@ AMAROK_EXPORT_PLUGIN( IpodMediaDevice )
 #include <metadata/tplugins.h>
 #include <hintlineedit.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <kmountpoint.h>
 #include <kpushbutton.h>
 #include <kprogress.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqcheckbox.h>
 #include <tqdir.h>
diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
index b6235db5..d0c94cc5 100644
--- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
+++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
@@ -41,9 +41,9 @@ AMAROK_EXPORT_PLUGIN( MtpMediaDevice )
 // KDE
 #include <kapplication.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <ktempdir.h>
 
 // TQt
@@ -1482,7 +1482,7 @@ MtpMediaDevice::readMtpMusic()
 
     kapp->processEvents( 100 );
 
-    LIBMTP_track_t *tracks = LIBMTP_Get_Tracklisting_With_Callback( m_device, progressCallback, this );
+    LIBMTP_track_t *tracks = LIBMTP_Get_Tractdelisting_With_Callback( m_device, progressCallback, this );
 
     debug() << "Got tracks from device" << endl;
 
diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp
index 905330b3..df7bb75f 100644
--- a/amarok/src/mediadevice/njb/njbmediadevice.cpp
+++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp
@@ -44,9 +44,9 @@ AMAROK_EXPORT_PLUGIN( NjbMediaDevice )
 #include <kinstance.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ktempdir.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <kurl.h>
 #include <kurlrequester.h>     //downloadSelectedItems()
 #include <kurlrequesterdlg.h>  //downloadSelectedItems()
diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
index b0fabc71..f6ee15a5 100644
--- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
+++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
@@ -33,7 +33,7 @@ AMAROK_EXPORT_PLUGIN( RioKarmaMediaDevice )
 // KDE
 #include <kapplication.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 // TQt
 #include <tqdir.h>
diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp
index c275339d..06fd0487 100644
--- a/amarok/src/multitabbar.cpp
+++ b/amarok/src/multitabbar.cpp
@@ -45,7 +45,7 @@
 #include <kiconeffect.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstringhandler.h>
 
 #define NEARBYINT(i) ((int(float(i) + 0.5)))
diff --git a/amarok/src/mydiroperator.h b/amarok/src/mydiroperator.h
index 8ac2462b..abfda61b 100644
--- a/amarok/src/mydiroperator.h
+++ b/amarok/src/mydiroperator.h
@@ -3,9 +3,9 @@
 
 #include "mydirlister.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdiroperator.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 class Medium;
 
diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp
index 6b8ad9a7..928a0ba7 100644
--- a/amarok/src/playerwindow.cpp
+++ b/amarok/src/playerwindow.cpp
@@ -24,7 +24,7 @@ email                : markey@web.de
 #include "metabundle.h"      //setScroll()
 #include "playerwindow.h"
 #include "sliderwidget.h"
-#include "tracktooltip.h"    //setScroll()
+#include "tractdetooltip.h"    //setScroll()
 
 #include <tqaccel.h>          //our quit shortcut in the ctor
 #include <tqevent.h>          //various events
diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp
index 633d2606..db690e65 100644
--- a/amarok/src/playlist.cpp
+++ b/amarok/src/playlist.cpp
@@ -64,7 +64,7 @@
 #include <tqvaluevector.h>    //playNextTrack()
 #include <tqlayout.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcursor.h>         //setOverrideCursor()
 #include <kdialogbase.h>
@@ -75,7 +75,7 @@
 #include <klineedit.h>       //setCurrentTrack()
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krandomsequence.h> //random Mode
 #include <kstandarddirs.h>   //TDEGlobal::dirs()
 #include <kstdaction.h>
@@ -695,7 +695,7 @@ Playlist::restoreSession()
 }
 
 /*
-    The following two functions (saveLayout(), restoreLayout()), taken from klistview.cpp, are largely
+    The following two functions (saveLayout(), restoreLayout()), taken from tdelistview.cpp, are largely
     Copyright (C) 2000 Reginald Stadlbauer <reggie@kde.org>
     Copyright (C) 2000,2003 Charles Samuels <charles@kde.org>
     Copyright (C) 2000 Peter Putzer
diff --git a/amarok/src/playlist.h b/amarok/src/playlist.h
index 9ed7d8ab..fb5fa32f 100644
--- a/amarok/src/playlist.h
+++ b/amarok/src/playlist.h
@@ -29,9 +29,9 @@
 #include "playlistitem.h"
 #include "metabundle.h"
 #include "tooltip.h"         //baseclass
-#include "tracktooltip.h"
+#include "tractdetooltip.h"
 
-#include <klistview.h>       //baseclass
+#include <tdelistview.h>       //baseclass
 #include <kurl.h>            //KURL::List
 #include <tqdir.h>            //stack allocated
 #include <tqpoint.h>          //stack allocated
diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp
index e63b66ac..30c6ac18 100644
--- a/amarok/src/playlistbrowser.cpp
+++ b/amarok/src/playlistbrowser.cpp
@@ -41,9 +41,9 @@
 #include <tqpixmap.h>           //paintCell()
 #include <tqtextstream.h>       //loadPlaylists(), saveM3U(), savePLS()
 
-#include <kaction.h>
-#include <kactionclasses.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
+#include <tdeactioncollection.h>
 #include <kapplication.h>
 #include <tdefiledialog.h>       //openPlaylist()
 #include <tdeio/job.h>           //deleteSelectedPlaylists()
@@ -54,7 +54,7 @@
 #include <kmessagebox.h>       //renamePlaylist(), deleteSelectedPlaylist()
 #include <kmimetype.h>
 #include <tdemultipledrag.h>     //dragObject()
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>     //TDEGlobal::dirs()
 #include <kurldrag.h>          //dragObject()
diff --git a/amarok/src/playlistbrowser.h b/amarok/src/playlistbrowser.h
index b17d6609..f9d40144 100644
--- a/amarok/src/playlistbrowser.h
+++ b/amarok/src/playlistbrowser.h
@@ -14,8 +14,8 @@
 #include "playlistbrowseritem.h"
 #include "podcastsettings.h"
 
-#include <kaction.h>
-#include <klistview.h>
+#include <tdeaction.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 #include <kurl.h>
 #include <tqdom.h>
diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp
index b65e857b..7834a2e4 100644
--- a/amarok/src/playlistbrowseritem.cpp
+++ b/amarok/src/playlistbrowseritem.cpp
@@ -45,7 +45,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>       //podcast info box
 #include <kmimetype.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 #include <kstandarddirs.h>     //podcast loading icons
 #include <kstringhandler.h>
diff --git a/amarok/src/playlistbrowseritem.h b/amarok/src/playlistbrowseritem.h
index b5b4cd80..573f6ec5 100644
--- a/amarok/src/playlistbrowseritem.h
+++ b/amarok/src/playlistbrowseritem.h
@@ -17,7 +17,7 @@
 #include <kdialogbase.h> // StreamEditor baseclass
 #include <tdeio/job.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 
 #include <tqdom.h>
diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp
index b1814d78..5eaed3f2 100644
--- a/amarok/src/playlistitem.cpp
+++ b/amarok/src/playlistitem.cpp
@@ -699,7 +699,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co
         #if KDE_IS_VERSION( 3, 3, 91 )
         if( listView()->shadeSortColumn() && !isSelected() && listView()->columnSorted() == column )
         {
-            /* from klistview.cpp
+            /* from tdelistview.cpp
                 Copyright (C) 2000 Reginald Stadlbauer <reggie@kde.org>
                 Copyright (C) 2000,2003 Charles Samuels <charles@kde.org>
                 Copyright (C) 2000 Peter Putzer */
diff --git a/amarok/src/playlistitem.h b/amarok/src/playlistitem.h
index 83e92aea..16f01caa 100644
--- a/amarok/src/playlistitem.h
+++ b/amarok/src/playlistitem.h
@@ -12,7 +12,7 @@
 #include "metabundle.h" //baseclass
 #include "amarok_export.h"
 
-#include <klistview.h> //baseclass
+#include <tdelistview.h> //baseclass
 #include <kurl.h>      //stack allocated
 
 #include <tqcolor.h>    //stack allocated
diff --git a/amarok/src/playlistselection.cpp b/amarok/src/playlistselection.cpp
index c8ca3193..4127733e 100644
--- a/amarok/src/playlistselection.cpp
+++ b/amarok/src/playlistselection.cpp
@@ -28,7 +28,7 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <knuminput.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 
 PlaylistSelection::PlaylistSelection( TQWidget* parent, const char* name )
diff --git a/amarok/src/playlistselection.h b/amarok/src/playlistselection.h
index cb460c3e..bf35a57e 100644
--- a/amarok/src/playlistselection.h
+++ b/amarok/src/playlistselection.h
@@ -10,7 +10,7 @@
 #ifndef PLAYLISTSELECTION_H
 #define PLAYLISTSELECTION_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class NewDynamic;
 class KDialogBase;
diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp
index abb1912b..9bf3ec1f 100644
--- a/amarok/src/playlistwindow.cpp
+++ b/amarok/src/playlistwindow.cpp
@@ -55,7 +55,7 @@
 #include <tqtooltip.h>         //TQToolTip::add()
 #include <tqvbox.h>            //contains the playlist
 
-#include <kaction.h>          //m_actionCollection
+#include <tdeaction.h>          //m_actionCollection
 #include <kapplication.h>     //kapp
 #include <tdefiledialog.h>      //savePlaylist(), openPlaylist()
 #include <kglobal.h>
@@ -65,11 +65,11 @@
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>      //savePlaylist()
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>    //Welcome Tab, locate welcome.html
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>   //createGUI()
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>   //createGUI()
 #include <kxmlguibuilder.h>   //XMLGUI
 #include <kxmlguifactory.h>   //XMLGUI
 
diff --git a/amarok/src/prettypopupmenu.h b/amarok/src/prettypopupmenu.h
index 23a1be75..3485aaea 100644
--- a/amarok/src/prettypopupmenu.h
+++ b/amarok/src/prettypopupmenu.h
@@ -21,7 +21,7 @@
 #ifndef AMAROK_PRETTYPOPUPMENU_H
 #define AMAROK_PRETTYPOPUPMENU_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqcolor.h>
 #include <tqimage.h>
diff --git a/amarok/src/queuemanager.h b/amarok/src/queuemanager.h
index aa92f03a..fc429cc3 100644
--- a/amarok/src/queuemanager.h
+++ b/amarok/src/queuemanager.h
@@ -17,7 +17,7 @@
 #include "playlistitem.h"
 
 #include <kdialogbase.h>    //baseclass
-#include <klistview.h>      //baseclass
+#include <tdelistview.h>      //baseclass
 
 #include <tqmap.h>
 
diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp
index ec197ac2..a2101c37 100644
--- a/amarok/src/scriptmanager.cpp
+++ b/amarok/src/scriptmanager.cpp
@@ -48,10 +48,10 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocio.h>
 #include <kprotocolmanager.h>
 #include <kpushbutton.h>
diff --git a/amarok/src/scripts/graphequalizer/equalizercanvasview.h b/amarok/src/scripts/graphequalizer/equalizercanvasview.h
index 50e0dec1..c894dc11 100644
--- a/amarok/src/scripts/graphequalizer/equalizercanvasview.h
+++ b/amarok/src/scripts/graphequalizer/equalizercanvasview.h
@@ -15,7 +15,7 @@
 
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class EqualizerCircle : public TQCanvasEllipse
 {
diff --git a/amarok/src/sliderwidget.cpp b/amarok/src/sliderwidget.cpp
index 4bba200c..e81cd9ee 100644
--- a/amarok/src/sliderwidget.cpp
+++ b/amarok/src/sliderwidget.cpp
@@ -38,7 +38,7 @@
 #include <kimageeffect.h>
 #include <klocale.h>
 #include <kpixmapeffect.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 Amarok::Slider::Slider( Qt::Orientation orientation, TQWidget *parent, uint max )
diff --git a/amarok/src/socketserver.cpp b/amarok/src/socketserver.cpp
index fbff36ad..596ee632 100644
--- a/amarok/src/socketserver.cpp
+++ b/amarok/src/socketserver.cpp
@@ -17,7 +17,7 @@
 #include "enginecontroller.h" //to get the engine
 #include "statusbar.h"
 #include <klocale.h>
-#include <kpopupmenu.h>       //Vis::Selector
+#include <tdepopupmenu.h>       //Vis::Selector
 #include <kprocess.h>         //Vis::Selector
 #include <twin.h>             //Vis::Selector
 #include <kstandarddirs.h>    //locateLocal()
diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp
index c0e6ec4b..cb008f35 100644
--- a/amarok/src/statistics.cpp
+++ b/amarok/src/statistics.cpp
@@ -25,9 +25,9 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <tdemultipledrag.h>     //startDrag()
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstringhandler.h>    //paintCell
-#include <ktoolbarbutton.h>    //ctor
+#include <tdetoolbarbutton.h>    //ctor
 #include <kurldrag.h>          //startDrag()
 #include <twin.h>
 
diff --git a/amarok/src/statistics.h b/amarok/src/statistics.h
index 9e3e41c9..6dc22ee9 100644
--- a/amarok/src/statistics.h
+++ b/amarok/src/statistics.h
@@ -17,7 +17,7 @@
 #include "playlistwindow.h"
 
 #include <kdialogbase.h>    //baseclass
-#include <klistview.h>      //baseclass
+#include <tdelistview.h>      //baseclass
 
 #include <tqtimer.h>
 
diff --git a/amarok/src/statusbar/queueLabel.cpp b/amarok/src/statusbar/queueLabel.cpp
index fc14829f..e8f3c57b 100644
--- a/amarok/src/statusbar/queueLabel.cpp
+++ b/amarok/src/statusbar/queueLabel.cpp
@@ -31,10 +31,10 @@
 #include <tqpixmap.h>
 #include <tqtimer.h>
 
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstringhandler.h>
 
 static const uint MAX_TO_SHOW = 20;
diff --git a/amarok/src/statusbar/toggleLabel.h b/amarok/src/statusbar/toggleLabel.h
index a1d2cca9..4417a790 100644
--- a/amarok/src/statusbar/toggleLabel.h
+++ b/amarok/src/statusbar/toggleLabel.h
@@ -27,7 +27,7 @@
 #include "overlayWidget.h"
 #include "popupMessage.h"
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <tqiconset.h>
diff --git a/amarok/src/systray.cpp b/amarok/src/systray.cpp
index c1315882..026f0e5e 100644
--- a/amarok/src/systray.cpp
+++ b/amarok/src/systray.cpp
@@ -15,9 +15,9 @@
 
 #include <tqevent.h>
 #include <tqimage.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconeffect.h>
 #include <kstandarddirs.h>
 
diff --git a/amarok/src/tagguesserconfigdialog.ui b/amarok/src/tagguesserconfigdialog.ui
index 7c6ac774..49fb9219 100644
--- a/amarok/src/tagguesserconfigdialog.ui
+++ b/amarok/src/tagguesserconfigdialog.ui
@@ -212,7 +212,7 @@ Note that the order in which the schemes appear in the list is relevant, since t
 <layoutfunctions spacing="KDialog::spacingHint"/>
 <includehints>
     <includehint>kdialog.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/amarok/src/trackpickerdialog.cpp b/amarok/src/trackpickerdialog.cpp
index 743d9c8f..5c202a02 100644
--- a/amarok/src/trackpickerdialog.cpp
+++ b/amarok/src/trackpickerdialog.cpp
@@ -20,7 +20,7 @@
 #include <tqlabel.h>
 
 #include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 
 #include "trackpickerdialog.h"
diff --git a/amarok/src/trackpickerdialogbase.ui b/amarok/src/trackpickerdialogbase.ui
index f7e2172a..b997554d 100644
--- a/amarok/src/trackpickerdialogbase.ui
+++ b/amarok/src/trackpickerdialogbase.ui
@@ -177,6 +177,6 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/amarok/src/tractdetooltip.cpp b/amarok/src/tractdetooltip.cpp
index 08cae102..3c51e114 100644
--- a/amarok/src/tractdetooltip.cpp
+++ b/amarok/src/tractdetooltip.cpp
@@ -6,7 +6,7 @@
 */
 
 /*
-  tracktooltip.cpp
+  tractdetooltip.cpp
   begin:     Tue 10 Feb 2004
   copyright: (C) 2004 by Christian Muehlhaeuser
   email:     chris@chris.de
@@ -29,7 +29,7 @@
 #include <kstandarddirs.h>
 
 
-#include "tracktooltip.h"
+#include "tractdetooltip.h"
 
 
 TrackToolTip *TrackToolTip::instance()
@@ -348,4 +348,4 @@ void TrackToolTip::updateWidgets()
     Amarok::ToolTip::updateTip();
 }
 
-#include "tracktooltip.moc"
+#include "tractdetooltip.moc"
diff --git a/amarok/src/tractdetooltip.h b/amarok/src/tractdetooltip.h
index 62543313..86a30950 100644
--- a/amarok/src/tractdetooltip.h
+++ b/amarok/src/tractdetooltip.h
@@ -6,7 +6,7 @@
 */
 
 /*
-  tracktooltip.h  -  Provides an interface to a plain TQWidget, which is independent of KDE (bypassed to X11)
+  tractdetooltip.h  -  Provides an interface to a plain TQWidget, which is independent of KDE (bypassed to X11)
   begin:     Tue 10 Feb 2004
   copyright: (C) 2004 by Christian Muehlhaeuser
   email:     chris@chris.de