diff options
| author | Matt Broadstone <mbroadst@gmail.com> | 2012-11-16 10:13:59 -0500 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-11-16 16:37:54 +0100 |
| commit | de324a5c110a975b8b8450d2acd78e338aa27734 (patch) | |
| tree | b7de3342e4889dca4c8f7210a40dbcd15ea52381 /src/base/QXmppSasl.cpp | |
| parent | bef7287e70ad671d5f06edd47ec050c67a0667cb (diff) | |
| download | qxmpp-de324a5c110a975b8b8450d2acd78e338aa27734.tar.gz | |
convert to use of QUrlQuery for qt >= 5
Diffstat (limited to 'src/base/QXmppSasl.cpp')
| -rw-r--r-- | src/base/QXmppSasl.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
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 { |