diff options
Diffstat (limited to 'amarok/src')
-rw-r--r-- | amarok/src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | amarok/src/Makefile.am | 2 | ||||
-rw-r--r-- | amarok/src/app.cpp | 2 | ||||
-rw-r--r-- | amarok/src/ktrm.cpp | 10 | ||||
-rw-r--r-- | amarok/src/mediabrowser.h | 2 | ||||
-rw-r--r-- | amarok/src/mediadevice/mtp/mtpmediadevice.cpp | 2 | ||||
-rw-r--r-- | amarok/src/playerwindow.cpp | 2 | ||||
-rw-r--r-- | amarok/src/playlist.h | 2 | ||||
-rw-r--r-- | amarok/src/tractdetooltip.cpp | 6 | ||||
-rw-r--r-- | amarok/src/tractdetooltip.h | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/amarok/src/CMakeLists.txt b/amarok/src/CMakeLists.txt index 42f6c645..3b0d94c8 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 tractdetooltip.cpp + trackpickerdialog.cpp trackpickerdialogbase.ui tracktooltip.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 332c82fd..938f6962 100644 --- a/amarok/src/Makefile.am +++ b/amarok/src/Makefile.am @@ -145,7 +145,7 @@ libamarok_la_SOURCES = \ tooltip.cpp \ trackpickerdialog.cpp \ trackpickerdialogbase.ui \ - tractdetooltip.cpp \ + tracktooltip.cpp \ transferdialog.cpp \ xmlloader.cpp \ xspfplaylist.cpp \ diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp index ab4af5a1..4ef86bf3 100644 --- a/amarok/src/app.cpp +++ b/amarok/src/app.cpp @@ -47,7 +47,7 @@ email : [email protected] #include "statusbar.h" #include "systray.h" #include "threadmanager.h" -#include "tractdetooltip.h" //engineNewMetaData() +#include "tracktooltip.h" //engineNewMetaData() #include <iostream> diff --git a/amarok/src/ktrm.cpp b/amarok/src/ktrm.cpp index 7973eaa1..c068c333 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 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; + 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; } //tmpResult.d->year = ???; tmpResult.d->relevance = diff --git a/amarok/src/mediabrowser.h b/amarok/src/mediabrowser.h index ad672ade..cbf5bd40 100644 --- a/amarok/src/mediabrowser.h +++ b/amarok/src/mediabrowser.h @@ -592,7 +592,7 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin virtual void copyTrackFromDevice(MediaItem *item); /** - * Recursively remove MediaItem from the tractdelist and the device + * Recursively remove MediaItem from the tracklist 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/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp index d0c94cc5..84314e8e 100644 --- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp +++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp @@ -1482,7 +1482,7 @@ MtpMediaDevice::readMtpMusic() kapp->processEvents( 100 ); - LIBMTP_track_t *tracks = LIBMTP_Get_Tractdelisting_With_Callback( m_device, progressCallback, this ); + LIBMTP_track_t *tracks = LIBMTP_Get_Tracklisting_With_Callback( m_device, progressCallback, this ); debug() << "Got tracks from device" << endl; diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp index 814b163f..f585ee6d 100644 --- a/amarok/src/playerwindow.cpp +++ b/amarok/src/playerwindow.cpp @@ -24,7 +24,7 @@ email : [email protected] #include "metabundle.h" //setScroll() #include "playerwindow.h" #include "sliderwidget.h" -#include "tractdetooltip.h" //setScroll() +#include "tracktooltip.h" //setScroll() #include <tqaccel.h> //our quit shortcut in the ctor #include <tqevent.h> //various events diff --git a/amarok/src/playlist.h b/amarok/src/playlist.h index fb5fa32f..0973b4dc 100644 --- a/amarok/src/playlist.h +++ b/amarok/src/playlist.h @@ -29,7 +29,7 @@ #include "playlistitem.h" #include "metabundle.h" #include "tooltip.h" //baseclass -#include "tractdetooltip.h" +#include "tracktooltip.h" #include <tdelistview.h> //baseclass #include <kurl.h> //KURL::List diff --git a/amarok/src/tractdetooltip.cpp b/amarok/src/tractdetooltip.cpp index 3c51e114..08cae102 100644 --- a/amarok/src/tractdetooltip.cpp +++ b/amarok/src/tractdetooltip.cpp @@ -6,7 +6,7 @@ */ /* - tractdetooltip.cpp + tracktooltip.cpp begin: Tue 10 Feb 2004 copyright: (C) 2004 by Christian Muehlhaeuser email: [email protected] @@ -29,7 +29,7 @@ #include <kstandarddirs.h> -#include "tractdetooltip.h" +#include "tracktooltip.h" TrackToolTip *TrackToolTip::instance() @@ -348,4 +348,4 @@ void TrackToolTip::updateWidgets() Amarok::ToolTip::updateTip(); } -#include "tractdetooltip.moc" +#include "tracktooltip.moc" diff --git a/amarok/src/tractdetooltip.h b/amarok/src/tractdetooltip.h index 86a30950..62543313 100644 --- a/amarok/src/tractdetooltip.h +++ b/amarok/src/tractdetooltip.h @@ -6,7 +6,7 @@ */ /* - tractdetooltip.h - Provides an interface to a plain TQWidget, which is independent of KDE (bypassed to X11) + tracktooltip.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: [email protected] |