From 470cd7e0c5e08ada89fa38c9b41818d2a8b7b635 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Mon, 17 Nov 2014 15:15:32 +0100 Subject: [PATCH] Don't use QVariantHash instead of QVariantMap for artist biographies --- src/infoplugins/generic/echonest/EchonestPlugin.cpp | 2 +- src/libtomahawk/Artist.cpp | 2 +- src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/infoplugins/generic/echonest/EchonestPlugin.cpp b/src/infoplugins/generic/echonest/EchonestPlugin.cpp index c0135a0b5..762b601d6 100644 --- a/src/infoplugins/generic/echonest/EchonestPlugin.cpp +++ b/src/infoplugins/generic/echonest/EchonestPlugin.cpp @@ -182,7 +182,7 @@ EchonestPlugin::getArtistBiographySlot() QVariantMap biographyMap; Q_FOREACH( const Echonest::Biography& biography, biographies ) { - QVariantHash siteData; + QVariantMap siteData; siteData[ "site" ] = biography.site(); siteData[ "url" ] = biography.url().toString(); siteData[ "text" ] = biography.text(); diff --git a/src/libtomahawk/Artist.cpp b/src/libtomahawk/Artist.cpp index f5c5c94d3..1f930c60e 100644 --- a/src/libtomahawk/Artist.cpp +++ b/src/libtomahawk/Artist.cpp @@ -547,7 +547,7 @@ Artist::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVari foreach ( const QString& source, bmap.keys() ) { if ( source == "last.fm" ) - m_biography = bmap[ source ].toHash()[ "text" ].toString(); + m_biography = bmap[ source ].toMap()[ "text" ].toString(); } m_biographyLoaded = true; diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp index 59cd85e32..acc96fd0d 100644 --- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp +++ b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp @@ -736,7 +736,7 @@ LastFmInfoPlugin::artistInfoReturned() .replace( trackRegExp, "" ) .replace( "&album=_", "" ); - QVariantHash siteData; + QVariantMap siteData; siteData[ "site" ] = "last.fm"; siteData[ "text" ] = biography.replace( "\r", "\n" ).replace( "\n\n", "\n" ); siteData[ "summary" ] = lfm["artist"]["bio"]["summary"].text().trimmed().replace( "\r", "\n" ).replace( "\n\n", "\n" );