Remove qjson from some public headers

src/libtomahawk/CMakeLists.txt

@@ -306,6 +306,7 @@ list(APPEND libSources
     network/Servent.cpp
     network/Connection.cpp
     network/ControlConnection.cpp
+    network/Msg.cpp
 
     playlist/PlaylistUpdaterInterface.cpp
     playlist/dynamic/DynamicPlaylist.cpp

src/libtomahawk/GlobalActionManager.cpp

@@ -41,6 +41,8 @@
 #include "utils/ShortenedLinkParser.h"
 #include "utils/RdioParser.h"
 
+#include <qjson/serializer.h>
+
 #ifndef ENABLE_HEADLESS
     #include "ViewManager.h"
     #include "playlist/PlaylistView.h"

src/libtomahawk/SourceList.cpp

@@ -30,6 +30,8 @@
 
 #include "utils/Logger.h"
 
+#include <qjson/qobjecthelper.h>
+
 using namespace Tomahawk;
 
 SourceList* SourceList::s_instance = 0;

src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp

@@ -22,6 +22,8 @@
 #include "utils/Closure.h"
 #include "utils/Logger.h"
 
+#include <qjson/parser.h>
+
 
 using namespace Tomahawk;
 using namespace Tomahawk::InfoSystem;

src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.cpp

@@ -26,6 +26,8 @@
 #include "network/Servent.h"
 #include "utils/Logger.h"
 
+#include <qjson/serializer.h>
+
 #include <QSqlQuery>
 
 DatabaseCommand_SetDynamicPlaylistRevision::DatabaseCommand_SetDynamicPlaylistRevision( const Tomahawk::source_ptr& s,

src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.cpp

@@ -26,6 +26,9 @@
 #include "network/Servent.h"
 #include "utils/Logger.h"
 
+#include <qjson/serializer.h>
+#include <qjson/parser.h>
+
 using namespace Tomahawk;
 
 

src/libtomahawk/network/Connection.cpp

@@ -23,6 +23,8 @@
 #include "utils/Logger.h"
 #include "Source.h"
 
+#include <qjson/serializer.h>
+
 #include <QtCore/QTime>
 #include <QtCore/QThread>
 

src/libtomahawk/network/Connection.h

@@ -26,10 +26,6 @@
 
 #include "DllMacro.h"
 
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-#include <qjson/qobjecthelper.h>
-
 #include <QSharedPointer>
 #include <QTcpSocket>
 #include <QHostAddress>
@@ -130,7 +126,6 @@ protected:
     QPointer<QTcpSocket> m_sock;
     int m_peerport;
     msg_ptr m_msg;
-    QJson::Parser parser;
     Servent* m_servent;
     bool m_outbound, m_ready, m_onceonly;
     msg_ptr m_firstmsg;

src/libtomahawk/network/Msg.cpp

@@ -0,0 +1,17 @@
+#include "Msg.h"
+
+#include <qjson/parser.h>
+
+QVariant& Msg::json() {
+    Q_ASSERT( is(JSON) );
+    Q_ASSERT( !is(COMPRESSED) );
+
+    if( !m_json_parsed )
+    {
+        QJson::Parser p;
+        bool ok;
+        m_json = p.parse( m_payload, &ok );
+        m_json_parsed = true;
+    }
+    return m_json;
+}

src/libtomahawk/network/Msg.h

@@ -34,10 +34,7 @@
 #include <QSharedPointer>
 #include <QtEndian>
 #include <QIODevice>
-
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-#include <qjson/qobjecthelper.h>
+#include <QVariant>
 
 class Msg;
 typedef QSharedPointer<Msg> msg_ptr;
@@ -111,20 +108,7 @@ public:
         return m_payload;
     }
 
-    QVariant& json()
-    {
-        Q_ASSERT( is(JSON) );
-        Q_ASSERT( !is(COMPRESSED) );
-
-        if( !m_json_parsed )
-        {
-            QJson::Parser p;
-            bool ok;
-            m_json = p.parse( m_payload, &ok );
-            m_json_parsed = true;
-        }
-        return m_json;
-    }
+    QVariant& json();
 
     char flags() const { return m_flags; }
 

src/libtomahawk/network/Servent.cpp

@@ -38,6 +38,8 @@
 #include "utils/Logger.h"
 #include "accounts/AccountManager.h"
 
+#include <qjson/parser.h>
+#include <qjson/serializer.h>
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QMutexLocker>
@@ -67,6 +69,7 @@ Servent::Servent( QObject* parent )
     , m_port( 0 )
     , m_externalPort( 0 )
     , m_ready( false )
+    , m_parser( new QJson::Parser() )
 {
     s_instance = this;
 
@@ -107,6 +110,8 @@ Servent::~Servent()
         m_portfwd.data()->wait( 60000 );
         delete m_portfwd.data();
     }
+
+    delete m_parser;
 }
 
 
@@ -482,7 +487,7 @@ Servent::readyRead()
     ControlConnection* cc = 0;
     bool ok;
     QString key, conntype, nodeid, controlid;
-    QVariantMap m = parser.parse( sock.data()->_msg->payload(), &ok ).toMap();
+    QVariantMap m = m_parser->parse( sock.data()->_msg->payload(), &ok ).toMap();
     if ( !ok )
     {
         tDebug() << "Invalid JSON on new connection, aborting";

src/libtomahawk/network/Servent.h

@@ -33,10 +33,7 @@
 #include <QtNetwork/QTcpServer>
 #include <QtNetwork/QTcpSocket>
 #include <QtNetwork/QHostInfo>
-
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-#include <qjson/qobjecthelper.h>
+#include <QStringList>
 
 #include "Typedefs.h"
 #include "Msg.h"
@@ -45,6 +42,12 @@
 
 #include "DllMacro.h"
 
+namespace QJson
+{
+    class Parser;
+}
+
+
 class Connection;
 class Connector;
 class ControlConnection;
@@ -172,7 +175,7 @@ private:
     void handoverSocket( Connection* conn, QTcpSocketExtra* sock );
     void printCurrentTransfers();
 
-    QJson::Parser parser;
+    QJson::Parser* m_parser;
     QList< ControlConnection* > m_controlconnections; // canonical list of authed peers
     QMap< QString, QPointer< Connection > > m_offers;
     QStringList m_connectedNodes;