mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-06 06:07:37 +02:00
Remove QJson usage from JSPF loader
This commit is contained in:
@@ -32,8 +32,6 @@
|
|||||||
#include <QDomDocument>
|
#include <QDomDocument>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
|
||||||
#include <qjson/parser.h>
|
|
||||||
|
|
||||||
using namespace Tomahawk;
|
using namespace Tomahawk;
|
||||||
|
|
||||||
|
|
||||||
@@ -125,13 +123,12 @@ JSPFLoader::networkError( QNetworkReply::NetworkError e )
|
|||||||
void
|
void
|
||||||
JSPFLoader::gotBody()
|
JSPFLoader::gotBody()
|
||||||
{
|
{
|
||||||
QJson::Parser p;
|
|
||||||
bool retOk;
|
bool retOk;
|
||||||
QVariantMap wrapper = p.parse( m_body, &retOk ).toMap();
|
QVariantMap wrapper = TomahawkUtils::parseJson( m_body, &retOk ).toMap();
|
||||||
|
|
||||||
if ( !retOk )
|
if ( !retOk )
|
||||||
{
|
{
|
||||||
tLog() << "Failed to parse jspf json:" << p.errorString() << "on line" << p.errorLine();
|
tLog() << "Failed to parse jspf json: " << m_body;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user