mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Remove QJson usage from Hatchet

Browse Source
This commit is contained in:
Uwe L. Korn
2014-04-15 19:13:52 +01:00
parent a8991f62b8
commit 786a9168f5
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/accounts/hatchet/account/HatchetAccount.cpp
View File

@@ -20,11 +20,11 @@
#include <QHostInfo> #include <QHostInfo>
#include "HatchetAccountConfig.h" #include "HatchetAccountConfig.h"
#include "sip/HatchetSip.h"
#include "utils/Closure.h" #include "utils/Closure.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "sip/HatchetSip.h"
#include "utils/TomahawkUtils.h"
#include "utils/NetworkAccessManager.h" #include "utils/NetworkAccessManager.h"
#include "utils/TomahawkUtils.h"
#include <QtPlugin> #include <QtPlugin>
#include <QFile> #include <QFile>
@@ -34,9 +34,6 @@
#include <QUrl> #include <QUrl>
#include <QUuid> #include <QUuid>
#include <qjson/parser.h>
#include <qjson/serializer.h>
using namespace Tomahawk; using namespace Tomahawk;
using namespace Accounts; using namespace Accounts;
@@ -538,9 +535,8 @@ HatchetAccount::parseReply( QNetworkReply* reply, bool& okRet ) const
return resp; return resp;
} }
QJson::Parser p;
QByteArray replyData = reply->readAll(); QByteArray replyData = reply->readAll();
resp = p.parse( replyData, &ok ).toMap(); resp = TomahawkUtils::parseJson( replyData, &ok ).toMap();
if ( !ok ) if ( !ok )
{ {

9
src/accounts/hatchet/sip/HatchetSip.cpp
View File

@@ -32,9 +32,6 @@
#include <utils/Logger.h> #include <utils/Logger.h>
#include <SourceList.h> #include <SourceList.h>
#include <qjson/parser.h>
#include <qjson/serializer.h>
#include <QFile> #include <QFile>
#include <QHostInfo> #include <QHostInfo>
#include <QUuid> #include <QUuid>
@@ -248,8 +245,7 @@ HatchetSipPlugin::sendBytes( const QVariantMap& jsonMap ) const
return false; return false;
} }
QJson::Serializer serializer; QByteArray bytes = TomahawkUtils::toJson( jsonMap );
QByteArray bytes = serializer.serialize( jsonMap );
if ( bytes.isEmpty() ) if ( bytes.isEmpty() )
{ {
tLog() << Q_FUNC_INFO << "could not serialize register structure to JSON"; 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; tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "WebSocket message: " << msg;
QJson::Parser parser;
bool ok; bool ok;
QVariant jsonVariant = parser.parse( msg, &ok ); QVariant jsonVariant = TomahawkUtils::parseJson( msg, &ok );
if ( !jsonVariant.isValid() ) if ( !jsonVariant.isValid() )
{ {
tLog() << Q_FUNC_INFO << "Failed to parse message back from server"; tLog() << Q_FUNC_INFO << "Failed to parse message back from server";