From 22e05bd6ea0da0b1b75689abf990171285d81c9b Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sat, 5 May 2012 17:11:23 +0200 Subject: [PATCH] * Fixed Last.fm plugin. --- src/accounts/lastfm/LastFmInfoPlugin.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/accounts/lastfm/LastFmInfoPlugin.cpp b/src/accounts/lastfm/LastFmInfoPlugin.cpp index d7fe53fc0..f016cf312 100644 --- a/src/accounts/lastfm/LastFmInfoPlugin.cpp +++ b/src/accounts/lastfm/LastFmInfoPlugin.cpp @@ -274,7 +274,7 @@ LastFmInfoPlugin::fetchSimilarArtists( Tomahawk::InfoSystem::InfoRequestData req void -LastFmPlugin::fetchSimilarTracks( Tomahawk::InfoSystem::InfoRequestData requestData ) +LastFmInfoPlugin::fetchSimilarTracks( Tomahawk::InfoSystem::InfoRequestData requestData ) { if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() ) { @@ -297,7 +297,7 @@ LastFmPlugin::fetchSimilarTracks( Tomahawk::InfoSystem::InfoRequestData requestD void -LastFmPlugin::fetchTopTracks( Tomahawk::InfoSystem::InfoRequestData requestData ) +LastFmInfoPlugin::fetchTopTracks( Tomahawk::InfoSystem::InfoRequestData requestData ) { if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() ) { @@ -317,6 +317,7 @@ LastFmPlugin::fetchTopTracks( Tomahawk::InfoSystem::InfoRequestData requestData emit getCachedInfo( criteria, 2419200000, requestData ); } + void LastFmInfoPlugin::fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData ) { @@ -596,10 +597,7 @@ LastFmInfoPlugin::similarArtistsReturned() void -<<<<<<< HEAD:src/accounts/lastfm/LastFmInfoPlugin.cpp -LastFmInfoPlugin::chartReturned() -======= -LastFmPlugin::similarTracksReturned() +LastFmInfoPlugin::similarTracksReturned() { QNetworkReply* reply = qobject_cast( sender() ); @@ -646,8 +644,7 @@ LastFmPlugin::similarTracksReturned() void -LastFmPlugin::chartReturned() ->>>>>>> * Added similar tracks infosystem call.:src/accounts/lastfm/LastFmPlugin.cpp +LastFmInfoPlugin::chartReturned() { QNetworkReply* reply = qobject_cast( sender() );