From 4179204bd770f8c17ce60141c7311456ffc8db4e Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Thu, 25 Jan 2024 18:53:59 +0100
Subject: [PATCH] QHttpHeaders: Self-Encapsulate Field d->headers

Use QHttpHeaders::reserve() and QHttpHeaders::isEmpty() instead of
going directly to d->headers. Will help in enabling a nullptr d.

Change-Id: Id530f8922b17058ec47530523ed43e08927c3ce3
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
(cherry picked from commit f5056a0b53bcc3f095efb5664201e4a0daea9c1e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/network/access/qhttpheaders.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/network/access/qhttpheaders.cpp b/src/network/access/qhttpheaders.cpp
index 91a92e21bb0..5ad28b8920e 100644
--- a/src/network/access/qhttpheaders.cpp
+++ b/src/network/access/qhttpheaders.cpp
@@ -485,7 +485,7 @@ QHttpHeaders::QHttpHeaders() : d(new QHttpHeadersPrivate)
 QHttpHeaders QHttpHeaders::fromListOfPairs(const QList<std::pair<QByteArray, QByteArray>> &headers)
 {
     QHttpHeaders h;
-    h.d->headers.reserve(headers.size());
+    h.reserve(headers.size());
     for (const auto &header : headers)
         h.append(header.first, header.second);
     return h;
@@ -500,7 +500,7 @@ QHttpHeaders QHttpHeaders::fromListOfPairs(const QList<std::pair<QByteArray, QBy
 QHttpHeaders QHttpHeaders::fromMultiMap(const QMultiMap<QByteArray, QByteArray> &headers)
 {
     QHttpHeaders h;
-    h.d->headers.reserve(headers.size());
+    h.reserve(headers.size());
     for (const auto &[name,value] : headers.asKeyValueRange())
         h.append(name, value);
     return h;
@@ -515,7 +515,7 @@ QHttpHeaders QHttpHeaders::fromMultiMap(const QMultiMap<QByteArray, QByteArray>
 QHttpHeaders QHttpHeaders::fromMultiHash(const QMultiHash<QByteArray, QByteArray> &headers)
 {
     QHttpHeaders h;
-    h.d->headers.reserve(headers.size());
+    h.reserve(headers.size());
     for (const auto &[name,value] : headers.asKeyValueRange())
         h.append(name, value);
     return h;
@@ -1097,7 +1097,7 @@ QMultiHash<QByteArray, QByteArray> QHttpHeaders::toMultiHash() const
 */
 void QHttpHeaders::clear()
 {
-    if (d->headers.isEmpty())
+    if (isEmpty())
         return;
     d.detach();
     d->headers.clear();