From de324a5c110a975b8b8450d2acd78e338aa27734 Mon Sep 17 00:00:00 2001
From: Matt Broadstone <mbroadst@gmail.com>
Date: Fri, 16 Nov 2012 10:13:59 -0500
Subject: convert to use of QUrlQuery for qt >= 5

---
 src/base/QXmppSasl.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src/base/QXmppSasl.cpp')

diff --git a/src/base/QXmppSasl.cpp b/src/base/QXmppSasl.cpp
index 8b3c734c..ffc8a2e2 100644
--- a/src/base/QXmppSasl.cpp
+++ b/src/base/QXmppSasl.cpp
@@ -27,7 +27,11 @@
 #include <QCryptographicHash>
 #include <QDomElement>
 #include <QStringList>
+#if QT_VERSION >= 0x050000
+#include <QUrlQuery>
+#else
 #include <QUrl>
+#endif
 
 #include "QXmppSasl_p.h"
 #include "QXmppUtils.h"
@@ -433,15 +437,23 @@ bool QXmppSaslClientFacebook::respond(const QByteArray &challenge, QByteArray &r
         return true;
     } else if (m_step == 1) {
         // parse request
+#if QT_VERSION >= 0x050000
+        QUrlQuery requestUrl(challenge);
+#else
         QUrl requestUrl;
         requestUrl.setEncodedQuery(challenge);
+#endif
         if (!requestUrl.hasQueryItem("method") || !requestUrl.hasQueryItem("nonce")) {
             warning("QXmppSaslClientFacebook : Invalid challenge, nonce or method missing");
             return false;
         }
 
         // build response
+#if QT_VERSION >= 0x050000
+        QUrlQuery responseUrl;
+#else
         QUrl responseUrl;
+#endif
         responseUrl.addQueryItem("access_token", password());
         responseUrl.addQueryItem("api_key", username());
         responseUrl.addQueryItem("call_id", 0);
@@ -449,7 +461,11 @@ bool QXmppSaslClientFacebook::respond(const QByteArray &challenge, QByteArray &r
         responseUrl.addQueryItem("nonce", requestUrl.queryItemValue("nonce"));
         responseUrl.addQueryItem("v", "1.0");
 
+#if QT_VERSION >= 0x050000
+        response = responseUrl.query().toUtf8();
+#else
         response = responseUrl.encodedQuery();
+#endif
         m_step++;
         return true;
     } else {
-- 
cgit v1.2.3