From 1e2ecc532ad159fe387f6e673944abbf8536c96c Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Sun, 13 Apr 2014 16:06:44 +0100
Subject: [PATCH] Drop QJson usage from Msg

---
 src/libtomahawk/network/Msg.cpp          | 5 ++---
 src/libtomahawk/network/MsgProcessor.cpp | 8 ++------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/libtomahawk/network/Msg.cpp b/src/libtomahawk/network/Msg.cpp
index bdc9bd0c6..593267455 100644
--- a/src/libtomahawk/network/Msg.cpp
+++ b/src/libtomahawk/network/Msg.cpp
@@ -19,7 +19,7 @@
 
 #include "Msg_p.h"
 
-#include <qjson/parser.h>
+#include "utils/TomahawkUtils.h"
 
 #include <QtEndian>
 
@@ -123,9 +123,8 @@ Msg::json()
 
     if( !d->json_parsed )
     {
-        QJson::Parser p;
         bool ok;
-        d->json = p.parse( d->payload, &ok );
+        d->json = TomahawkUtils::parseJson( d->payload, &ok );
         d->json_parsed = true;
     }
     return d->json;
diff --git a/src/libtomahawk/network/MsgProcessor.cpp b/src/libtomahawk/network/MsgProcessor.cpp
index 22357abc3..ab568a494 100644
--- a/src/libtomahawk/network/MsgProcessor.cpp
+++ b/src/libtomahawk/network/MsgProcessor.cpp
@@ -21,10 +21,7 @@
 #include "network/Msg_p.h"
 #include "network/Servent.h"
 #include "utils/Logger.h"
-
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-#include <qjson/qobjecthelper.h>
+#include "utils/TomahawkUtils.h"
 
 #include <QThread>
 #include <QFuture>
@@ -127,8 +124,7 @@ MsgProcessor::process( msg_ptr msg, quint32 mode, quint32 threshold )
     {
 //        qDebug() << "MsgProcessor::PARSING JSON";
         bool ok;
-        QJson::Parser parser;
-        msg->d_func()->json = parser.parse( msg->payload(), &ok );
+        msg->d_func()->json = TomahawkUtils::parseJson( msg->payload(), &ok );
         msg->d_func()->json_parsed = true;
     }