Remove QJson usage (except QObjectHelper) from Database

src/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.cpp

@@ -24,8 +24,6 @@
 #include "PlaylistEntry.h"
 #include "Source.h"
 
-#include <qjson/parser.h>
-
 #include <QSqlQuery>
 
 using namespace Tomahawk;
@@ -83,7 +81,6 @@ DatabaseCommand_LoadAllPlaylists::exec( DatabaseImpl* dbi )
 
     QList<playlist_ptr> plists;
     QHash<playlist_ptr, QStringList> phash;
-    QJson::Parser parser;
     while ( query.next() )
     {
         playlist_ptr p( new Playlist( source(),                  //src
@@ -101,7 +98,7 @@ DatabaseCommand_LoadAllPlaylists::exec( DatabaseImpl* dbi )
 
         if ( d->returnPlEntryIds )
         {
-            QStringList trackIds = parser.parse( query.value( 8 ).toByteArray() ).toStringList();
+            QStringList trackIds = TomahawkUtils::parseJson( query.value( 8 ).toByteArray() ).toStringList();
             phash.insert( p, trackIds );
         }
     }

src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp

@@ -28,8 +28,6 @@
 #include "Source.h"
 #include "TomahawkSqlQuery.h"
 
-#include "qjson/parser.h"
-
 #include <QSqlQuery>
 #include <QString>
 
@@ -65,9 +63,8 @@ DatabaseCommand_LoadDynamicPlaylistEntries::exec( DatabaseImpl* dbi )
     if( controlsQuery.first() )
     {
         playlist_guid = controlsQuery.value( 0 ).toString();
-        QJson::Parser parser;
         bool ok;
-        QVariant v = parser.parse( controlsQuery.value(1).toByteArray(), &ok );
+        QVariant v = TomahawkUtils::parseJson( controlsQuery.value(1).toByteArray(), &ok );
         Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
 
 

src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.cpp

@@ -25,8 +25,6 @@
 #include "Query.h"
 #include "Source.h"
 
-#include "qjson/parser.h"
-
 #include <QSqlQuery>
 
 using namespace Tomahawk;
@@ -53,14 +51,14 @@ DatabaseCommand_LoadPlaylistEntries::generateEntries( DatabaseImpl* dbi )
 
     tLog( LOGVERBOSE ) << "trying to load playlist entries for guid:" << m_revguid;
     QString prevrev;
-    QJson::Parser parser; bool ok;
+    bool ok;
 
     if ( query_entries.next() )
     {
         if ( !query_entries.value( 0 ).isNull() )
         {
             // entries should be a list of strings:
-            QVariant v = parser.parse( query_entries.value( 0 ).toByteArray(), &ok );
+            QVariant v = TomahawkUtils::parseJson( query_entries.value( 0 ).toByteArray(), &ok );
             Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
 
             m_guids = v.toStringList();
@@ -125,7 +123,7 @@ DatabaseCommand_LoadPlaylistEntries::generateEntries( DatabaseImpl* dbi )
 
         if ( !query_entries_old.value( 0 ).isNull() )
         {
-            QVariant v = parser.parse( query_entries_old.value( 0 ).toByteArray(), &ok );
+            QVariant v = TomahawkUtils::parseJson( query_entries_old.value( 0 ).toByteArray(), &ok );
             Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
             m_oldentries = v.toStringList();
         }

src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.cpp

@@ -28,8 +28,6 @@
 #include "Source.h"
 #include "TomahawkSqlQuery.h"
 
-#include <qjson/serializer.h>
-
 #include <QSqlQuery>
 
 namespace Tomahawk
@@ -198,8 +196,7 @@ DatabaseCommand_SetDynamicPlaylistRevision::exec( DatabaseImpl* lib )
         }
     }
 
-    QJson::Serializer ser;
+    const QByteArray newcontrols_data = TomahawkUtils::toJson( newcontrols );
-    const QByteArray newcontrols_data = ser.serialize( newcontrols );
 
     TomahawkSqlQuery query = lib->newquery();
     QString sql = "INSERT INTO dynamic_playlist_revision (guid, controls, plmode, pltype) "

src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.cpp

@@ -28,9 +28,6 @@
 #include "TomahawkSqlQuery.h"
 #include "Track.h"
 
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-
 #include <QSqlQuery>
 
 using namespace Tomahawk;
@@ -150,8 +147,7 @@ DatabaseCommand_SetPlaylistRevision::exec( DatabaseImpl* lib )
     }
 
     QVariantList vlist = m_orderedguids;
-    QJson::Serializer ser;
+    const QByteArray entries = TomahawkUtils::toJson( vlist );
-    const QByteArray entries = ser.serialize( vlist );
 
     // add any new items:
     TomahawkSqlQuery adde = lib->newquery();
@@ -266,8 +262,7 @@ DatabaseCommand_SetPlaylistRevision::exec( DatabaseImpl* lib )
         if ( query_entries.next() )
         {
             bool ok;
-            QJson::Parser parser;
+            QVariant v = TomahawkUtils::parseJson( query_entries.value( 0 ).toByteArray(), &ok );
-            QVariant v = parser.parse( query_entries.value( 0 ).toByteArray(), &ok );
             Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
 
             m_previous_rev_orderedguids = v.toStringList();

src/libtomahawk/database/DatabaseWorker.cpp

@@ -280,7 +280,7 @@ DatabaseWorker::logOp( DatabaseCommandLoggable* command )
                         "VALUES(?, ?, ?, ?, ?, ?)" );
 
     QVariantMap variant = QJson::QObjectHelper::qobject2qvariant( command );
-    QByteArray ba = m_serializer.serialize( variant );
+    QByteArray ba = TomahawkUtils::toJson( variant );
 
 //     qDebug() << "OP JSON:" << ba.isNull() << ba << "from:" << variant; // debug
 

src/libtomahawk/database/DatabaseWorker.h

@@ -25,8 +25,6 @@
 #include <QList>
 #include <QPointer>
 
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
 #include <qjson/qobjecthelper.h>
 
 #include "DatabaseCommand.h"
@@ -62,8 +60,6 @@ private:
     Database* m_db;
     QList< Tomahawk::dbcmd_ptr > m_commands;
     int m_outstanding;
-
-    QJson::Serializer m_serializer;
 };
 
 class DatabaseWorkerThread : public QThread