From 8feb41e4462c9879a831d1c753d4200c3287e557 Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Mon, 29 Jan 2024 16:17:28 +0200 Subject: Change QNetworkRequest/Reply rawHeader functions to take QASV MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QHttpHeaders uses QASV for the header name field, and this aligns these functions with that. Furthermore having QASV as a parameter will allow a wider range of string types to be passed as a parameter (convenience). Resulted from API-review Amends: 56bb4ac484adb544925b6d7b58e4fd1d77d49503 Pick-to: 6.7 Change-Id: Iff42b75393b6470a2c34a1913dbe615bf21238db Reviewed-by: Qt CI Bot Reviewed-by: Mårten Nordheim Reviewed-by: Marc Mutz --- src/network/access/qnetworkrequest.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/network/access/qnetworkrequest.cpp') diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index cbfd1739abd..e084d08e8bf 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -631,7 +631,7 @@ void QNetworkRequest::setHeader(KnownHeaders header, const QVariant &value) \sa rawHeader(), setRawHeader() \note In Qt versions prior to 6.7, this function took QByteArray only. */ -bool QNetworkRequest::hasRawHeader(QByteArrayView headerName) const +bool QNetworkRequest::hasRawHeader(QAnyStringView headerName) const { return d->findRawHeader(headerName) != d->rawHeaders.constEnd(); } @@ -647,7 +647,7 @@ bool QNetworkRequest::hasRawHeader(QByteArrayView headerName) const \sa header(), setRawHeader() \note In Qt versions prior to 6.7, this function took QByteArray only. */ -QByteArray QNetworkRequest::rawHeader(QByteArrayView headerName) const +QByteArray QNetworkRequest::rawHeader(QAnyStringView headerName) const { if (const auto it = d->findRawHeader(headerName); it != d->rawHeaders.constEnd()) return it->second; @@ -1329,11 +1329,12 @@ static QVariant parseHeaderValue(QNetworkRequest::KnownHeaders header, const QBy } QNetworkHeadersPrivate::RawHeadersList::ConstIterator -QNetworkHeadersPrivate::findRawHeader(QByteArrayView key) const +QNetworkHeadersPrivate::findRawHeader(QAnyStringView key) const { auto isKeyEqual = [key](const auto &headerPair) { - return headerPair.first.compare(key, Qt::CaseInsensitive) == 0; + QLatin1StringView name{headerPair.first}; + return QAnyStringView::compare(name, key, Qt::CaseInsensitive) == 0; }; return std::find_if(rawHeaders.begin(), rawHeaders.end(), isKeyEqual); } -- cgit v1.2.3