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 @@
- kfontrequester.h
- kfontrequester.h
- kfontrequester.h
+ tdefontrequester.h
+ tdefontrequester.h
+ tdefontrequester.h
kcolorbutton.h
kcolorbutton.h
kcolorbutton.h
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
#include
-#include
+#include
#include
#include
#include
#include
-#include
-#include
+#include
+#include
#include
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
-#include
+#include
+#include
#include
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
#include
-#include
+#include
#include
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 //paletteChange()
#include //mousePressEvent
#include //mousePressEvent
-#include //mousePressEvent
+#include //mousePressEvent
#include //mousePressEvent
#include //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
@@ -427,8 +427,8 @@ void App::initCliArgs( int argc, char *argv[] ) //static
}
-#include
-#include
+#include
+#include
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
+#include
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
#include
-#include
+#include
#include //kapp
#include
#include
@@ -62,8 +62,8 @@
#include //renderView()
#include
#include
-#include
-#include //ctor
+#include
+#include //ctor
#include //dragObject()
#include
#include
@@ -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
Copyright (C) 2000,2003 Charles Samuels
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 //stack allocated
#include //baseclass
-#include //baseclass
+#include //baseclass
#include //stack allocated
#include //stack allocated
#include //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
#include
#include
-#include
+#include
#include
#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
#include
-#include
+#include
#include //kapp
#include // for Amarok::verboseTimeSince()
#include // suggested/related/favorite box visibility
@@ -64,10 +64,10 @@
#include
#include // for data: URLs
#include
-#include
+#include
#include
#include
-#include
+#include
#include //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
-#include
+#include
#include
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
#include
#include
-#include
+#include
#include
#include
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
#include
#include
-#include
+#include
#include
#include //showCoverMenu()
#include
#include
-#include //showCoverMenu()
+#include //showCoverMenu()
#include
#include
#include //status label
#include
#include //paintItem
-#include
-#include //clear filter button
+#include
+#include //clear filter button
#include
#include
#include
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 @@
- klistbox.h
+ tdelistbox.h
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
#include
#include
-#include
+#include
#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
+#include
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
+#include
#include
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
#include
-#include
+#include
#include
#include
#include //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 //presets
#include
#include
-#include
+#include
#include //locate()
#include
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
+#include
#include
#include "kbookmarkhandler.h"
#include
#include
#include
-#include
+#include
#include
-#include
+#include
#include ///@see SearchPane
-#include ///@see ctor
+#include ///@see ctor
#include
#include
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 //baseclass
#include //some inline functions
-#include //baseclass
+#include //baseclass
#include //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 // External CSS opening
#include //kapp
-#include
+#include
#include //kapp
#include // gradient background image
-#include
+#include
#include //locate file
#include
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
#include
#include
-#include
+#include
#include
#include
#include
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
#include
-#include
+#include
#include
#include //md5sum
#include
#include
#include
#include
-#include
+#include
#include
#include
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
+#include
#include
/**
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
+#include
/**
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
-#include
+#include
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 @@
- klistview.h
+ tdelistview.h
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
#include
#include
-#include
+#include
#include
#include
#include
@@ -76,9 +76,9 @@
#include //locate file
#include
#include
-#include //ctor
+#include //ctor
#include //dragObject()
-#include
+#include
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 //baseclass
#include
-#include //baseclass
+#include //baseclass
#include //stack allocated
#include //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
#include
#include
-#include
+#include
#include
#include //loading icons
#include
-#include
-#include
+#include
+#include
#if DNSSD_SUPPORT
#include
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
#include
#include
-#include
+#include
#include //downloadSelectedItems()
#include //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 //download saveLocation
#include //smallIcon
#include
-#include
+#include
#include //downloadSelectedItems()
#include