diff options
author | Jonas M. Gastal <jgastal@profusion.mobi> | 2012-01-10 09:36:56 -0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 14:31:10 +0100 |
commit | 8bbf1a46a56ce0f0047e24a57add63d503dd7457 (patch) | |
tree | 1f4c3c8f60a1dea6f8e694fad0746925b98f9966 /src/network/kernel | |
parent | 658a239eb9263d79381d16d22b0b4b2e982ce607 (diff) |
Removing QHttpHeader and QHttpResponseHeader.
QAuthenticator used it for the convinience of QHttpSocketEngine only.
QHttpSocketEngine has now been ported to use QHttpNetworkReply to parse
HTTP responses.
Change-Id: Idf6e70aa76613aad6e3d789d81ca1b4fd73575c2
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Diffstat (limited to 'src/network/kernel')
-rw-r--r-- | src/network/kernel/qauthenticator.cpp | 16 | ||||
-rw-r--r-- | src/network/kernel/qauthenticator_p.h | 3 |
2 files changed, 0 insertions, 19 deletions
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp index 0a3dddbe28..bac353e90f 100644 --- a/src/network/kernel/qauthenticator.cpp +++ b/src/network/kernel/qauthenticator.cpp @@ -45,7 +45,6 @@ #include <qhash.h> #include <qbytearray.h> #include <qcryptographichash.h> -#include <private/qhttpheader_p.h> #include <qiodevice.h> #include <qdatastream.h> #include <qendian.h> @@ -339,21 +338,6 @@ QAuthenticatorPrivate::QAuthenticatorPrivate() nonceCount = 0; } -#ifndef QT_NO_HTTP -void QAuthenticatorPrivate::parseHttpResponse(const QHttpResponseHeader &header, bool isProxy) -{ - const QList<QPair<QString, QString> > values = header.values(); - QList<QPair<QByteArray, QByteArray> > rawValues; - - QList<QPair<QString, QString> >::const_iterator it, end; - for (it = values.constBegin(), end = values.constEnd(); it != end; ++it) - rawValues.append(qMakePair(it->first.toLatin1(), it->second.toUtf8())); - - // continue in byte array form - parseHttpResponse(rawValues, isProxy); -} -#endif - void QAuthenticatorPrivate::parseHttpResponse(const QList<QPair<QByteArray, QByteArray> > &values, bool isProxy) { const char *search = isProxy ? "proxy-authenticate" : "www-authenticate"; diff --git a/src/network/kernel/qauthenticator_p.h b/src/network/kernel/qauthenticator_p.h index 4b79202d92..a8075147cb 100644 --- a/src/network/kernel/qauthenticator_p.h +++ b/src/network/kernel/qauthenticator_p.h @@ -103,9 +103,6 @@ public: QByteArray digestMd5Response(const QByteArray &challenge, const QByteArray &method, const QByteArray &path); static QHash<QByteArray, QByteArray> parseDigestAuthenticationChallenge(const QByteArray &challenge); -#ifndef QT_NO_HTTP - void parseHttpResponse(const QHttpResponseHeader &, bool isProxy); -#endif void parseHttpResponse(const QList<QPair<QByteArray, QByteArray> >&, bool isProxy); }; |