Other tools: Use QList instead of QVector

Task-number: QTBUG-84469
Change-Id: I3c195691a310226ab0eee76c0f60ffa4751dee62
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

7 files changed, 16 insertions, 16 deletions

diff --git a/src/qtattributionsscanner/jsongenerator.cpp b/src/qtattributionsscanner/jsongenerator.cpp
index 44fb784aa..792f616a5 100644
--- a/src/qtattributionsscanner/jsongenerator.cpp
+++ b/src/qtattributionsscanner/jsongenerator.cpp
@@ -63,7 +63,7 @@ static QJsonObject generate(Package package)
     return obj;
 }
 
-void generate(QTextStream &out, const QVector<Package> &packages, LogLevel logLevel)
+void generate(QTextStream &out, const QList<Package> &packages, LogLevel logLevel)
 {
     if (logLevel == VerboseLog)
         std::cerr << qPrintable(tr("Generating json...\n"));
diff --git a/src/qtattributionsscanner/jsongenerator.h b/src/qtattributionsscanner/jsongenerator.h
index a4b6f11e2..5099822e6 100644
--- a/src/qtattributionsscanner/jsongenerator.h
+++ b/src/qtattributionsscanner/jsongenerator.h
@@ -33,11 +33,11 @@
 #include "package.h"
 
 #include <QtCore/qtextstream.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 
 namespace JsonGenerator {
 
-void generate(QTextStream &out, const QVector<Package> &packages, LogLevel logLevel);
+void generate(QTextStream &out, const QList<Package> &packages, LogLevel logLevel);
 
 } // namespace JsonGenerator
 
diff --git a/src/qtattributionsscanner/main.cpp b/src/qtattributionsscanner/main.cpp
index a317aec29..2684a6207 100644
--- a/src/qtattributionsscanner/main.cpp
+++ b/src/qtattributionsscanner/main.cpp
@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
     }
 
     // Parse the attribution files
-    QVector<Package> packages;
+    QList<Package> packages;
     const QFileInfo pathInfo(path);
     if (pathInfo.isDir()) {
         if (logLevel == VerboseLog)
diff --git a/src/qtattributionsscanner/qdocgenerator.cpp b/src/qtattributionsscanner/qdocgenerator.cpp
index dfa460f3d..3e2fe34bf 100644
--- a/src/qtattributionsscanner/qdocgenerator.cpp
+++ b/src/qtattributionsscanner/qdocgenerator.cpp
@@ -154,7 +154,7 @@ static void generate(QTextStream &out, const Package &package, const QDir &baseD
     out << "*/\n";
 }
 
-void generate(QTextStream &out, const QVector<Package> &packages, const QString &baseDirectory,
+void generate(QTextStream &out, const QList<Package> &packages, const QString &baseDirectory,
               LogLevel logLevel)
 {
     if (logLevel == VerboseLog)
diff --git a/src/qtattributionsscanner/qdocgenerator.h b/src/qtattributionsscanner/qdocgenerator.h
index 758318f13..826f01e01 100644
--- a/src/qtattributionsscanner/qdocgenerator.h
+++ b/src/qtattributionsscanner/qdocgenerator.h
@@ -33,11 +33,11 @@
 #include "package.h"
 
 #include <QtCore/qtextstream.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 
 namespace QDocGenerator {
 
-void generate(QTextStream &out, const QVector<Package> &packages, const QString &baseDirectory,
+void generate(QTextStream &out, const QList<Package> &packages, const QString &baseDirectory,
               LogLevel logLevel);
 
 } // namespace QDocGenerator
diff --git a/src/qtattributionsscanner/scanner.cpp b/src/qtattributionsscanner/scanner.cpp
index fd9d06366..4eb41e4d4 100644
--- a/src/qtattributionsscanner/scanner.cpp
+++ b/src/qtattributionsscanner/scanner.cpp
@@ -224,9 +224,9 @@ static Package parseChromiumFile(QFile &file, const QString &filePath, LogLevel
     return p;
 }
 
-QVector<Package> readFile(const QString &filePath, LogLevel logLevel)
+QList<Package> readFile(const QString &filePath, LogLevel logLevel)
 {
-    QVector<Package> packages;
+    QList<Package> packages;
 
     if (logLevel == VerboseLog) {
         std::cerr << qPrintable(tr("Reading file %1...").arg(
@@ -237,7 +237,7 @@ QVector<Package> readFile(const QString &filePath, LogLevel logLevel)
         if (logLevel != SilentLog)
             std::cerr << qPrintable(tr("Could not open file %1.").arg(
                                         QDir::toNativeSeparators(file.fileName()))) << std::endl;
-        return QVector<Package>();
+        return QList<Package>();
     }
 
     if (filePath.endsWith(QLatin1String(".json"))) {
@@ -249,7 +249,7 @@ QVector<Package> readFile(const QString &filePath, LogLevel logLevel)
                                             QDir::toNativeSeparators(file.fileName()),
                                             jsonParseError.errorString()))
                           << std::endl;
-            return QVector<Package>();
+            return QList<Package>();
         }
 
         if (document.isObject()) {
@@ -286,10 +286,10 @@ QVector<Package> readFile(const QString &filePath, LogLevel logLevel)
     return packages;
 }
 
-QVector<Package> scanDirectory(const QString &directory, InputFormats inputFormats, LogLevel logLevel)
+QList<Package> scanDirectory(const QString &directory, InputFormats inputFormats, LogLevel logLevel)
 {
     QDir dir(directory);
-    QVector<Package> packages;
+    QList<Package> packages;
 
     QStringList nameFilters = QStringList();
     if (inputFormats & InputFormat::QtAttributions)
diff --git a/src/qtattributionsscanner/scanner.h b/src/qtattributionsscanner/scanner.h
index e697f937a..e681c9891 100644
--- a/src/qtattributionsscanner/scanner.h
+++ b/src/qtattributionsscanner/scanner.h
@@ -33,7 +33,7 @@
 #include "package.h"
 
 #include <QtCore/qstring.h>
-#include <QtCore/qvector.h>
+#include <QtCore/qlist.h>
 
 namespace Scanner {
 
@@ -44,8 +44,8 @@ enum class InputFormat {
 Q_DECLARE_FLAGS(InputFormats, InputFormat)
 Q_DECLARE_OPERATORS_FOR_FLAGS(InputFormats)
 
-QVector<Package> readFile(const QString &filePath, LogLevel logLevel);
-QVector<Package> scanDirectory(const QString &directory, InputFormats inputFormats, LogLevel logLevel);
+QList<Package> readFile(const QString &filePath, LogLevel logLevel);
+QList<Package> scanDirectory(const QString &directory, InputFormats inputFormats, LogLevel logLevel);
 
 }