From da230fc26e6ea5eb1908b52833c07aefba6cc7b1 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Sat, 12 Apr 2014 13:43:01 +0100
Subject: [PATCH] Remove QJson usage from iTunes parser
---
src/libtomahawk/utils/ItunesParser.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/libtomahawk/utils/ItunesParser.cpp b/src/libtomahawk/utils/ItunesParser.cpp
index 118c807c4..117d6d3c8 100644
--- a/src/libtomahawk/utils/ItunesParser.cpp
+++ b/src/libtomahawk/utils/ItunesParser.cpp
@@ -23,8 +23,6 @@
#include <QtNetwork/QNetworkAccessManager>
#include <QRegExp>
-#include <qjson/parser.h>
-
#include "Query.h"
#include "SourceList.h"
#include "jobview/JobStatusView.h"
@@ -135,13 +133,13 @@ ItunesParser::itunesResponseLookupFinished()
if ( r->reply()->error() == QNetworkReply::NoError )
{
- QJson::Parser p;
bool ok;
- QVariantMap res = p.parse( r->reply(), &ok ).toMap();
+ QByteArray jsonData = r->reply()->readAll();
+ QVariantMap res = TomahawkUtils::parseJson( jsonData, &ok ).toMap();
if ( !ok )
{
- tLog() << "Failed to parse json from Spotify track lookup:" << p.errorString() << "On line" << p.errorLine();
+ tLog() << "Failed to parse json from itunes track lookup:" << jsonData;
checkTrackFinished();
return;
}