diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/access/qhttpheaders.cpp | 15 | ||||
| -rw-r--r-- | src/network/access/qhttpheaders.h | 2 | ||||
| -rw-r--r-- | src/network/access/qnetworkrequestfactory.cpp | 3 |
3 files changed, 2 insertions, 18 deletions
diff --git a/src/network/access/qhttpheaders.cpp b/src/network/access/qhttpheaders.cpp index 1ea2890f219..7a640b509ca 100644 --- a/src/network/access/qhttpheaders.cpp +++ b/src/network/access/qhttpheaders.cpp @@ -889,21 +889,6 @@ bool QHttpHeaders::contains(WellKnownHeader name) const } /*! - Returns a list of unique header names. - Header names are case-insensitive, and the returned - names are lower-cased. -*/ -QList<QByteArray> QHttpHeaders::names() const -{ - QList<QByteArray> names; - for (const Header &header: d->headers) { - if (!names.contains(header.name)) - names.append(header.name); - } - return names; -} - -/*! Removes the header \a name. \sa removeAt(), removeAll(QHttpHeaders::WellKnownHeader) diff --git a/src/network/access/qhttpheaders.h b/src/network/access/qhttpheaders.h index a153d7911ef..1edbd03b12d 100644 --- a/src/network/access/qhttpheaders.h +++ b/src/network/access/qhttpheaders.h @@ -222,8 +222,6 @@ public: Q_NETWORK_EXPORT bool contains(QAnyStringView name) const; Q_NETWORK_EXPORT bool contains(WellKnownHeader name) const; - Q_NETWORK_EXPORT QList<QByteArray> names() const; - Q_NETWORK_EXPORT void clear(); Q_NETWORK_EXPORT void removeAll(QAnyStringView name); Q_NETWORK_EXPORT void removeAll(WellKnownHeader name); diff --git a/src/network/access/qnetworkrequestfactory.cpp b/src/network/access/qnetworkrequestfactory.cpp index 8a1ade8f78c..09413044046 100644 --- a/src/network/access/qnetworkrequestfactory.cpp +++ b/src/network/access/qnetworkrequestfactory.cpp @@ -9,6 +9,7 @@ #endif #include <QtCore/qloggingcategory.h> +#include <QtCore/qmap.h> QT_BEGIN_NAMESPACE @@ -497,7 +498,7 @@ QNetworkRequest QNetworkRequestFactoryPrivate::newRequest(const QUrl &url) const // may be multiple values per name. Note: this would not necessarily // produce right result for 'Set-Cookie' header if it has multiple values, // but since it is a purely server-side (response) header, not relevant here. - const auto headerNames = headers.names(); + const auto headerNames = headers.toMultiMap().uniqueKeys(); // ### fixme: port QNR to QHH for (const auto &name : headerNames) request.setRawHeader(name, headers.combinedValue(name)); |
