From 997f86279f384c0b5c0956bbfbffff9d8507ea5f Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Thu, 29 Feb 2024 13:42:09 +0200 Subject: [PATCH] DRY QHttpHeaders::value() implementation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-122020 Change-Id: I403d376734587d721d27f7093b3774068829a46d Reviewed-by: Mårten Nordheim (cherry picked from commit b370e1b7f19464dd5303122b3e1e72addbadbf57) Reviewed-by: Qt Cherry-pick Bot --- src/network/access/qhttpheaders.cpp | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/network/access/qhttpheaders.cpp b/src/network/access/qhttpheaders.cpp index b0aafd2e175..b02f6c6648c 100644 --- a/src/network/access/qhttpheaders.cpp +++ b/src/network/access/qhttpheaders.cpp @@ -792,6 +792,7 @@ public: void combinedValue(const HeaderName &name, QByteArray &result) const; void values(const HeaderName &name, QList &result) const; + QByteArrayView value(const HeaderName &name, QByteArrayView defaultValue) const noexcept; QList
headers; }; @@ -842,6 +843,15 @@ void QHttpHeadersPrivate::values(const HeaderName &name, QList &resu } } +QByteArrayView QHttpHeadersPrivate::value(const HeaderName &name, QByteArrayView defaultValue) const noexcept +{ + for (const auto &h : std::as_const(headers)) { + if (h.name == name) + return h.value; + } + return defaultValue; +} + /*! Creates a new QHttpHeaders object. */ @@ -1279,13 +1289,7 @@ QByteArrayView QHttpHeaders::value(QAnyStringView name, QByteArrayView defaultVa if (isEmpty()) return defaultValue; - const HeaderName hname(name); - - for (const auto &h : std::as_const(d->headers)) { - if (h.name == hname) - return h.value; - } - return defaultValue; + return d->value(HeaderName{name}, defaultValue); } /*! @@ -1296,13 +1300,7 @@ QByteArrayView QHttpHeaders::value(WellKnownHeader name, QByteArrayView defaultV if (isEmpty()) return defaultValue; - const HeaderName hname(name); - - for (const auto &h : std::as_const(d->headers)) { - if (h.name == hname) - return h.value; - } - return defaultValue; + return d->value(HeaderName{name}, defaultValue); } /*!