[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=ebd2f29

The following commit has been merged in the master branch:
commit ebd2f295c06e5f2f13bce367e9df00b36613cd8c
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Thu Aug 21 16:10:20 2014 +0200

    Port QJson to Qt5's QJson
---
 x-messenger-oauth2-prompt.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/x-messenger-oauth2-prompt.cpp b/x-messenger-oauth2-prompt.cpp
index e9792a0..c9bc1dd 100644
--- a/x-messenger-oauth2-prompt.cpp
+++ b/x-messenger-oauth2-prompt.cpp
@@ -30,6 +30,8 @@
 #include <QUrl>
 #include <QUrlQuery>
 #include <QDebug>
+#include <QJsonDocument>
+#include <QJsonObject>
 #include <QDialogButtonBox>
 
 #include <QtWebKit/QWebSettings>
@@ -203,11 +205,11 @@ void XMessengerOAuth2Prompt::extractTokens(const QString &text)
 {
     qDebug() << text;
 
-    QJson::Parser parser;
-    bool ok;
+    QJsonParseError error;
+    QJsonDocument parser = QJsonDocument::fromJson(text.toUtf8(), &error);
+    QVariantMap result = parser.object().toVariantMap();
 
-    QVariantMap result = parser.parse(text.toLatin1(), &ok).toMap();
-    if (!ok) {
+    if (error.error == QJsonParseError::NoError) {
         qWarning() << "An error occured during parsing reply";
         return;
     }

-- 
ktp-auth-handler packaging