mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Drop QJson usage from SpotifyParser

Browse Source
This commit is contained in:
Uwe L. Korn
2014-04-12 13:47:11 +01:00
parent da230fc26e
commit 6cefab4cc5
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libtomahawk/utils/SpotifyParser.cpp
View File

@@ -21,8 +21,6 @@
#include <QtNetwork/QNetworkAccessManager> #include <QtNetwork/QNetworkAccessManager>
#include <qjson/parser.h>
#include "Query.h" #include "Query.h"
#include "SourceList.h" #include "SourceList.h"
#include "DropJob.h" #include "DropJob.h"
@@ -228,13 +226,13 @@ SpotifyParser::spotifyBrowseFinished()
if ( r->reply()->error() == QNetworkReply::NoError ) if ( r->reply()->error() == QNetworkReply::NoError )
{ {
QJson::Parser p;
bool ok; bool ok;
QVariantMap res = p.parse( r->reply(), &ok ).toMap(); QByteArray jsonData = r->reply()->readAll();
QVariantMap res = TomahawkUtils::parseJson( jsonData, &ok ).toMap();
if ( !ok ) if ( !ok )
{ {
tLog() << "Failed to parse json from Spotify browse item:" << p.errorString() << "On line" << p.errorLine(); tLog() << "Failed to parse json from Spotify browse item:" << jsonData;
checkTrackFinished(); checkTrackFinished();
return; return;
} }
@@ -300,13 +298,13 @@ SpotifyParser::spotifyTrackLookupFinished()
if ( r->reply()->error() == QNetworkReply::NoError ) if ( r->reply()->error() == QNetworkReply::NoError )
{ {
QJson::Parser p;
bool ok; bool ok;
QVariantMap res = p.parse( r->reply(), &ok ).toMap(); QByteArray jsonData = r->reply()->readAll();
QVariantMap res = TomahawkUtils::parseJson( jsonData, &ok ).toMap();
if ( !ok ) if ( !ok )
{ {
tLog() << "Failed to parse json from Spotify track lookup:" << p.errorString() << "On line" << p.errorLine(); tLog() << "Failed to parse json from Spotify track lookup:" << jsonData;
checkTrackFinished(); checkTrackFinished();
return; return;
} }