Use QList instead of QVector in network

Task-number: QTBUG-84469
Change-Id: I7827da68e73ca8ff1e599c836f2157894c452b63
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

7 files changed, 23 insertions, 27 deletions

diff --git a/src/network/access/qhsts.cpp b/src/network/access/qhsts.cpp
index e473008305..99c4c605dd 100644
--- a/src/network/access/qhsts.cpp
+++ b/src/network/access/qhsts.cpp
@@ -40,7 +40,6 @@
 #include "qhsts_p.h"
 
 #include "QtCore/private/qipaddress_p.h"
-#include "QtCore/qvector.h"
 #include "QtCore/qlist.h"
 
 #if QT_CONFIG(settings)
@@ -93,7 +92,7 @@ void QHstsCache::updateFromHeaders(const QList<QPair<QByteArray, QByteArray>> &h
     }
 }
 
-void QHstsCache::updateFromPolicies(const QVector<QHstsPolicy> &policies)
+void QHstsCache::updateFromPolicies(const QList<QHstsPolicy> &policies)
 {
     for (const auto &policy : policies)
         updateKnownHost(policy.host(), policy.expiry(), policy.includesSubDomains());
@@ -227,9 +226,9 @@ void QHstsCache::clear()
     knownHosts.clear();
 }
 
-QVector<QHstsPolicy> QHstsCache::policies() const
+QList<QHstsPolicy> QHstsCache::policies() const
 {
-    QVector<QHstsPolicy> values;
+    QList<QHstsPolicy> values;
     values.reserve(int(knownHosts.size()));
     for (const auto &host : knownHosts)
         values << host.second;
@@ -250,7 +249,7 @@ void QHstsCache::setStore(QHstsStore *store)
         // (and thus the cached policy takes priority over whatever policy we
         // had in the store for the same host, if any).
         if (knownHosts.size()) {
-            const QVector<QHstsPolicy> observed(policies());
+            const QList<QHstsPolicy> observed(policies());
             for (const auto &policy : observed)
                 hstsStore->addToObserved(policy);
             hstsStore->synchronize();
@@ -260,7 +259,7 @@ void QHstsCache::setStore(QHstsStore *store)
         // the store knows about (well, it can happen we synchronize again as a
         // result if some policies managed to expire or if we add a new one
         // from the store to cache):
-        const QVector<QHstsPolicy> restored(store->readPolicies());
+        const QList<QHstsPolicy> restored(store->readPolicies());
         updateFromPolicies(restored);
     }
 }
diff --git a/src/network/access/qhsts_p.h b/src/network/access/qhsts_p.h
index 7253b2835e..ea9769ac6c 100644
--- a/src/network/access/qhsts_p.h
+++ b/src/network/access/qhsts_p.h
@@ -73,13 +73,13 @@ public:
 
     void updateFromHeaders(const QList<QPair<QByteArray, QByteArray>> &headers,
                            const QUrl &url);
-    void updateFromPolicies(const QVector<QHstsPolicy> &hosts);
+    void updateFromPolicies(const QList<QHstsPolicy> &hosts);
     void updateKnownHost(const QUrl &url, const QDateTime &expires,
                          bool includeSubDomains);
     bool isKnownHost(const QUrl &url) const;
     void clear();
 
-    QVector<QHstsPolicy> policies() const;
+    QList<QHstsPolicy> policies() const;
 
 #if QT_CONFIG(settings)
     void setStore(class QHstsStore *store);
diff --git a/src/network/access/qhstsstore.cpp b/src/network/access/qhstsstore.cpp
index 6d7f60ba8d..67be8a2de2 100644
--- a/src/network/access/qhstsstore.cpp
+++ b/src/network/access/qhstsstore.cpp
@@ -76,13 +76,13 @@ QHstsStore::~QHstsStore()
     synchronize();
 }
 
