Use QList instead of QVector in moc

Task-number: QTBUG-84469
Change-Id: Id95a656e6277a7c348c02c3267a45ac176c1643b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 16 insertions, 10 deletions

diff --git a/src/tools/moc/generator.h b/src/tools/moc/generator.h
index f3d3b40349..a9bf229c71 100644
--- a/src/tools/moc/generator.h
+++ b/src/tools/moc/generator.h
@@ -37,19 +37,24 @@ class Generator
 {
     FILE *out;
     ClassDef *cdef;
-    QVector<uint> meta_data;
+    QList<uint> meta_data;
+
 public:
-    Generator(ClassDef *classDef, const QVector<QByteArray> &metaTypes, const QHash<QByteArray, QByteArray> &knownQObjectClasses, const QHash<QByteArray, QByteArray> &knownGadgets, FILE *outfile = nullptr, bool requireCompleteTypes = false);
+    Generator(ClassDef *classDef, const QList<QByteArray> &metaTypes,
+              const QHash<QByteArray, QByteArray> &knownQObjectClasses,
+              const QHash<QByteArray, QByteArray> &knownGadgets, FILE *outfile = nullptr,
+              bool requireCompleteTypes = false);
     void generateCode();
 private:
     bool registerableMetaType(const QByteArray &propertyType);
     void registerClassInfoStrings();
     void generateClassInfos();
-    void registerFunctionStrings(const QVector<FunctionDef> &list);
-    void registerByteArrayVector(const QVector<QByteArray> &list);
-    void generateFunctions(const QVector<FunctionDef> &list, const char *functype, int type, int &paramsIndex, int &initialMetatypeOffset);
-    void generateFunctionRevisions(const QVector<FunctionDef> &list, const char *functype);
-    void generateFunctionParameters(const QVector<FunctionDef> &list, const char *functype);
+    void registerFunctionStrings(const QList<FunctionDef> &list);
+    void registerByteArrayVector(const QList<QByteArray> &list);
+    void generateFunctions(const QList<FunctionDef> &list, const char *functype, int type,
+                           int &paramsIndex, int &initialMetatypeOffset);
+    void generateFunctionRevisions(const QList<FunctionDef> &list, const char *functype);
+    void generateFunctionParameters(const QList<FunctionDef> &list, const char *functype);
     void generateTypeInfo(const QByteArray &typeName, bool allowEmptyName = false);
     void registerEnumStrings();
     void generateEnums(int index);
@@ -61,13 +66,14 @@ private:
     void generateQPropertyApi();
     void generatePluginMetaData();
     QMultiMap<QByteArray, int> automaticPropertyMetaTypesHelper();
-    QMap<int, QMultiMap<QByteArray, int> > methodsWithAutomaticTypesHelper(const QVector<FunctionDef> &methodList);
+    QMap<int, QMultiMap<QByteArray, int>>
+    methodsWithAutomaticTypesHelper(const QList<FunctionDef> &methodList);
 
     void strreg(const QByteArray &); // registers a string
     int stridx(const QByteArray &); // returns a string's id
-    QVector<QByteArray> strings;
+    QList<QByteArray> strings;
     QByteArray purestSuperClass;
-    QVector<QByteArray> metaTypes;
+    QList<QByteArray> metaTypes;
     QHash<QByteArray, QByteArray> knownQObjectClasses;
     QHash<QByteArray, QByteArray> knownGadgets;
     bool requireCompleteTypes;