mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-19 23:39:42 +01:00
Code Issues Releases Wiki Activity

Remove QJson usage from Playdar API

Browse Source
This commit is contained in:
Uwe L. Korn 2014-04-13 21:19:46 +01:00
parent 1e2ecc532a
commit ddf00b5991
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libtomahawk-playdarapi/Api_v1.cpp
View File

@ -455,9 +455,10 @@ Api_v1::get_results( QxtWebRequestEvent* event )
void
Api_v1::sendJSON( const QVariantMap& m, QxtWebRequestEvent* event )
{
QJson::Serializer ser;
QByteArray ctype;
QByteArray body = ser.serialize( m );
bool ok;
QByteArray body = TomahawkUtils::toJson( m, &ok );
Q_ASSERT( ok );
if ( urlHasQueryItem( event->url, "jsonp" ) && !urlQueryItemValue( event->url, "jsonp" ).isEmpty() )
{

2
src/libtomahawk-playdarapi/Api_v1.h
View File

@ -31,8 +31,6 @@
#include <QxtWeb/QxtWebSlotService>
#include <QxtWeb/QxtWebPageEvent>
#include <qjson/serializer.h>
#include <QFile>
#include <QSharedPointer>
#include <QStringList>

3
src/libtomahawk-playdarapi/Api_v1_5.cpp
View File

@ -104,9 +104,8 @@ Api_v1_5::playback( QxtWebRequestEvent* event, const QString& command )
trackInfo.insert( "duration", currentTrack->track()->duration() );
trackInfo.insert( "track", currentTrack->track()->track() );
QJson::Serializer serializer;
bool ok;
json = serializer.serialize( trackInfo, &ok );
json = TomahawkUtils::toJson( trackInfo, &ok );
Q_ASSERT( ok );
}

2
src/libtomahawk-playdarapi/CMakeLists.txt
View File

@ -10,7 +10,7 @@ list(APPEND ${TOMAHAWK_PLAYDARAPI_LIBRARY_TARGET}_SOURCES
list(APPEND ${TOMAHAWK_PLAYDARAPI_LIBRARY_TARGET}_UI
)
include_directories(${QXTWEB_INCLUDE_DIRS} ${QJSON_INCLUDE_DIR})
include_directories(${QXTWEB_INCLUDE_DIRS})
tomahawk_add_library(${TOMAHAWK_PLAYDARAPI_LIBRARY_TARGET}
SOURCES ${${TOMAHAWK_PLAYDARAPI_LIBRARY_TARGET}_SOURCES}