From 463cfd0d5e5c47a5636c08dee8627d546285824b Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Sun, 13 Apr 2014 22:08:38 +0100
Subject: [PATCH] Remove QJson usage from Accounts

---
 src/libtomahawk/accounts/CredentialsManager.cpp        | 9 +++------
 src/libtomahawk/accounts/ResolverAccount.cpp           | 5 +----
 src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp | 8 ++------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/libtomahawk/accounts/CredentialsManager.cpp b/src/libtomahawk/accounts/CredentialsManager.cpp
index a27c57ea7..57b7c20ff 100644
--- a/src/libtomahawk/accounts/CredentialsManager.cpp
+++ b/src/libtomahawk/accounts/CredentialsManager.cpp
@@ -28,8 +28,7 @@
     #else
         #include <qt5keychain/keychain.h>
     #endif
-    #include <qjson/serializer.h>
-    #include <qjson/parser.h>
+    #include "utils/TomahawkUtils.h"
 #endif
 
 #include <QStringList>
@@ -218,9 +217,8 @@ CredentialsManager::setCredentials( const CredentialsStorageKey& csKey, const QV
         }
         else if ( value.type() == QVariant::Hash )
         {
-            QJson::Serializer serializer;
             bool ok;
-            QByteArray data = serializer.serialize( value.toHash(), &ok );
+            QByteArray data = TomahawkUtils::toJson( value.toHash(), &ok );
 
             if ( ok )
             {
@@ -278,10 +276,9 @@ CredentialsManager::keychainJobFinished( QKeychain::Job* j )
                      << readJob->key() << "finished without errors";
 
             QVariant creds;
-            QJson::Parser parser;
             bool ok;
 
-            creds = parser.parse( readJob->textData().toLatin1(), &ok );
+            creds = TomahawkUtils::parseJson( readJob->textData().toLatin1(), &ok );
 
             QVariantMap map = creds.toMap();
             QVariantHash hash;
diff --git a/src/libtomahawk/accounts/ResolverAccount.cpp b/src/libtomahawk/accounts/ResolverAccount.cpp
index 3d884f504..5e0e2bf5c 100644
--- a/src/libtomahawk/accounts/ResolverAccount.cpp
+++ b/src/libtomahawk/accounts/ResolverAccount.cpp
@@ -39,8 +39,6 @@
 #include "TomahawkSettings.h"
 #include "TomahawkVersion.h"
 
-#include "qjson/parser.h"
-
 #include <QFile>
 #include <QFileInfo>
 #include <QDir>
@@ -228,9 +226,8 @@ ResolverAccountFactory::metadataFromJsonFile( const QString& path )
     QFile metadataFile( path );
     if ( metadataFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
     {
-        QJson::Parser parser;
         bool ok;
-        QVariantMap variant = parser.parse( metadataFile.readAll(), &ok ).toMap();
+        QVariantMap variant = TomahawkUtils::parseJson( metadataFile.readAll(), &ok ).toMap();
 
         if ( ok )
         {
diff --git a/src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp b/src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp
index 41f41d5a6..f16972140 100644
--- a/src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp
+++ b/src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp
@@ -23,8 +23,6 @@
 #include "utils/Logger.h"
 #include "utils/NetworkAccessManager.h"
 
-#include <qjson/parser.h>
-
 using namespace Tomahawk;
 using namespace Tomahawk::InfoSystem;
 
@@ -206,8 +204,7 @@ SpotifyInfoPlugin::albumIdLookupFinished( QNetworkReply* reply, const InfoReques
 
     if ( reply->error() == QNetworkReply::NoError )
     {
-        QJson::Parser p;
-        const QVariantMap response = p.parse( reply ).toMap();
+        const QVariantMap response = TomahawkUtils::parseJson( reply->readAll() ).toMap();
         if ( !response.contains( "albums" ) )
         {
             dataError( requestData );
@@ -254,8 +251,7 @@ SpotifyInfoPlugin::albumContentsLookupFinished( QNetworkReply* reply, const Info
 
     if ( reply->error() == QNetworkReply::NoError )
     {
-        QJson::Parser p;
-        const QVariantMap response = p.parse( reply ).toMap();
+        const QVariantMap response = TomahawkUtils::parseJson( reply->readAll() ).toMap();
 
         if ( !response.contains( "album" ) )
         {