From 02b7e0b9bc103e6053490ab7be8c7fc736401054 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 4 Oct 2014 11:05:02 +0200 Subject: [PATCH] Port to Qt5's internal JSON parser Unfortunately the QVariant conversions need to be done as we still need to handle the XML part --- src/libdanbooru/utils.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/libdanbooru/utils.cpp b/src/libdanbooru/utils.cpp index d0f5230..7c042ca 100644 --- a/src/libdanbooru/utils.cpp +++ b/src/libdanbooru/utils.cpp @@ -20,11 +20,14 @@ * */ +// Own + #include "utils.h" // Qt -#include +#include +#include #include // KDE @@ -156,17 +159,15 @@ namespace Danbooru { QVariant parseDanbooruResult(QByteArray data, bool* result) { - QJson::Parser parser; - bool ok; + QJsonDocument parsed = QJsonDocument::fromJson(data); - QVariant postData = parser.parse(data, &ok); - - if (!ok) { - *result = ok; + if (parsed.isNull()) { return QList(); } + QVariant postData = parsed.toVariant(); + *result = true; return postData;