summaryrefslogtreecommitdiffstats
path: root/src/tools/cmake_automoc_parser
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-07-06 13:13:05 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-07-07 11:48:45 +0200
commit77bb50de8f3f7defe1329e6c4a6e066d510afc55 (patch)
tree758b5aab51211aaba887e3ffe9bb4d46f9e740cf /src/tools/cmake_automoc_parser
parent989fca660c3556fa957ed9a3f7cd3b948a4166a2 (diff)
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>
Diffstat (limited to 'src/tools/cmake_automoc_parser')
-rw-r--r--src/tools/cmake_automoc_parser/main.cpp28
1 files changed, 14 insertions, 14 deletions
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