From 02579a27a0f9b3bbba098f928985f47f3f75d3d8 Mon Sep 17 00:00:00 2001
From: Juha Vuolle <juha.vuolle@qt.io>
Date: Thu, 29 Feb 2024 13:18:47 +0200
Subject: [PATCH] DRY QHttpHeaders::values() implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-122020
Change-Id: I7401eef86b133d33f32cd786dffe9a06c4ac7aba
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 9c0a79d323500d07fb8b95656b9013dc118b9fa3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/network/access/qhttpheaders.cpp | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/network/access/qhttpheaders.cpp b/src/network/access/qhttpheaders.cpp
index 18b76a30359..b0aafd2e175 100644
--- a/src/network/access/qhttpheaders.cpp
+++ b/src/network/access/qhttpheaders.cpp
@@ -791,6 +791,7 @@ public:
     static void removeAll(Self &d, const HeaderName &name);
 
     void combinedValue(const HeaderName &name, QByteArray &result) const;
+    void values(const HeaderName &name, QList<QByteArray> &result) const;
 
     QList<Header> headers;
 };
@@ -833,6 +834,14 @@ void QHttpHeadersPrivate::combinedValue(const HeaderName &name, QByteArray &resu
     }
 }
 
+void QHttpHeadersPrivate::values(const HeaderName &name, QList<QByteArray> &result) const
+{
+    for (const auto &h : std::as_const(headers)) {
+        if (h.name == name)
+            result.append(h.value);
+    }
+}
+
 /*!
     Creates a new QHttpHeaders object.
 */
@@ -1308,12 +1317,7 @@ QList<QByteArray> QHttpHeaders::values(QAnyStringView name) const
     if (isEmpty())
         return result;
 
-    const HeaderName hname(name);
-
-    for (const auto &h : std::as_const(d->headers)) {
-        if (h.name == hname)
-            result.append(h.value);
-    }
+    d->values(HeaderName{name}, result);
     return result;
 }
 
@@ -1322,17 +1326,12 @@ QList<QByteArray> QHttpHeaders::values(QAnyStringView name) const
 */
 QList<QByteArray> QHttpHeaders::values(WellKnownHeader name) const
 {
-    QList<QByteArray> values;
+    QList<QByteArray> result;
     if (isEmpty())
-        return values;
+        return result;
 
-    const HeaderName hname(name);
-
-    for (const auto &h : std::as_const(d->headers)) {
-        if (h.name == hname)
-            values.append(h.value);
-    }
-    return values;
+    d->values(HeaderName{name}, result);
+    return result;
 }
 
 /*!