KDE/danbooru-client
1
0
Fork 0
Code Issues Pull requests Releases Activity

Port to Qt5's internal JSON parser

Browse source 
Unfortunately the QVariant conversions need to be done as we still need
to handle the XML part
This commit is contained in:
Luca Beltrame 2014-10-04 11:05:02 +02:00
commit 02b7e0b9bc
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libdanbooru/utils.cpp
View file

@ -20,11 +20,14 @@
* *
*/ */
// Own
#include "utils.h" #include "utils.h"
// Qt // Qt
#include <qjson/parser.h> #include <QJsonDocument>
#include <QJsonObject>
#include <QXmlStreamReader> #include <QXmlStreamReader>
// KDE // KDE
@ -156,17 +159,15 @@ namespace Danbooru {
QVariant parseDanbooruResult(QByteArray data, bool* result) QVariant parseDanbooruResult(QByteArray data, bool* result)
{ {
QJson::Parser parser;
bool ok; QJsonDocument parsed = QJsonDocument::fromJson(data);
QVariant postData = parser.parse(data, &ok); if (parsed.isNull()) {
if (!ok) {
*result = ok;
return QList<QVariant>(); return QList<QVariant>();
} }
QVariant postData = parsed.toVariant();
*result = true; *result = true;
return postData; return postData;