From 77bb50de8f3f7defe1329e6c4a6e066d510afc55 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 6 Jul 2020 13:13:05 +0200
Subject: Use QList instead of QVector in qtbase

Fixes all other QVector occurrences

Task-number: QTBUG-84469
Change-Id: I5f9311298d341a9a3061a6a640539583d1618939
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/tools/cmake_automoc_parser/main.cpp | 28 ++++++++++++++--------------
 src/tools/moc/symbols.h                 |  6 +++---
 src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp |  9 ++++-----
 src/tools/qlalr/compress.h              |  2 +-
 src/tools/qvkgen/qvkgen.cpp             |  2 +-
 src/tools/tracegen/helpers.h            |  2 +-
 src/tools/tracegen/provider.h           |  2 +-
 src/tools/uic/treewalker.h              |  2 +-
 src/tools/uic/ui4.h                     |  1 -
 9 files changed, 26 insertions(+), 28 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/cmake_automoc_parser/main.cpp b/src/tools/cmake_automoc_parser/main.cpp
index 60eb4b2977..7ef57a1d6c 100644
--- a/src/tools/cmake_automoc_parser/main.cpp
+++ b/src/tools/cmake_automoc_parser/main.cpp
@@ -31,26 +31,26 @@
 #include <cstdio>
 #include <cstdlib>
 
+#include <qcommandlineoption.h>
+#include <qcommandlineparser.h>
+#include <qcoreapplication.h>
+#include <qdebug.h>
+#include <qdir.h>
 #include <qfile.h>
+#include <qhash.h>
 #include <qjsonarray.h>
 #include <qjsondocument.h>
 #include <qjsonobject.h>
-#include <qdir.h>
+#include <qlist.h>
+#include <qmap.h>
+#include <qset.h>
 #include <qstring.h>
-#include <qhash.h>
-#include <qvector.h>
 #include <qstack.h>
-#include <qdebug.h>
-#include <qset.h>
-#include <qmap.h>
-#include <qcoreapplication.h>
-#include <qcommandlineoption.h>
-#include <qcommandlineparser.h>
 
 QT_BEGIN_NAMESPACE
 
 using AutoGenHeaderMap = QMap<QString, QString>;
-using AutoGenSourcesList = QVector<QString>;
+using AutoGenSourcesList = QList<QString>;
 
 static bool readAutogenInfoJson(AutoGenHeaderMap &headers, AutoGenSourcesList &sources,
                                 QStringList &headerExts, const QString &autoGenInfoJsonPath)
@@ -194,7 +194,7 @@ static bool readParseCache(ParseCacheMap &entries, const QString &parseCacheFile
     return true;
 }
 
-static bool readJsonFiles(QVector<QString> &entries, const QString &filePath)
+static bool readJsonFiles(QList<QString> &entries, const QString &filePath)
 {
 
     QFile file(filePath);
@@ -212,7 +212,7 @@ static bool readJsonFiles(QVector<QString> &entries, const QString &filePath)
     return true;
 }
 
-static bool writeJsonFiles(const QVector<QString> &fileList, const QString &fileListFilePath)
+static bool writeJsonFiles(const QList<QString> &fileList, const QString &fileListFilePath)
 {
     QFile file(fileListFilePath);
     if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
@@ -308,7 +308,7 @@ int main(int argc, char **argv)
     // entry for it in the parse cache. Use the value for the location of the
     // moc.json file
 
-    QVector<QString> jsonFileList;
+    QList<QString> jsonFileList;
     QDir dir(cmakeIncludeDir);
     jsonFileList.reserve(autoGenSources.size());
 
@@ -379,7 +379,7 @@ int main(int argc, char **argv)
 
     // Read Previous file list (if any)
     const QString fileListFilePath = parser.value(outputFileOption);
-    QVector<QString> previousList;
+    QList<QString> previousList;
     QFile prev_file(fileListFilePath);
 
     // Only try to open file if it exists to avoid error messages
diff --git a/src/tools/moc/symbols.h b/src/tools/moc/symbols.h
index a28cad602f..dfc682f0bf 100644
--- a/src/tools/moc/symbols.h
+++ b/src/tools/moc/symbols.h
@@ -31,11 +31,11 @@
 #define SYMBOLS_H
 
 #include "token.h"
-#include <qstring.h>
+#include <qdebug.h>
 #include <qhash.h>
-#include <qvector.h>
+#include <qlist.h>
 #include <qstack.h>
-#include <qdebug.h>
+#include <qstring.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
index 5d6ee665c7..e48ac6a75e 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
@@ -26,14 +26,13 @@
 **
 ****************************************************************************/
 
+#include <qbuffer.h>
 #include <qbytearray.h>
-#include <qstring.h>
-#include <qvarlengtharray.h>
+#include <qdebug.h>
 #include <qfile.h>
 #include <qlist.h>
-#include <qbuffer.h>
-#include <qvector.h>
-#include <qdebug.h>
+#include <qstring.h>
+#include <qvarlengtharray.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/tools/qlalr/compress.h b/src/tools/qlalr/compress.h
index e61ba32440..84b804e234 100644
--- a/src/tools/qlalr/compress.h
+++ b/src/tools/qlalr/compress.h
@@ -29,7 +29,7 @@
 #ifndef COMPRESS_H
 #define COMPRESS_H
 
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 
 class Compress
 {
diff --git a/src/tools/qvkgen/qvkgen.cpp b/src/tools/qvkgen/qvkgen.cpp
index 74137c8a63..efbe54e0a5 100644
--- a/src/tools/qvkgen/qvkgen.cpp
+++ b/src/tools/qvkgen/qvkgen.cpp
@@ -27,9 +27,9 @@
 ****************************************************************************/
 
 #include <QtCore/qcoreapplication.h>
-#include <QtCore/qvector.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qfileinfo.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qxmlstream.h>
 
 class VkSpecParser
diff --git a/src/tools/tracegen/helpers.h b/src/tools/tracegen/helpers.h
index d55a956834..8acf6e2292 100644
--- a/src/tools/tracegen/helpers.h
+++ b/src/tools/tracegen/helpers.h
@@ -42,7 +42,7 @@
 
 #include "provider.h"
 
-#include <qvector.h>
+#include <qlist.h>
 #include <qstring.h>
 
 enum ParamType {
diff --git a/src/tools/tracegen/provider.h b/src/tools/tracegen/provider.h
index b9ebc2ec5a..a62522adc7 100644
--- a/src/tools/tracegen/provider.h
+++ b/src/tools/tracegen/provider.h
@@ -40,7 +40,7 @@
 #ifndef PROVIDER_H
 #define PROVIDER_H
 
-#include <qvector.h>
+#include <qlist.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qtypeinfo.h>
diff --git a/src/tools/uic/treewalker.h b/src/tools/uic/treewalker.h
index 05b5dbf9fc..abc5658924 100644
--- a/src/tools/uic/treewalker.h
+++ b/src/tools/uic/treewalker.h
@@ -29,7 +29,7 @@
 #ifndef TREEWALKER_H
 #define TREEWALKER_H
 
-#include <qvector.h>
+#include <qlist.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h
index 3e0e09a4e0..a5ac51f521 100644
--- a/src/tools/uic/ui4.h
+++ b/src/tools/uic/ui4.h
@@ -45,7 +45,6 @@
 #include <qlist.h>
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qvector.h>
 #include <qxmlstream.h>
 #include <qglobal.h>
 
-- 
cgit v1.2.3