-QVector<QHstsPolicy> QHstsStore::readPolicies()
+QList<QHstsPolicy> QHstsStore::readPolicies()
 {
     // This function only attempts to read policies, making no decision about
     // expired policies. It's up to a user (QHstsCache) to mark these policies
     // for deletion and sync the store later. But we immediately remove keys/values
     // (if the store isWritable) for the policies that we fail to read.
-    QVector<QHstsPolicy> policies;
+    QList<QHstsPolicy> policies;
 
     beginHstsGroups();
 
diff --git a/src/network/access/qhstsstore_p.h b/src/network/access/qhstsstore_p.h
index 5338d15592..bbf7379b61 100644
--- a/src/network/access/qhstsstore_p.h
+++ b/src/network/access/qhstsstore_p.h
@@ -55,8 +55,8 @@
 
 QT_REQUIRE_CONFIG(settings);
 
+#include <QtCore/qlist.h>
 #include <QtCore/qsettings.h>
-#include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -70,7 +70,7 @@ public:
     explicit QHstsStore(const QString &dirName);
     ~QHstsStore();
 
-    QVector<QHstsPolicy> readPolicies();
+    QList<QHstsPolicy> readPolicies();
     void addToObserved(const QHstsPolicy &policy);
     void synchronize();
 
@@ -84,7 +84,7 @@ private:
     void evictPolicy(const QString &key);
     void endHstsGroups();
 
-    QVector<QHstsPolicy> observedPolicies;
+    QList<QHstsPolicy> observedPolicies;
     QSettings store;
 
     Q_DISABLE_COPY_MOVE(QHstsStore)
diff --git a/src/network/access/qnetworkaccessauthenticationmanager.cpp b/src/network/access/qnetworkaccessauthenticationmanager.cpp
index 0df11684b1..4899273aa8 100644
--- a/src/network/access/qnetworkaccessauthenticationmanager.cpp
+++ b/src/network/access/qnetworkaccessauthenticationmanager.cpp
@@ -42,8 +42,8 @@
 #include "qnetworkaccessmanager_p.h"
 
 #include "QtCore/qbuffer.h"
+#include "QtCore/qlist.h"
 #include "QtCore/qurl.h"
-#include "QtCore/qvector.h"
 #include "QtCore/QMutexLocker"
 #include "QtNetwork/qauthenticator.h"
 
@@ -51,11 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
-
-
-
-class QNetworkAuthenticationCache: private QVector<QNetworkAuthenticationCredential>,
-                                   public QNetworkAccessCache::CacheableObject
+class QNetworkAuthenticationCache : private QList<QNetworkAuthenticationCredential>,
+                                    public QNetworkAccessCache::CacheableObject
 {
 public:
     QNetworkAuthenticationCache()
@@ -89,9 +86,9 @@ public:
             newCredential.password = password;
 
             if (closestMatch)
-                QVector<QNetworkAuthenticationCredential>::insert(++closestMatch, newCredential);
+                QList<QNetworkAuthenticationCredential>::insert(++closestMatch, newCredential);
             else
-                QVector<QNetworkAuthenticationCredential>::insert(end(), newCredential);
+                QList<QNetworkAuthenticationCredential>::insert(end(), newCredential);
         }
     }
 
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 8bc0159b9d..148cfdb09b 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -64,8 +64,8 @@
 #include "qnetworkreplyfileimpl_p.h"
 
 #include "QtCore/qbuffer.h"
+#include "QtCore/qlist.h"
 #include "QtCore/qurl.h"
-#include "QtCore/qvector.h"
 #include "QtNetwork/private/qauthenticator_p.h"
 #include "QtNetwork/qsslconfiguration.h"
 #include "QtNetwork/private/http2protocol_p.h"
@@ -740,7 +740,7 @@ bool QNetworkAccessManager::isStrictTransportSecurityStoreEnabled() const
     \sa addStrictTransportSecurityHosts(), enableStrictTransportSecurityStore(), QHstsPolicy
 */
 
-void QNetworkAccessManager::addStrictTransportSecurityHosts(const QVector<QHstsPolicy> &knownHosts)
+void QNetworkAccessManager::addStrictTransportSecurityHosts(const QList<QHstsPolicy> &knownHosts)
 {
     Q_D(QNetworkAccessManager);
     d->stsCache.updateFromPolicies(knownHosts);
@@ -755,7 +755,7 @@ void QNetworkAccessManager::addStrictTransportSecurityHosts(const QVector<QHstsP
 
     \sa addStrictTransportSecurityHosts(), QHstsPolicy
 */
-QVector<QHstsPolicy> QNetworkAccessManager::strictTransportSecurityHosts() const
+QList<QHstsPolicy> QNetworkAccessManager::strictTransportSecurityHosts() const
 {
     Q_D(const QNetworkAccessManager);
     return d->stsCache.policies();
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index db76d6daf1..255ebaa8fb 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -43,7 +43,7 @@
 #include <QtNetwork/qtnetworkglobal.h>
 #include <QtNetwork/qnetworkrequest.h>
 #include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 #include <QtCore/QObject>
 #ifndef QT_NO_SSL
 #include <QtNetwork/QSslConfiguration>
@@ -112,8 +112,8 @@ public:
     bool isStrictTransportSecurityEnabled() const;
     void enableStrictTransportSecurityStore(bool enabled, const QString &storeDir = QString());
     bool isStrictTransportSecurityStoreEnabled() const;
-    void addStrictTransportSecurityHosts(const QVector<QHstsPolicy> &knownHosts);
-    QVector<QHstsPolicy> strictTransportSecurityHosts() const;
+    void addStrictTransportSecurityHosts(const QList<QHstsPolicy> &knownHosts);
+    QList<QHstsPolicy> strictTransportSecurityHosts() const;
 
     QNetworkReply *head(const QNetworkRequest &request);
     QNetworkReply *get(const QNetworkRequest &request);