Replace QVector by QList

Change AbstractMetaClass::templateArguments()
to return TypeEntries (const TypeEntry *) instead
non-const.

Remove redundant typedef OverloadData::MetaFunctionList.

Use existing typedefs in some places.

Add new typedefs for MetaObjectBuilder::EnumValues and
AbstractMetaFunctionCList.

Change-Id: Ia241b5fbe54d60ea57175fb1f6c844604e066a3d
Reviewed-by: Christian Tismer <tismer@stackless.com>

42 files changed, 160 insertions, 160 deletions

diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
index a583b6ec2..33eb85ace 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp
@@ -1009,7 +1009,7 @@ AbstractMetaClass *AbstractMetaBuilderPrivate::traverseClass(const FileModelItem
         *metaClass += AbstractMetaAttributes::FinalCppClass;
 
     QStringList baseClassNames;
-    const QVector<_ClassModelItem::BaseClass> &baseClasses = classItem->baseClasses();
+    const QList<_ClassModelItem::BaseClass> &baseClasses = classItem->baseClasses();
     for (const _ClassModelItem::BaseClass &baseClass : baseClasses) {
         if (baseClass.accessPolicy == CodeModel::Public)
             baseClassNames.append(baseClass.name);
@@ -1028,7 +1028,7 @@ AbstractMetaClass *AbstractMetaBuilderPrivate::traverseClass(const FileModelItem
     }
 
     TemplateParameterList template_parameters = classItem->templateParameters();
-    QVector<TypeEntry *> template_args;
+    TypeEntries template_args;
     template_args.clear();
     auto argumentParent = metaClass->typeEntry()->typeSystemTypeEntry();
     for (int i = 0; i < template_parameters.size(); ++i) {
@@ -2005,8 +2005,8 @@ TypeEntries AbstractMetaBuilderPrivate::findTypeEntriesHelper(const QString &qua
     // 8. No? Check if the current class is a template and this type is one
     //    of the parameters.
     if (currentClass) {
-        const QVector<TypeEntry *> &template_args = currentClass->templateArguments();
-        for (TypeEntry *te : template_args) {
+        const auto &template_args = currentClass->templateArguments();
+        for (const TypeEntry *te : template_args) {
             if (te->name() == qualifiedName)
                 return {te};
         }
@@ -3033,7 +3033,7 @@ void AbstractMetaBuilderPrivate::pushScope(const NamespaceModelItem &item)
 {
     // For purposes of type lookup, join all namespaces of the same name
     // within the parent item.
-    QVector<NamespaceModelItem> candidates;
+    QList<NamespaceModelItem> candidates;
     const QString name = item->name();
     if (!m_scopes.isEmpty()) {
         for (const auto &n : m_scopes.constLast()->namespaces()) {
diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h
index 2789c88bd..0fe66fe38 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h
@@ -39,7 +39,7 @@
 
 #include <QSet>
 #include <QFileInfo>
-#include <QVector>
+#include <QList>
 
 #include <optional>
 
@@ -205,7 +205,7 @@ public:
 
     QHash<const TypeEntry *, AbstractMetaEnum> m_enums;
 
-    QVector<NamespaceModelItem> m_scopes;
+    QList<NamespaceModelItem> m_scopes;
 
     QSet<AbstractMetaClass *> m_setupInheritanceDone;
 
@@ -213,7 +213,7 @@ public:
     QFileInfoList m_globalHeaders;
     QStringList m_headerPaths;
     mutable QHash<QString, Include> m_resolveIncludeHash;
-    QVector<TypeClassEntry> m_typeSystemTypeDefs; // look up metatype->class for type system typedefs
+    QList<TypeClassEntry> m_typeSystemTypeDefs; // look up metatype->class for type system typedefs
     bool m_skipDeprecated = false;
 };
 
diff --git a/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp b/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp
index 73146aa6d..79c542f26 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetafunction.cpp
@@ -426,9 +426,9 @@ int AbstractMetaFunction::actualMinimumArgumentCount() const
 }
 
 // Returns reference counts for argument at idx, or all arguments if idx == -2
-QVector<ReferenceCount> AbstractMetaFunction::referenceCounts(const AbstractMetaClass *cls, int idx) const
+QList<ReferenceCount> AbstractMetaFunction::referenceCounts(const AbstractMetaClass *cls, int idx) const
 {
-    QVector<ReferenceCount> returned;
+    QList<ReferenceCount> returned;
 
     for (const auto &mod : modifications(cls)) {
         for (const ArgumentModification &argumentMod : mod.argument_mods()) {
diff --git a/sources/shiboken6/ApiExtractor/abstractmetafunction.h b/sources/shiboken6/ApiExtractor/abstractmetafunction.h
index 6dbf85100..2db47daeb 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetafunction.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetafunction.h
@@ -218,7 +218,7 @@ public:
     AbstractMetaFunction *copy() const;
 
     QString conversionRule(TypeSystem::Language language, int idx) const;
-    QVector<ReferenceCount> referenceCounts(const AbstractMetaClass *cls, int idx = -2) const;
+    QList<ReferenceCount> referenceCounts(const AbstractMetaClass *cls, int idx = -2) const;
     ArgumentOwner argumentOwner(const AbstractMetaClass *cls, int idx) const;
 
     // Returns the ownership rules for the given argument in the given context
diff --git a/sources/shiboken6/ApiExtractor/abstractmetalang.cpp b/sources/shiboken6/ApiExtractor/abstractmetalang.cpp
index eb01ee2e1..bdddfed6e 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetalang.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetalang.cpp
@@ -106,7 +106,7 @@ public:
     AbstractMetaFunctionList m_externalConversionOperators;
 
     QStringList m_baseClassNames;  // Base class names from C++, including rejected
-    QVector<TypeEntry *> m_templateArgs;
+    TypeEntries m_templateArgs;
     ComplexTypeEntry *m_typeEntry = nullptr;
     SourceLocation m_sourceLocation;
 
@@ -566,12 +566,12 @@ bool AbstractMetaClass::hasProtectedMembers() const
     return hasProtectedFields() || hasProtectedFunctions();
 }
 
-const QVector<TypeEntry *> &AbstractMetaClass::templateArguments() const
+const TypeEntries &AbstractMetaClass::templateArguments() const
 {
     return d->m_templateArgs;
 }
 
-void AbstractMetaClass::setTemplateArguments(const QVector<TypeEntry *> &args)
+void AbstractMetaClass::setTemplateArguments(const TypeEntries &args)
 {
     d->m_templateArgs = args;
 }
diff --git a/sources/shiboken6/ApiExtractor/abstractmetalang.h b/sources/shiboken6/ApiExtractor/abstractmetalang.h
index 793d4377f..b72acfe8c 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetalang.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetalang.h
@@ -255,8 +255,8 @@ public:
     bool hasProtectedMembers() const;
 
 
-    const QVector<TypeEntry *> &templateArguments() const;
-    void setTemplateArguments(const QVector<TypeEntry *> &args);
+    const TypeEntries &templateArguments() const;
+    void setTemplateArguments(const TypeEntries &);
 
     // only valid during metabuilder's run
     const QStringList &baseClassNames() const;
diff --git a/sources/shiboken6/ApiExtractor/abstractmetalang_helpers.h b/sources/shiboken6/ApiExtractor/abstractmetalang_helpers.h
index b38284b9e..afe5c954a 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetalang_helpers.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetalang_helpers.h
@@ -30,7 +30,7 @@
 #define ABSTRACTMETALANG_HELPERS_H
 
 template <class MetaClass>
-MetaClass *findByName(QVector<MetaClass *> haystack, QStringView needle)
+MetaClass *findByName(QList<MetaClass *> haystack, QStringView needle)
 {
     for (MetaClass *c : haystack) {
         if (c->name() == needle)
diff --git a/sources/shiboken6/ApiExtractor/abstractmetalang_typedefs.h b/sources/shiboken6/ApiExtractor/abstractmetalang_typedefs.h
index a79cdbab3..91a029c06 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetalang_typedefs.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetalang_typedefs.h
@@ -30,7 +30,7 @@
 #define ABSTRACTMETALANG_TYPEDEFS_H
 
 #include <QtCore/QSharedPointer>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 
 class AbstractMetaClass;
 class AbstractMetaField;
@@ -40,13 +40,14 @@ class AbstractMetaEnumValue;
 class AbstractMetaFunction;
 class AbstractMetaType;
 
-using AbstractMetaArgumentList = QVector<AbstractMetaArgument>;
-using AbstractMetaClassList = QVector<AbstractMetaClass *>;
+using AbstractMetaArgumentList = QList<AbstractMetaArgument>;
+using AbstractMetaClassList = QList<AbstractMetaClass *>;
+using AbstractMetaClassCList = QList<const AbstractMetaClass *>;
 using AbstractMetaEnumList = QList<AbstractMetaEnum>;
 using AbstractMetaEnumValueList = QList<AbstractMetaEnumValue>;
 using AbstractMetaFieldList = QList<AbstractMetaField>;
-using AbstractMetaFunctionList = QVector<AbstractMetaFunction *>;
-using AbstractMetaFunctionCList = QVector<const AbstractMetaFunction *>;
-using AbstractMetaTypeList = QVector<AbstractMetaType>;
+using AbstractMetaFunctionList = QList<AbstractMetaFunction *>;
+using AbstractMetaFunctionCList = QList<const AbstractMetaFunction *>;
+using AbstractMetaTypeList = QList<AbstractMetaType>;
 
 #endif // ABSTRACTMETALANG_TYPEDEFS_H
diff --git a/sources/shiboken6/ApiExtractor/abstractmetatype.h b/sources/shiboken6/ApiExtractor/abstractmetatype.h
index bf3eb5958..a65858364 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetatype.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetatype.h
@@ -34,7 +34,7 @@
 
 #include <QtCore/qobjectdefs.h>
 #include <QtCore/QSharedDataPointer>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 
 QT_FORWARD_DECLARE_CLASS(QDebug)
 
@@ -45,7 +45,7 @@ class AbstractMetaType
 {
     Q_GADGET
 public:
-    using Indirections = QVector<Indirection>;
+    using Indirections = QList<Indirection>;
 
     enum TypeUsagePattern {
         PrimitivePattern,
diff --git a/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp
index 512bda9e9..9006e2321 100644
--- a/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp
@@ -39,7 +39,7 @@
 #include <QtCore/QMap>
 #include <QtCore/QString>
 #include <QtCore/QStack>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 
 #include <cstring>
 #include <ctype.h>
diff --git a/sources/shiboken6/ApiExtractor/clangparser/clangparser.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangparser.cpp
index 3646462e8..48c4f498b 100644
--- a/sources/shiboken6/ApiExtractor/clangparser/clangparser.cpp
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangparser.cpp
@@ -282,7 +282,7 @@ bool parse(const QByteArrayList  &clangArgs, unsigned clangFlags, BaseVisitor &b
 
     clang_visitChildren(rootCursor, visitorCallback, reinterpret_cast<CXClientData>(&bv));
 
-    QVector<Diagnostic> diagnostics = getDiagnostics(translationUnit);
+    QList<Diagnostic> diagnostics = getDiagnostics(translationUnit);
     diagnostics.append(bv.diagnostics());
     bv.setDiagnostics(diagnostics);
 
diff --git a/sources/shiboken6/ApiExtractor/clangparser/clangparser.h b/sources/shiboken6/ApiExtractor/clangparser/clangparser.h
index 7e918263a..e5a627bab 100644
--- a/sources/shiboken6/ApiExtractor/clangparser/clangparser.h
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangparser.h
@@ -35,7 +35,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QPair>
 #include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 
 #include <string_view>
 
@@ -59,7 +59,7 @@ private:
 class BaseVisitor {
     Q_DISABLE_COPY(BaseVisitor)
 public:
-    using Diagnostics = QVector<Diagnostic>;
+    using Diagnostics = QList<Diagnostic>;
 
     enum StartTokenResult { Error, Skip, Recurse };
 
diff --git a/sources/shiboken6/ApiExtractor/clangparser/clangutils.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangutils.cpp
index f3d45faa7..5b108b2e7 100644
--- a/sources/shiboken6/ApiExtractor/clangparser/clangutils.cpp
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangutils.cpp
@@ -169,9 +169,9 @@ Diagnostic Diagnostic::fromCXDiagnostic(CXDiagnostic cd)
     return result;
 }
 
-QVector<Diagnostic> getDiagnostics(CXTranslationUnit tu)
+QList<Diagnostic> getDiagnostics(CXTranslationUnit tu)
 {
-    QVector<Diagnostic> result;
+    QList<Diagnostic> result;
     const unsigned count = clang_getNumDiagnostics(tu);
     result.reserve(int(count));
     for (unsigned i = 0; i < count; ++i) {
@@ -219,7 +219,7 @@ QPair<int, int> parseTemplateArgumentList(const QString &l,
     return qMakePair(-1, -1);
 }
 
-CXDiagnosticSeverity maxSeverity(const QVector<Diagnostic> &ds)
+CXDiagnosticSeverity maxSeverity(const QList<Diagnostic> &ds)
 {
     CXDiagnosticSeverity result = CXDiagnostic_Ignored;
     for (const Diagnostic& d : ds) {
diff --git a/sources/shiboken6/ApiExtractor/clangparser/clangutils.h b/sources/shiboken6/ApiExtractor/clangparser/clangutils.h
index fba10206c..d29addd2b 100644
--- a/sources/shiboken6/ApiExtractor/clangparser/clangutils.h
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangutils.h
@@ -34,7 +34,7 @@
 #include <QtCore/QPair>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 
 #include <functional>
 
@@ -104,8 +104,8 @@ struct Diagnostic {
     CXDiagnosticSeverity severity = CXDiagnostic_Warning;
 };
 
-QVector<Diagnostic> getDiagnostics(CXTranslationUnit tu);
-CXDiagnosticSeverity maxSeverity(const QVector<Diagnostic> &ds);
+QList<Diagnostic> getDiagnostics(CXTranslationUnit tu);
+CXDiagnosticSeverity maxSeverity(const QList<Diagnostic> &ds);
 
 // Parse a template argument list "a<b<c,d>,e>" and invoke a handler
 // with each match (level and string). Return begin and end of the list.
diff --git a/sources/shiboken6/ApiExtractor/dependency.h b/sources/shiboken6/ApiExtractor/dependency.h
index 7168ea3bc..ee6301525 100644
--- a/sources/shiboken6/ApiExtractor/dependency.h
+++ b/sources/shiboken6/ApiExtractor/dependency.h
@@ -29,7 +29,7 @@
 #ifndef DEPENDENCY_H
 #define DEPENDENCY_H
 
-#include <QtCore/QVector>
+#include <QtCore/QList>
 
 #include <utility>
 
@@ -42,6 +42,6 @@ struct Dependency {
     AbstractMetaClass *child;
 };
 
-using Dependencies = QVector<Dependency>;
+using Dependencies = QList<Dependency>;
 
 #endif // DEPENDENCY_H
diff --git a/sources/shiboken6/ApiExtractor/fileout.cpp b/sources/shiboken6/ApiExtractor/fileout.cpp
index 16cfe2bb5..b35693a38 100644
--- a/sources/shiboken6/ApiExtractor/fileout.cpp
+++ b/sources/shiboken6/ApiExtractor/fileout.cpp
@@ -64,12 +64,12 @@ FileOut::~FileOut()
         done();
 }
 
-static QVector<int> lcsLength(const QByteArrayList &a, const QByteArrayList &b)
+static QList<int> lcsLength(const QByteArrayList &a, const QByteArrayList &b)
 {
     const int height = a.size() + 1;
     const int width = b.size() + 1;
 
-    QVector<int> res(width * height, 0);
+    QList<int> res(width * height, 0);
 
     for (int row = 1; row < height; row++) {
         for (int col = 1; col < width; col++) {
@@ -129,7 +129,7 @@ void Unit::print(const QByteArrayList &a, const QByteArrayList &b) const
     }
 }
 
-static void unitAppend(Type type, int pos, QVector<Unit> *units)
+static void unitAppend(Type type, int pos, QList<Unit> *units)
 {
     if (!units->isEmpty() && units->last().type == type)
         units->last().end = pos;
@@ -137,12 +137,12 @@ static void unitAppend(Type type, int pos, QVector<Unit> *units)
         units->append(Unit{type, pos, pos});
 }
 
-static QVector<Unit> diffHelper(const QVector<int> &lcs,
+static QList<Unit> diffHelper(const QList<int> &lcs,
                                 const QByteArrayList &a, const QByteArrayList &b,
                                 int row, int col)
 {
     if (row > 0 && col > 0 && a.at(row - 1) == b.at(col - 1)) {
-        QVector<Unit> result = diffHelper(lcs, a, b, row - 1, col - 1);
+        QList<Unit> result = diffHelper(lcs, a, b, row - 1, col - 1);
         unitAppend(Unchanged, row - 1, &result);
         return result;
     }
@@ -150,22 +150,22 @@ static QVector<Unit> diffHelper(const QVector<int> &lcs,
     const int width = b.size() + 1;
     if (col > 0
         && (row == 0 || lcs.at(width * row + col -1 ) >= lcs.at(width * (row - 1) + col))) {
-        QVector<Unit> result = diffHelper(lcs, a, b, row, col - 1);
+        QList<Unit> result = diffHelper(lcs, a, b, row, col - 1);
         unitAppend(Add, col - 1, &result);
         return result;
     }
     if (row > 0
         && (col == 0 || lcs.at(width * row + col-1) < lcs.at(width * (row - 1) + col))) {
-        QVector<Unit> result = diffHelper(lcs, a, b, row - 1, col);
+        QList<Unit> result = diffHelper(lcs, a, b, row - 1, col);
         unitAppend(Delete, row - 1, &result);
         return result;
     }
-    return QVector<Unit>{};
+    return {};
 }
 
 static void diff(const QByteArrayList &a, const QByteArrayList &b)
 {
-    const QVector<Unit> res = diffHelper(lcsLength(a, b), a, b, a.size(), b.size());
+    const QList<Unit> res = diffHelper(lcsLength(a, b), a, b, a.size(), b.size());
     for (const Unit &unit : res)
         unit.print(a, b);
 }
diff --git a/sources/shiboken6/ApiExtractor/graph.cpp b/sources/shiboken6/ApiExtractor/graph.cpp
index ccc9119b8..da7d7a2a1 100644
--- a/sources/shiboken6/ApiExtractor/graph.cpp
+++ b/sources/shiboken6/ApiExtractor/graph.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 #include "graph.h"
-#include <QVector>
+#include <QList>
 #include <QDebug>
 #include <QSet>
 #include <iterator>
@@ -38,7 +38,7 @@
 struct Graph::GraphPrivate
 {
     enum Color { WHITE, GRAY, BLACK };
-    using Edges = QVector<QSet<int> >;
+    using Edges = QList<QSet<int> >;
 
     Edges edges;
 
@@ -46,7 +46,7 @@ struct Graph::GraphPrivate
     {
     }
 
-    void dfsVisit(int node, Graph::Indexes &result, QVector<Color> &colors) const
+    void dfsVisit(int node, Graph::Indexes &result, QList<Color> &colors) const
     {
         colors[node] = GRAY;
         for (const auto &c : edges.at(node)) {
@@ -80,7 +80,7 @@ Graph::SortResult Graph::topologicalSort() const
     SortResult result;
     result.result.reserve(nodeCount);
 
-    QVector<GraphPrivate::Color> colors(nodeCount, GraphPrivate::WHITE);
+    QList<GraphPrivate::Color> colors(nodeCount, GraphPrivate::WHITE);
 
     for (int i = 0; i < nodeCount; ++i) {
         if (colors[i] == GraphPrivate::WHITE)
diff --git a/sources/shiboken6/ApiExtractor/graph.h b/sources/shiboken6/ApiExtractor/graph.h
index ba28986d1..ffba00834 100644
--- a/sources/shiboken6/ApiExtractor/graph.h
+++ b/sources/shiboken6/ApiExtractor/graph.h
@@ -29,7 +29,7 @@
 #ifndef GRAPH_H
 #define GRAPH_H
 
-#include <QVector>
+#include <QList>
 #include <QHash>
 #include <QString>
 
@@ -39,7 +39,7 @@ class Graph
 public:
     Q_DISABLE_COPY(Graph)
 
-    using Indexes = QVector<int>;
+    using Indexes = QList<int>;
 
     struct SortResult
     {
diff --git a/sources/shiboken6/ApiExtractor/header_paths.h b/sources/shiboken6/ApiExtractor/header_paths.h
index c9b5144c8..0c25702ef 100644
--- a/sources/shiboken6/ApiExtractor/header_paths.h
+++ b/sources/shiboken6/ApiExtractor/header_paths.h
@@ -30,7 +30,7 @@
 #define HEADER_PATHS_H
 
 #include <QByteArray>
-#include <QVector>
+#include <QList>
 #include <QString>
 
 enum class HeaderType
@@ -67,6 +67,6 @@ public:
     }
 };
 
-using HeaderPaths = QVector<HeaderPath>;
+using HeaderPaths = QList<HeaderPath>;
 
 #endif // HEADER_PATHS_H
diff --git a/sources/shiboken6/ApiExtractor/include.h b/sources/shiboken6/ApiExtractor/include.h
index 20e9abbbf..aa3a38a8f 100644
--- a/sources/shiboken6/ApiExtractor/include.h
+++ b/sources/shiboken6/ApiExtractor/include.h
@@ -32,7 +32,7 @@
 #include <qtcompat.h>
 
 #include <QString>
-#include <QVector>
+#include <QList>
 
 QT_BEGIN_NAMESPACE
 class QTextStream;
@@ -93,6 +93,6 @@ TextStream& operator<<(TextStream& out, const Include& include);
 QDebug operator<<(QDebug d, const Include &i);
 #endif
 
-using IncludeList = QVector<Include>;
+using IncludeList = QList<Include>;
 
 #endif
diff --git a/sources/shiboken6/ApiExtractor/messages.cpp b/sources/shiboken6/ApiExtractor/messages.cpp
index d0fec85b6..e3ea87f76 100644
--- a/sources/shiboken6/ApiExtractor/messages.cpp
+++ b/sources/shiboken6/ApiExtractor/messages.cpp
@@ -612,7 +612,7 @@ QString msgInvalidVersion(const QString &package, const QString &version)
 }
 
 QString msgCyclicDependency(const QString &funcName, const QString &graphName,
-                            const QVector<const AbstractMetaFunction *> &involvedConversions)
+                            const QList<const AbstractMetaFunction *> &involvedConversions)
 {
     QString result;
     QTextStream str(&result);
diff --git a/sources/shiboken6/ApiExtractor/messages.h b/sources/shiboken6/ApiExtractor/messages.h
index a17c22f2d..d26200abf 100644
--- a/sources/shiboken6/ApiExtractor/messages.h
+++ b/sources/shiboken6/ApiExtractor/messages.h
@@ -35,7 +35,7 @@
 
 #include <QtCore/QMap>
 #include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 
 class EnumTypeEntry;
 class FunctionTypeEntry;
@@ -204,7 +204,7 @@ QString msgIncorrectlyNestedName(const QString &name);
 QString msgCannotFindView(const QString &viewedName, const QString &name);
 
 QString msgCyclicDependency(const QString &funcName, const QString &graphName,
-                            const QVector<const AbstractMetaFunction *> &involvedConversions);
+                            const QList<const AbstractMetaFunction *> &involvedConversions);
 
 QString msgClassNotFound(const TypeEntry *t);
 
diff --git a/sources/shiboken6/ApiExtractor/parser/codemodel.cpp b/sources/shiboken6/ApiExtractor/parser/codemodel.cpp
index 8e1cb9710..5d1835c47 100644
--- a/sources/shiboken6/ApiExtractor/parser/codemodel.cpp
+++ b/sources/shiboken6/ApiExtractor/parser/codemodel.cpp
@@ -51,7 +51,7 @@ private:
 };
 
 template <class T>
-static QSharedPointer<T> findModelItem(const QVector<QSharedPointer<T> > &list, const QString &name)
+static QSharedPointer<T> findModelItem(const QList<QSharedPointer<T> > &list, const QString &name)
 {
     const auto it = std::find_if(list.cbegin(), list.cend(), ModelItemNamePredicate<T>(name));
     return it != list.cend() ? *it : QSharedPointer<T>();
diff --git a/sources/shiboken6/ApiExtractor/parser/codemodel.h b/sources/shiboken6/ApiExtractor/parser/codemodel.h
index e3ff4cf70..2f8dbaef1 100644
--- a/sources/shiboken6/ApiExtractor/parser/codemodel.h
+++ b/sources/shiboken6/ApiExtractor/parser/codemodel.h
@@ -41,7 +41,7 @@
 #include <QtCore/QSet>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 
 QT_FORWARD_DECLARE_CLASS(QDebug)
 
@@ -258,7 +258,7 @@ public:
         : _ScopeModelItem(model, name, kind), m_classType(CodeModel::Class) {}
     ~_ClassModelItem();
 
-    QVector<BaseClass> baseClasses() const { return m_baseClasses; }
+    QList<BaseClass> baseClasses() const { return m_baseClasses; }
 
     void addBaseClass(const QString &name, CodeModel::AccessPolicy accessPolicy);
 
@@ -284,7 +284,7 @@ public:
 #endif
 
 private:
-    QVector<BaseClass> m_baseClasses;
+    QList<BaseClass> m_baseClasses;
     TemplateParameterList m_templateParameters;
     CodeModel::ClassType m_classType;
 
diff --git a/sources/shiboken6/ApiExtractor/parser/codemodel_fwd.h b/sources/shiboken6/ApiExtractor/parser/codemodel_fwd.h
index 87fea5cde..b138f2a2f 100644
--- a/sources/shiboken6/ApiExtractor/parser/codemodel_fwd.h
+++ b/sources/shiboken6/ApiExtractor/parser/codemodel_fwd.h
@@ -31,7 +31,7 @@
 #ifndef CODEMODEL_FWD_H
 #define CODEMODEL_FWD_H
 
-#include <QtCore/QVector>
+#include <QtCore/QList>
 #include <QtCore/QSharedPointer>
 
 // forward declarations
@@ -67,19 +67,19 @@ using TemplateTypeAliasModelItem = QSharedPointer<_TemplateTypeAliasModelItem>;
 using VariableModelItem = QSharedPointer<_VariableModelItem>;
 using MemberModelItem = QSharedPointer<_MemberModelItem>;
 
-using ArgumentList = QVector<ArgumentModelItem>;
-using ClassList = QVector<ClassModelItem>;
-using ItemList = QVector<CodeModelItem>;
-using EnumList = QVector<EnumModelItem>;
-using EnumeratorList = QVector<EnumeratorModelItem>;
-using FileList = QVector<FileModelItem>;
-using FunctionList = QVector<FunctionModelItem>;
-using NamespaceList = QVector<NamespaceModelItem>;
-using ScopeList = QVector<ScopeModelItem>;
-using TemplateParameterList = QVector<TemplateParameterModelItem>;
-using TypeDefList = QVector<TypeDefModelItem>;
-using TemplateTypeAliasList = QVector<TemplateTypeAliasModelItem>;
-using VariableList = QVector<VariableModelItem>;
-using MemberList = QVector<MemberModelItem>;
+using ArgumentList = QList<ArgumentModelItem>;
+using ClassList = QList<ClassModelItem>;
+using ItemList = QList<CodeModelItem>;
+using EnumList = QList<EnumModelItem>;
+using EnumeratorList = QList<EnumeratorModelItem>;
+using FileList = QList<FileModelItem>;
+using FunctionList = QList<FunctionModelItem>;
+using NamespaceList = QList<NamespaceModelItem>;
+using ScopeList = QList<ScopeModelItem>;
+using TemplateParameterList = QList<TemplateParameterModelItem>;
+using TypeDefList = QList<TypeDefModelItem>;
+using TemplateTypeAliasList = QList<TemplateTypeAliasModelItem>;
+using VariableList = QList<VariableModelItem>;
+using MemberList = QList<MemberModelItem>;
 
 #endif // CODEMODEL_FWD_H
diff --git a/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp b/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp
index 565f157e1..90a6cd312 100644
--- a/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp
@@ -50,7 +50,7 @@ void TestExtraInclude::testClassExtraInclude()
     const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A"));
     QVERIFY(classA);
 
-    QVector<Include> includes = classA->typeEntry()->extraIncludes();
+    QList<Include> includes = classA->typeEntry()->extraIncludes();
     QCOMPARE(includes.count(), 1);
     QCOMPARE(includes.constFirst().name(), QLatin1String("header.h"));
 }
@@ -77,7 +77,7 @@ void TestExtraInclude::testGlobalExtraIncludes()
     QVERIFY(module);
     QCOMPARE(module->name(), QLatin1String("Foo"));
 
-    QVector<Include> includes = module->extraIncludes();
+    QList<Include> includes = module->extraIncludes();
     QCOMPARE(includes.count(), 2);
     QCOMPARE(includes.constFirst().name(), QLatin1String("header1.h"));
     QCOMPARE(includes.constLast().name(), QLatin1String("header2.h"));
diff --git a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp
index e3b536abf..6928448b7 100644
--- a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp
+++ b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp
@@ -305,7 +305,7 @@ void TestModifyFunction::testGlobalFunctionModification()
 
     FunctionModificationList mods = TypeDatabase::instance()->functionModifications(QLatin1String("function(A*)"));
     QCOMPARE(mods.count(), 1);
-    const QVector<ArgumentModification> &argMods = mods.constFirst().argument_mods();
+    const QList<ArgumentModification> &argMods = mods.constFirst().argument_mods();
     QCOMPARE(argMods.count(), 1);
     ArgumentModification argMod = argMods.constFirst();
     QCOMPARE(argMod.replacedDefaultExpression, QLatin1String("A()"));
diff --git a/sources/shiboken6/ApiExtractor/typedatabase.cpp b/sources/shiboken6/ApiExtractor/typedatabase.cpp
index 1560c4183..eb213f2d1 100644
--- a/sources/shiboken6/ApiExtractor/typedatabase.cpp
+++ b/sources/shiboken6/ApiExtractor/typedatabase.cpp
@@ -34,7 +34,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QPair>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 #include <QtCore/QRegularExpression>
 #include <QtCore/QVersionNumber>
 #include <QtCore/QXmlStreamReader>
@@ -52,7 +52,7 @@ static QString wildcardToRegExp(QString w)
 }
 
 using ApiVersion =QPair<QRegularExpression, QVersionNumber>;
-using ApiVersions = QVector<ApiVersion>;
+using ApiVersions = QList<ApiVersion>;
 
 Q_GLOBAL_STATIC(ApiVersions, apiVersions)
 
@@ -82,7 +82,7 @@ struct IntTypeNormalizationEntry
     QString replacement;
 };
 
-using IntTypeNormalizationEntries = QVector<IntTypeNormalizationEntry>;
+using IntTypeNormalizationEntries = QList<IntTypeNormalizationEntry>;
 
 static const IntTypeNormalizationEntries &intTypeNormalizationEntries()
 {
@@ -154,7 +154,7 @@ void TypeDatabase::addSystemInclude(const QString &name)
 // Note: This inserts duplicate TypeEntry * into m_entries.
 void TypeDatabase::addInlineNamespaceLookups(const NamespaceTypeEntry *n)
 {
-    QVector<TypeEntry *> additionalEntries; // Store before modifying the hash
+    TypeEntryList additionalEntries; // Store before modifying the hash
     for (TypeEntry *entry : m_entries) {
         if (entry->isChildOf(n))
             additionalEntries.append(entry);
@@ -357,7 +357,7 @@ bool TypeDatabase::isClassRejected(const QString& className, QString *reason) co
 }
 
 // Match class name and function/enum/field
-static bool findRejection(const QVector<TypeRejection> &rejections,
+static bool findRejection(const QList<TypeRejection> &rejections,
                           TypeRejection::MatchType matchType,
                           const QString& className, const QString& name,
                           QString *reason = nullptr)
@@ -533,7 +533,7 @@ bool TypeDatabase::addSuppressedWarning(const QString &warning, QString *errorMe
         pattern = warning;
     } else {
         // Legacy syntax: Use wildcards '*' (unless escaped by '\')
-        QVector<int> asteriskPositions;
+        QList<int> asteriskPositions;
         const int warningSize = warning.size();
         for (int i = 0; i < warningSize; ++i) {
             if (warning.at(i) == QLatin1Char('\\'))
diff --git a/sources/shiboken6/ApiExtractor/typedatabase.h b/sources/shiboken6/ApiExtractor/typedatabase.h
index 7dc2f4389..cdf861348 100644
--- a/sources/shiboken6/ApiExtractor/typedatabase.h
+++ b/sources/shiboken6/ApiExtractor/typedatabase.h
@@ -221,8 +221,8 @@ private:
     TypeEntryMap m_flagsEntries;
     TypedefEntryMap m_typedefEntries;
     TemplateEntryMap m_templates;
-    QVector<QRegularExpression> m_suppressedWarnings;
-    QVector<const TypeSystemTypeEntry *> m_typeSystemEntries; // maintain order, default is first.
+    QList<QRegularExpression> m_suppressedWarnings;
+    QList<const TypeSystemTypeEntry *> m_typeSystemEntries; // maintain order, default is first.
 
     AddedFunctionList m_globalUserFunctions;
     FunctionModificationList m_functionMods;
@@ -232,7 +232,7 @@ private:
     QStringList m_typesystemPaths;
     QHash<QString, bool> m_parsedTypesystemFiles;
 
-    QVector<TypeRejection> m_rejections;
+    QList<TypeRejection> m_rejections;
 
     QStringList m_dropTypeEntries;
     QByteArrayList m_systemIncludes;
diff --git a/sources/shiboken6/ApiExtractor/typedatabase_typedefs.h b/sources/shiboken6/ApiExtractor/typedatabase_typedefs.h
index f9e6c669e..03ad90463 100644
--- a/sources/shiboken6/ApiExtractor/typedatabase_typedefs.h
+++ b/sources/shiboken6/ApiExtractor/typedatabase_typedefs.h
@@ -31,7 +31,7 @@
 
 #include <QtCore/QMultiMap>
 #include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 
 class ConstantValueTypeEntry;
 class ContainerTypeEntry;
@@ -41,7 +41,7 @@ class TemplateEntry;
 class TypeEntry;
 class TypedefEntry;
 
-using TypeEntryList = QVector<TypeEntry *>;
+using TypeEntryList = QList<TypeEntry *>;
 using TemplateEntryMap =QMap<QString, TemplateEntry *>;
 
 template <class Key, class Value>
@@ -62,8 +62,8 @@ using TypeEntryMultiMapConstIteratorRange = QMultiMapConstIteratorRange<QString,
 using TypeEntryMap = QMap<QString, TypeEntry *>;
 using TypedefEntryMap = QMap<QString, TypedefEntry *>;
 
-using ContainerTypeEntryList = QVector<const ContainerTypeEntry *>;
-using NamespaceTypeEntryList = QVector<NamespaceTypeEntry *>;
-using PrimitiveTypeEntryList = QVector<const PrimitiveTypeEntry *>;
+using ContainerTypeEntryList = QList<const ContainerTypeEntry *>;
+using NamespaceTypeEntryList = QList<NamespaceTypeEntry *>;
+using PrimitiveTypeEntryList = QList<const PrimitiveTypeEntry *>;
 
 #endif // TYPEDATABASE_TYPEDEFS_H
diff --git a/sources/shiboken6/ApiExtractor/typesystem.h b/sources/shiboken6/ApiExtractor/typesystem.h
index fc5b2dc87..2f9b2c6f7 100644
--- a/sources/shiboken6/ApiExtractor/typesystem.h
+++ b/sources/shiboken6/ApiExtractor/typesystem.h
@@ -650,7 +650,7 @@ protected:
 class SmartPointerTypeEntry : public ComplexTypeEntry
 {
 public:
-    using Instantiations = QVector<const TypeEntry *>;
+    using Instantiations = QList<const TypeEntry *>;
 
     explicit SmartPointerTypeEntry(const QString &entryName,
                                    const QString &getterName,
@@ -798,7 +798,7 @@ public:
     bool replaceOriginalTargetToNativeConversions() const;
     void setReplaceOriginalTargetToNativeConversions(bool replaceOriginalTargetToNativeConversions);
 
-    using TargetToNativeConversions = QVector<TargetToNativeConversion *>;
+    using TargetToNativeConversions = QList<TargetToNativeConversion *>;
     bool hasTargetToNativeConversions() const;
     TargetToNativeConversions& targetToNativeConversions();
     const TargetToNativeConversions& targetToNativeConversions() const;
diff --git a/sources/shiboken6/ApiExtractor/typesystem_typedefs.h b/sources/shiboken6/ApiExtractor/typesystem_typedefs.h
index 81b556039..051d0bed9 100644
--- a/sources/shiboken6/ApiExtractor/typesystem_typedefs.h
+++ b/sources/shiboken6/ApiExtractor/typesystem_typedefs.h
@@ -32,7 +32,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QList>
 #include <QtCore/QSharedPointer>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 
 class CodeSnip;
 class DocModification;
@@ -43,11 +43,11 @@ class FunctionModification;
 class TypeEntry;
 
 using AddedFunctionPtr = QSharedPointer<AddedFunction>;
-using AddedFunctionList = QVector<AddedFunctionPtr>;
-using CodeSnipList = QVector<CodeSnip>;
-using DocModificationList = QVector<DocModification>;
-using FieldModificationList = QVector<FieldModification>;
-using FunctionModificationList = QVector<FunctionModification>;
-using TypeEntries = QVector<const TypeEntry *>;
+using AddedFunctionList = QList<AddedFunctionPtr>;
+using CodeSnipList = QList<CodeSnip>;
+using DocModificationList = QList<DocModification>;
+using FieldModificationList = QList<FieldModification>;
+using FunctionModificationList = QList<FunctionModification>;
+using TypeEntries = QList<const TypeEntry *>;
 
 #endif // TYPESYSTEM_TYPEDEFS_H
diff --git a/sources/shiboken6/ApiExtractor/typesystemparser.cpp b/sources/shiboken6/ApiExtractor/typesystemparser.cpp
index 679541d53..209d88290 100644
--- a/sources/shiboken6/ApiExtractor/typesystemparser.cpp
+++ b/sources/shiboken6/ApiExtractor/typesystemparser.cpp
@@ -111,7 +111,7 @@ static inline QString yesAttributeValue() { return QStringLiteral("yes"); }
 static inline QString trueAttributeValue() { return QStringLiteral("true"); }
 static inline QString falseAttributeValue() { return QStringLiteral("false"); }
 
-static QVector<CustomConversion *> customConversionsForReview;
+static QList<CustomConversion *> customConversionsForReview;
 
 // Set a regular expression for rejection from text. By legacy, those are fixed
 // strings, except for '*' meaning 'match all'. Enclosing in "^..$"
diff --git a/sources/shiboken6/generator/generator.cpp b/sources/shiboken6/generator/generator.cpp
index 9e6c6c7ac..0c986661b 100644
--- a/sources/shiboken6/generator/generator.cpp
+++ b/sources/shiboken6/generator/generator.cpp
@@ -174,8 +174,8 @@ struct Generator::GeneratorPrivate
     QString licenseComment;
     QString moduleName;
     QStringList instantiatedContainersNames;
-    QVector<AbstractMetaType> instantiatedContainers;
-    QVector<AbstractMetaType> instantiatedSmartPointers;
+    AbstractMetaTypeList instantiatedContainers;
+    AbstractMetaTypeList instantiatedSmartPointers;
     AbstractMetaClassList m_invisibleTopNamespaces;
 };
 
@@ -332,12 +332,12 @@ void Generator::collectInstantiatedContainersAndSmartPointers()
         collectInstantiatedContainersAndSmartPointers(metaClass);
 }
 
-QVector<AbstractMetaType> Generator::instantiatedContainers() const
+AbstractMetaTypeList Generator::instantiatedContainers() const
 {
     return m_d->instantiatedContainers;
 }
 
-QVector<AbstractMetaType> Generator::instantiatedSmartPointers() const
+AbstractMetaTypeList Generator::instantiatedSmartPointers() const
 {
     return m_d->instantiatedSmartPointers;
 }
diff --git a/sources/shiboken6/generator/generator.h b/sources/shiboken6/generator/generator.h
index 7a14eabab..28120b5b4 100644
--- a/sources/shiboken6/generator/generator.h
+++ b/sources/shiboken6/generator/generator.h
@@ -35,7 +35,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QTextStream>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 
 #include <optional>
 
@@ -185,7 +185,7 @@ class Generator
 {
 public:
     using OptionDescription = QPair<QString, QString>;
-    using OptionDescriptions = QVector<OptionDescription>;
+    using OptionDescriptions = QList<OptionDescription>;
 
     /// Optiosn used around the generator code
     enum Option {
@@ -386,8 +386,8 @@ protected:
     */
     virtual QString subDirectoryForPackage(QString packageName = QString()) const;
 
-    QVector<AbstractMetaType> instantiatedContainers() const;
-    QVector<AbstractMetaType> instantiatedSmartPointers() const;
+    AbstractMetaTypeList instantiatedContainers() const;
+    AbstractMetaTypeList instantiatedSmartPointers() const;
 
     static QString getSimplifiedContainerTypeName(const AbstractMetaType &type);
     void addInstantiatedContainersAndSmartPointers(const AbstractMetaType &type,
@@ -405,7 +405,7 @@ private:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(Generator::Options)
 using GeneratorPtr = QSharedPointer<Generator>;
-using Generators = QVector<GeneratorPtr>;
+using Generators = QList<GeneratorPtr>;
 
 #endif // GENERATOR_H
 
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
index f4c638de8..edf6bb4a4 100644
--- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp
@@ -216,8 +216,9 @@ QString CppGenerator::fileNameForContext(const GeneratorContext &context) const
     return fileNameBase + fileNameSuffix();
 }
 
-QVector<AbstractMetaFunctionList> CppGenerator::filterGroupedOperatorFunctions(const AbstractMetaClass *metaClass,
-                                                                               uint queryIn)
+QList<AbstractMetaFunctionList>
+    CppGenerator::filterGroupedOperatorFunctions(const AbstractMetaClass *metaClass,
+                                                 uint queryIn)
 {
     // ( func_name, num_args ) => func_list
     QMap<QPair<QString, int>, AbstractMetaFunctionList> results;
@@ -240,7 +241,7 @@ QVector<AbstractMetaFunctionList> CppGenerator::filterGroupedOperatorFunctions(c
         QPair<QString, int > op(func->name(), args);
         results[op].append(func);
     }
-    QVector<AbstractMetaFunctionList> result;
+    QList<AbstractMetaFunctionList> result;
     result.reserve(results.size());
     for (auto it = results.cbegin(), end = results.cend(); it != end; ++it)
         result.append(it.value());
@@ -410,7 +411,7 @@ void CppGenerator::generateClass(TextStream &s, const GeneratorContext &classCon
     metaClass->getEnumsFromInvisibleNamespacesToBeGenerated(&classEnums);
 
     //Extra includes
-    QVector<Include> includes;
+    QList<Include> includes;
     if (!classContext.useWrapper())
         includes += metaClass->typeEntry()->extraIncludes();
     for (const AbstractMetaEnum &cppEnum : qAsConst(classEnums))
@@ -667,7 +668,7 @@ void CppGenerator::generateClass(TextStream &s, const GeneratorContext &classCon
     }
 
     if (supportsNumberProtocol(metaClass) && !metaClass->typeEntry()->isSmartPointer()) {
-        const QVector<AbstractMetaFunctionList> opOverloads = filterGroupedOperatorFunctions(
+        const QList<AbstractMetaFunctionList> opOverloads = filterGroupedOperatorFunctions(
                 metaClass,
                 AbstractMetaClass::ArithmeticOp
                 | AbstractMetaClass::LogicalOp
@@ -2155,7 +2156,7 @@ void CppGenerator::writeArgumentsInitializer(TextStream &s, OverloadData &overlo
             s << '}';
         }
     }
-    const QVector<int> invalidArgsLength = overloadData.invalidArgumentLengths();
+    const QList<int> invalidArgsLength = overloadData.invalidArgumentLengths();
     if (!invalidArgsLength.isEmpty()) {
         QStringList invArgsLen;
         for (int i : qAsConst(invalidArgsLength))
@@ -2409,7 +2410,7 @@ void CppGenerator::writeTypeCheck(TextStream &s, const OverloadData *overloadDat
     QSet<const TypeEntry *> numericTypes;
     const OverloadDataList &overloads = overloadData->previousOverloadData()->nextOverloadData();
     for (OverloadData *od : overloads) {
-        const OverloadData::MetaFunctionList &odOverloads = od->overloads();
+        const AbstractMetaFunctionCList &odOverloads = od->overloads();
         for (const AbstractMetaFunction *func : odOverloads) {
             checkTypeViability(func);
             const AbstractMetaType &argType = od->argument(func)->type();
@@ -2655,7 +2656,7 @@ void CppGenerator::writeOverloadedFunctionDecisor(TextStream &s, const OverloadD
 {
     s << "// Overloaded function decisor\n";
     const AbstractMetaFunction *rfunc = overloadData.referenceFunction();
-    const OverloadData::MetaFunctionList &functionOverloads = overloadData.overloadsWithoutRepetition();
+    const AbstractMetaFunctionCList &functionOverloads = overloadData.overloadsWithoutRepetition();
     for (int i = 0; i < functionOverloads.count(); i++) {
         const auto func = functionOverloads.at(i);
         s << "// " << i << ": ";
@@ -2697,7 +2698,7 @@ void CppGenerator::writeOverloadedFunctionDecisorEngine(TextStream &s,
     // variable to be used further on this method on the conditional that identifies default
     // method calls.
     if (!hasDefaultCall) {
-        const OverloadData::MetaFunctionList &overloads = parentOverloadData->overloads();
+        const AbstractMetaFunctionCList &overloads = parentOverloadData->overloads();
         for (const AbstractMetaFunction *func : overloads) {
             if (parentOverloadData->isFinalOccurrence(func)) {
                 referenceFunction = func;
@@ -2853,7 +2854,7 @@ void CppGenerator::writeOverloadedFunctionDecisorEngine(TextStream &s,
 void CppGenerator::writeFunctionCalls(TextStream &s, const OverloadData &overloadData,
                                       const GeneratorContext &context) const
 {
-    const OverloadData::MetaFunctionList &overloads = overloadData.overloadsWithoutRepetition();
+    const AbstractMetaFunctionCList &overloads = overloadData.overloadsWithoutRepetition();
     s << "// Call function/method\n"
         << (overloads.count() > 1 ? "switch (overloadId) " : "") << "{\n";
     {
@@ -3707,9 +3708,9 @@ void CppGenerator::writeMethodCall(TextStream &s, const AbstractMetaFunction *fu
     bool hasReturnPolicy = false;
 
     // Ownership transference between C++ and Python.
-    QVector<ArgumentModification> ownership_mods;
+    QList<ArgumentModification> ownership_mods;
     // Python object reference management.
-    QVector<ArgumentModification> refcount_mods;
+    QList<ArgumentModification> refcount_mods;
     for (const auto &func_mod : func->modifications()) {
         for (const ArgumentModification &arg_mod : func_mod.argument_mods()) {
             if (!arg_mod.ownerships.isEmpty() && arg_mod.ownerships.contains(TypeSystem::TargetLangCode))
@@ -4052,7 +4053,7 @@ void CppGenerator::writeSmartPointerConverterInitialization(TextStream &s, const
 }
 
 void CppGenerator::writeExtendedConverterInitialization(TextStream &s, const TypeEntry *externalType,
-                                                        const QVector<const AbstractMetaClass *>& conversions) const
+                                                        const AbstractMetaClassCList &conversions) const
 {
     s << "// Extended implicit conversions for " << externalType->qualifiedTargetLangName()
       << ".\n";
@@ -4450,7 +4451,7 @@ void CppGenerator::writeTypeAsNumberDefinition(TextStream &s, const AbstractMeta
     nb.insert(QLatin1String("__ixor__"), QString());
     nb.insert(QLatin1String("__ior__"), QString());
 
-    const QVector<AbstractMetaFunctionList> opOverloads =
+    const QList<AbstractMetaFunctionList> opOverloads =
             filterGroupedOperatorFunctions(metaClass,
                                            AbstractMetaClass::ArithmeticOp
                                            | AbstractMetaClass::LogicalOp
@@ -4747,7 +4748,7 @@ void CppGenerator::writeRichCompareFunction(TextStream &s,
     s << "switch (op) {\n";
     {
         Indentation indent(s);
-        const QVector<AbstractMetaFunctionList> &groupedFuncs = filterGroupedOperatorFunctions(metaClass, AbstractMetaClass::ComparisonOp);
+        const QList<AbstractMetaFunctionList> &groupedFuncs = filterGroupedOperatorFunctions(metaClass, AbstractMetaClass::ComparisonOp);
         for (const AbstractMetaFunctionList &overloads : groupedFuncs) {
             const AbstractMetaFunction *rfunc = overloads[0];
 
@@ -5950,7 +5951,7 @@ bool CppGenerator::finishGeneration()
 
     //Extra includes
     s  << '\n' << "// Extra includes\n";
-    QVector<Include> extraIncludes = moduleEntry->extraIncludes();
+    QList<Include> extraIncludes = moduleEntry->extraIncludes();
     for (const AbstractMetaEnum &cppEnum : qAsConst(globalEnums))
         extraIncludes.append(cppEnum.typeEntry()->extraIncludes());
     std::sort(extraIncludes.begin(), extraIncludes.end());
@@ -6041,7 +6042,7 @@ bool CppGenerator::finishGeneration()
         }
     }
 
-    const QVector<const CustomConversion *> &typeConversions = getPrimitiveCustomConversions();
+    const QList<const CustomConversion *> &typeConversions = getPrimitiveCustomConversions();
     if (!typeConversions.isEmpty()) {
         s  << "\n// Primitive Type converters.\n\n";
         for (const CustomConversion *conversion : typeConversions) {
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.h b/sources/shiboken6/generator/shiboken/cppgenerator.h
index 43bdd2623..32e44ce59 100644
--- a/sources/shiboken6/generator/shiboken/cppgenerator.h
+++ b/sources/shiboken6/generator/shiboken/cppgenerator.h
@@ -44,7 +44,7 @@ public:
 protected:
     QString fileNameSuffix() const override;
     QString fileNameForContext(const GeneratorContext &context) const override;
-    static QVector<AbstractMetaFunctionList>
+    static QList<AbstractMetaFunctionList>
         filterGroupedOperatorFunctions(const AbstractMetaClass *metaClass, uint query);
     void generateClass(TextStream &s, const GeneratorContext &classContext) override;
     bool finishGeneration() override;
@@ -354,7 +354,7 @@ private:
     void writeContainerConverterInitialization(TextStream &s, const AbstractMetaType &type) const;
     void writeSmartPointerConverterInitialization(TextStream &s, const AbstractMetaType &ype) const;
     void writeExtendedConverterInitialization(TextStream &s, const TypeEntry *externalType,
-                                              const QVector<const AbstractMetaClass *>& conversions) const;
+                                              const AbstractMetaClassCList &conversions) const;
 
     void writeParentChildManagement(TextStream &s, const AbstractMetaFunction *func, bool userHeuristicForReturn) const;
     bool writeParentChildManagement(TextStream &s, const AbstractMetaFunction *func, int argIndex, bool userHeuristicPolicy) const;
diff --git a/sources/shiboken6/generator/shiboken/headergenerator.cpp b/sources/shiboken6/generator/shiboken/headergenerator.cpp
index aa5c885d9..05c76b4d8 100644
--- a/sources/shiboken6/generator/shiboken/headergenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/headergenerator.cpp
@@ -354,7 +354,7 @@ void HeaderGenerator::writeTypeIndexValueLines(TextStream &s, const AbstractMeta
 // Format the typedefs for the typedef entries to be generated
 static void formatTypeDefEntries(TextStream &s)
 {
-    QVector<const TypedefEntry *> entries;
+    QList<const TypedefEntry *> entries;
     const auto typeDbEntries = TypeDatabase::instance()->typedefEntries();
     for (auto it = typeDbEntries.cbegin(), end = typeDbEntries.cend(); it != end; ++it) {
         if (it.value()->generateCode() != 0)
@@ -408,7 +408,7 @@ bool HeaderGenerator::finishGeneration()
     // Write the smart pointer define indexes.
     int smartPointerCountIndex = getMaxTypeIndex();
     int smartPointerCount = 0;
-    const QVector<AbstractMetaType> &instantiatedSmartPtrs = instantiatedSmartPointers();
+    const AbstractMetaTypeList &instantiatedSmartPtrs = instantiatedSmartPointers();
     for (const AbstractMetaType &metaType : instantiatedSmartPtrs) {
         QString indexName = getTypeIndexVariableName(metaType);
         _writeTypeIndexValue(macrosStream, indexName, smartPointerCountIndex);
@@ -453,7 +453,7 @@ bool HeaderGenerator::finishGeneration()
         _writeTypeIndexValueLine(macrosStream, getTypeIndexVariableName(ptype), pCount++);
     }
 
-    const QVector<AbstractMetaType> &containers = instantiatedContainers();
+    const AbstractMetaTypeList &containers = instantiatedContainers();
     for (const AbstractMetaType &container : containers) {
         _writeTypeIndexValue(macrosStream, getTypeIndexVariableName(container), pCount);
         macrosStream << ", // " << container.cppSignature() << '\n';
diff --git a/sources/shiboken6/generator/shiboken/overloaddata.cpp b/sources/shiboken6/generator/shiboken/overloaddata.cpp
index 358507f76..6113cdda1 100644
--- a/sources/shiboken6/generator/shiboken/overloaddata.cpp
+++ b/sources/shiboken6/generator/shiboken/overloaddata.cpp
@@ -157,7 +157,7 @@ static QString getImplicitConversionTypeName(const AbstractMetaType &containerTy
 // overloaddata.cpp
 static QString msgCyclicDependency(const QString &funcName, const QString &graphName,
                                    const AbstractMetaFunctionCList &cyclic,
-                                   const OverloadData::MetaFunctionList &involvedConversions)
+                                   const AbstractMetaFunctionCList &involvedConversions)
 {
     QString result;
     QTextStream str(&result);
@@ -301,7 +301,7 @@ void OverloadData::sortNextOverloads()
 
     QStringList classesWithIntegerImplicitConversion;
 
-    MetaFunctionList involvedConversions;
+    AbstractMetaFunctionCList involvedConversions;
 
     for (OverloadData *ov : qAsConst(m_nextOverloadData)) {
         const AbstractMetaType &targetType = ov->argType();
@@ -739,9 +739,9 @@ bool OverloadData::isFinalOccurrence(const AbstractMetaFunction *func) const
     return true;
 }
 
-OverloadData::MetaFunctionList OverloadData::overloadsWithoutRepetition() const
+AbstractMetaFunctionCList OverloadData::overloadsWithoutRepetition() const
 {
-    MetaFunctionList overloads = m_overloads;
+    AbstractMetaFunctionCList overloads = m_overloads;
     for (const AbstractMetaFunction *func : m_overloads) {
         if (func->minimalSignature().endsWith(QLatin1String("const")))
             continue;
@@ -769,7 +769,7 @@ const AbstractMetaFunction *OverloadData::getFunctionWithDefaultValue() const
     return nullptr;
 }
 
-QVector<int> OverloadData::invalidArgumentLengths() const
+QList<int> OverloadData::invalidArgumentLengths() const
 {
     QSet<int> validArgLengths;
 
@@ -787,7 +787,7 @@ QVector<int> OverloadData::invalidArgumentLengths() const
         validArgLengths << args.size() - offset;
     }
 
-    QVector<int> invalidArgLengths;
+    QList<int> invalidArgLengths;
     for (int i = minArgs() + 1; i < maxArgs(); i++) {
         if (!validArgLengths.contains(i))
             invalidArgLengths.append(i);
diff --git a/sources/shiboken6/generator/shiboken/overloaddata.h b/sources/shiboken6/generator/shiboken/overloaddata.h
index 2507c3213..86f76843f 100644
--- a/sources/shiboken6/generator/shiboken/overloaddata.h
+++ b/sources/shiboken6/generator/shiboken/overloaddata.h
@@ -31,20 +31,18 @@
 
 #include <abstractmetalang_typedefs.h>
 #include <QtCore/QBitArray>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 
 QT_FORWARD_DECLARE_CLASS(QDebug)
 
 class ShibokenGenerator;
 
 class OverloadData;
-using OverloadDataList = QVector<OverloadData *>;
+using OverloadDataList = QList<OverloadData *>;
 
 class OverloadData
 {
 public:
-    using MetaFunctionList = QVector<const AbstractMetaFunction *>;
-
     OverloadData(const AbstractMetaFunctionList &overloads, const ShibokenGenerator *generator);
     ~OverloadData();
 
@@ -102,12 +100,12 @@ public:
     bool isFinalOccurrence(const AbstractMetaFunction *func) const;
 
     /// Returns the list of overloads removing repeated constant functions (ex.: "foo()" and "foo()const", the second is removed).
-    MetaFunctionList overloadsWithoutRepetition() const;
-    const MetaFunctionList &overloads() const { return m_overloads; }
+    AbstractMetaFunctionCList overloadsWithoutRepetition() const;
+    const AbstractMetaFunctionCList &overloads() const { return m_overloads; }
     OverloadDataList nextOverloadData() const { return m_nextOverloadData; }
     OverloadData *previousOverloadData() const { return m_previousOverloadData; }
 
-    QVector<int> invalidArgumentLengths() const;
+    QList<int> invalidArgumentLengths() const;
 
     static int numberOfRemovedArguments(const AbstractMetaFunction *func, int finalArgPos = -1);
     static QPair<int, int> getMinMaxArguments(const AbstractMetaFunctionList &overloads);
@@ -149,7 +147,7 @@ private:
     int m_argPos;
     AbstractMetaType m_argType;
     QString m_argTypeReplaced;
-    MetaFunctionList m_overloads;
+    AbstractMetaFunctionCList m_overloads;
 
     OverloadData *m_headOverloadData;
     OverloadDataList m_nextOverloadData;
diff --git a/sources/shiboken6/generator/shiboken/shibokengenerator.cpp b/sources/shiboken6/generator/shiboken/shibokengenerator.cpp
index 199875e7e..3e8153175 100644
--- a/sources/shiboken6/generator/shiboken/shibokengenerator.cpp
+++ b/sources/shiboken6/generator/shiboken/shibokengenerator.cpp
@@ -1519,9 +1519,9 @@ ShibokenGenerator::ExtendedConverterData ShibokenGenerator::getExtendedConverter
     return extConvs;
 }
 
-QVector<const CustomConversion *> ShibokenGenerator::getPrimitiveCustomConversions() const
+QList<const CustomConversion *> ShibokenGenerator::getPrimitiveCustomConversions() const
 {
-    QVector<const CustomConversion *> conversions;
+    QList<const CustomConversion *> conversions;
     const PrimitiveTypeEntryList &primitiveTypeList = primitiveTypes();
     for (const PrimitiveTypeEntry *type : primitiveTypeList) {
         if (!shouldGenerateTypeEntry(type) || !type->isUserPrimitive() || !type->customConversion())
@@ -1964,7 +1964,7 @@ using StringPair = QPair<QString, QString>;
 void ShibokenGenerator::replaceConverterTypeSystemVariable(TypeSystemConverterVariable converterVariable,
                                                            QString &code) const
 {
-    QVector<StringPair> replacements;
+    QList<StringPair> replacements;
     QRegularExpressionMatchIterator rit = m_typeSystemConvRegEx[converterVariable].globalMatch(code);
     while (rit.hasNext()) {
         const QRegularExpressionMatch match = rit.next();
diff --git a/sources/shiboken6/generator/shiboken/shibokengenerator.h b/sources/shiboken6/generator/shiboken/shibokengenerator.h
index 66afbd5d4..8d25bcc95 100644
--- a/sources/shiboken6/generator/shiboken/shibokengenerator.h
+++ b/sources/shiboken6/generator/shiboken/shibokengenerator.h
@@ -115,17 +115,17 @@ protected:
 
     /// Write user's custom code snippets at class or module level.
     void writeClassCodeSnips(TextStream &s,
-                             const QVector<CodeSnip> & codeSnips,
+                             const CodeSnipList &codeSnips,
                              TypeSystem::CodeSnipPosition position,
                              TypeSystem::Language language,
                              const GeneratorContext &context) const;
     void writeCodeSnips(TextStream &s,
-                        const QVector<CodeSnip> & codeSnips,
+                        const CodeSnipList &codeSnips,
                         TypeSystem::CodeSnipPosition position,
                         TypeSystem::Language language) const;
     /// Write user's custom code snippets at function level.
     void writeCodeSnips(TextStream &s,
-                        const QVector<CodeSnip> & codeSnips,
+                        const CodeSnipList &codeSnips,
                         TypeSystem::CodeSnipPosition position,
                         TypeSystem::Language language,
                         const AbstractMetaFunction *func,
@@ -364,12 +364,12 @@ protected:
 
     // All data about extended converters: the type entries of the target type, and a
     // list of AbstractMetaClasses accepted as argument for the conversion.
-    using ExtendedConverterData = QHash<const TypeEntry *, QVector<const AbstractMetaClass *> >;
+    using ExtendedConverterData = QHash<const TypeEntry *, AbstractMetaClassCList>;
     /// Returns all extended conversions for the current module.
     ExtendedConverterData getExtendedConverters() const;
 
     /// Returns a list of converters for the non wrapper types of the current module.
-    QVector<const CustomConversion *> getPrimitiveCustomConversions() const;
+    QList<const CustomConversion *> getPrimitiveCustomConversions() const;
 
     /// Returns true if the Python wrapper for the received OverloadData must accept a list of arguments.
     static bool pythonFunctionWrapperUsesListOfArguments(const OverloadData &overloadData);
@@ -441,13 +441,13 @@ private:
 
     /// Utility function for writeCodeSnips.
     using ArgumentVarReplacementPair = QPair<AbstractMetaArgument, QString>;
-    using ArgumentVarReplacementList = QVector<ArgumentVarReplacementPair>;
+    using ArgumentVarReplacementList = QList<ArgumentVarReplacementPair>;
     ArgumentVarReplacementList getArgumentReplacement(const AbstractMetaFunction* func,
                                                       bool usePyArgs, TypeSystem::Language language,
                                                       const AbstractMetaArgument *lastArg) const;
 
     /// Returns a string with the user's custom code snippets that comply with \p position and \p language.
-    QString getCodeSnippets(const QVector<CodeSnip> & codeSnips,
+    QString getCodeSnippets(const CodeSnipList &codeSnips,
                             TypeSystem::CodeSnipPosition position,
                             TypeSystem::Language language) const;