diff options
| author | Niels Ole Salscheider <niels_ole@salscheider-online.de> | 2018-06-23 17:20:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-23 17:20:47 +0200 |
| commit | ed6b199dff15ddb4c6bd72d1565501e9f1a2bf87 (patch) | |
| tree | 7bbb53c40ecf53fe9464b53b7966dd7726eeac5e /src/base/QXmppSasl.cpp | |
| parent | ea83c77a5a4524cc9778336b10eff60979582980 (diff) | |
| parent | 31f0a42073b68823e85835ec3e25114d79705a04 (diff) | |
| download | qxmpp-ed6b199dff15ddb4c6bd72d1565501e9f1a2bf87.tar.gz | |
Merge pull request #131 from olesalscheider/cmake
Add CMake build system, drop Qt4 support
Diffstat (limited to 'src/base/QXmppSasl.cpp')
| -rw-r--r-- | src/base/QXmppSasl.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/base/QXmppSasl.cpp b/src/base/QXmppSasl.cpp index cb44007f..cf3347e2 100644 --- a/src/base/QXmppSasl.cpp +++ b/src/base/QXmppSasl.cpp @@ -27,11 +27,7 @@ #include <QCryptographicHash> #include <QDomElement> #include <QStringList> -#if QT_VERSION >= 0x050000 #include <QUrlQuery> -#else -#include <QUrl> -#endif #include "QXmppSasl_p.h" #include "QXmppUtils.h" @@ -437,23 +433,14 @@ 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); @@ -461,11 +448,8 @@ 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 { |