diff --git a/src/accounts/hatchet/account/HatchetAccount.cpp b/src/accounts/hatchet/account/HatchetAccount.cpp index 0a92b6bf5..74558c0ee 100644 --- a/src/accounts/hatchet/account/HatchetAccount.cpp +++ b/src/accounts/hatchet/account/HatchetAccount.cpp @@ -20,11 +20,11 @@ #include #include "HatchetAccountConfig.h" +#include "sip/HatchetSip.h" #include "utils/Closure.h" #include "utils/Logger.h" -#include "sip/HatchetSip.h" -#include "utils/TomahawkUtils.h" #include "utils/NetworkAccessManager.h" +#include "utils/TomahawkUtils.h" #include #include @@ -34,9 +34,6 @@ #include #include -#include -#include - using namespace Tomahawk; using namespace Accounts; @@ -538,9 +535,8 @@ HatchetAccount::parseReply( QNetworkReply* reply, bool& okRet ) const return resp; } - QJson::Parser p; QByteArray replyData = reply->readAll(); - resp = p.parse( replyData, &ok ).toMap(); + resp = TomahawkUtils::parseJson( replyData, &ok ).toMap(); if ( !ok ) { diff --git a/src/accounts/hatchet/sip/HatchetSip.cpp b/src/accounts/hatchet/sip/HatchetSip.cpp index 30c50b594..7c4c947e4 100644 --- a/src/accounts/hatchet/sip/HatchetSip.cpp +++ b/src/accounts/hatchet/sip/HatchetSip.cpp @@ -32,9 +32,6 @@ #include #include -#include -#include - #include #include #include @@ -248,8 +245,7 @@ HatchetSipPlugin::sendBytes( const QVariantMap& jsonMap ) const return false; } - QJson::Serializer serializer; - QByteArray bytes = serializer.serialize( jsonMap ); + QByteArray bytes = TomahawkUtils::toJson( jsonMap ); if ( bytes.isEmpty() ) { tLog() << Q_FUNC_INFO << "could not serialize register structure to JSON"; @@ -267,9 +263,8 @@ HatchetSipPlugin::messageReceived( const QByteArray &msg ) { tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "WebSocket message: " << msg; - QJson::Parser parser; bool ok; - QVariant jsonVariant = parser.parse( msg, &ok ); + QVariant jsonVariant = TomahawkUtils::parseJson( msg, &ok ); if ( !jsonVariant.isValid() ) { tLog() << Q_FUNC_INFO << "Failed to parse message back from server";