mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00
Code Issues Releases Wiki Activity

Drop QJson usage from Msg

Browse Source
This commit is contained in:
Uwe L. Korn
2014-04-13 16:06:44 +01:00
parent 4e9beb725b
commit 1e2ecc532a
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libtomahawk/network/Msg.cpp
View File

@@ -19,7 +19,7 @@
#include "Msg_p.h" #include "Msg_p.h"
#include <qjson/parser.h> #include "utils/TomahawkUtils.h"
#include <QtEndian> #include <QtEndian>
@@ -123,9 +123,8 @@ Msg::json()
if( !d->json_parsed ) if( !d->json_parsed )
{ {
QJson::Parser p;
bool ok; bool ok;
d->json = p.parse( d->payload, &ok ); d->json = TomahawkUtils::parseJson( d->payload, &ok );
d->json_parsed = true; d->json_parsed = true;
} }
return d->json; return d->json;

8
src/libtomahawk/network/MsgProcessor.cpp
View File

@@ -21,10 +21,7 @@
#include "network/Msg_p.h" #include "network/Msg_p.h"
#include "network/Servent.h" #include "network/Servent.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/TomahawkUtils.h"
#include <qjson/parser.h>
#include <qjson/serializer.h>
#include <qjson/qobjecthelper.h>
#include <QThread> #include <QThread>
#include <QFuture> #include <QFuture>
@@ -127,8 +124,7 @@ MsgProcessor::process( msg_ptr msg, quint32 mode, quint32 threshold )
{ {
// qDebug() << "MsgProcessor::PARSING JSON"; // qDebug() << "MsgProcessor::PARSING JSON";
bool ok; bool ok;
QJson::Parser parser; msg->d_func()->json = TomahawkUtils::parseJson( msg->payload(), &ok );
msg->d_func()->json = parser.parse( msg->payload(), &ok );
msg->d_func()->json_parsed = true; msg->d_func()->json_parsed = true;
} }