From 2a5ccd3bd191b75b9fa148a8fa7f3d3ddc225add Mon Sep 17 00:00:00 2001 From: Niels Ole Salscheider Date: Sun, 3 Sep 2017 22:00:29 +0200 Subject: Drop support for Qt 4 --- src/base/QXmppSasl.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src/base/QXmppSasl.cpp') 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 #include #include -#if QT_VERSION >= 0x050000 #include -#else -#include -#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 { -- cgit v1.2.3