QDoc: Use QVector instead of QList

Replace the use of QVector in most of QDoc.
Also, remove one redundant C-style cast to int for result from method
call that returns an int. As this happened in a macro, the result is
removing a whole bunch of nagging from code inspection.

Fixes: QTBUG-80669
Change-Id: Ib1aed95e01eaddd1e1213a145e815a0c4753ac67
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

29 files changed, 102 insertions, 101 deletions

diff --git a/src/qdoc/codemarker.cpp b/src/qdoc/codemarker.cpp
index fc0f69470..f9b1a163e 100644
--- a/src/qdoc/codemarker.cpp
+++ b/src/qdoc/codemarker.cpp
@@ -39,7 +39,7 @@
 QT_BEGIN_NAMESPACE
 
 QString CodeMarker::defaultLang;
-QList<CodeMarker *> CodeMarker::markers;
+QVector<CodeMarker *> CodeMarker::markers;
 
 /*!
   When a code marker constructs itself, it puts itself into
diff --git a/src/qdoc/codemarker.h b/src/qdoc/codemarker.h
index 687d808df..4a6264ea6 100644
--- a/src/qdoc/codemarker.h
+++ b/src/qdoc/codemarker.h
@@ -86,7 +86,7 @@ private:
     QString macName(const Node *parent, const QString &name = QString());
 
     static QString defaultLang;
-    static QList<CodeMarker *> markers;
+    static QVector<CodeMarker *> markers;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qdoc/codeparser.cpp b/src/qdoc/codeparser.cpp
index 99bd5b1c8..b8d884a13 100644
--- a/src/qdoc/codeparser.cpp
+++ b/src/qdoc/codeparser.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QList<CodeParser *> CodeParser::parsers;
+QVector<CodeParser *> CodeParser::parsers;
 bool CodeParser::showInternal_ = false;
 bool CodeParser::singleExec_ = false;
 
diff --git a/src/qdoc/codeparser.h b/src/qdoc/codeparser.h
index 78ef8c931..b9a85fb75 100644
--- a/src/qdoc/codeparser.h
+++ b/src/qdoc/codeparser.h
@@ -85,7 +85,7 @@ protected:
     QDocDatabase *qdb_;
 
 private:
-    static QList<CodeParser *> parsers;
+    static QVector<CodeParser *> parsers;
     static bool showInternal_;
     static bool singleExec_;
 };
diff --git a/src/qdoc/config.cpp b/src/qdoc/config.cpp
index da641d3ea..079ffd0e5 100644
--- a/src/qdoc/config.cpp
+++ b/src/qdoc/config.cpp
@@ -643,7 +643,7 @@ QStringList Config::getCanonicalPathList(const QString &var, bool validate) cons
 QRegExp Config::getRegExp(const QString &var) const
 {
     QString pattern;
-    const QList<QRegExp> subRegExps = getRegExpList(var);
+    const QVector<QRegExp> subRegExps = getRegExpList(var);
 
     for (const auto &regExp : subRegExps) {
         if (!regExp.isValid())
@@ -662,10 +662,10 @@ QRegExp Config::getRegExp(const QString &var) const
   map, converts the string list to a list of regular expressions,
   and returns it.
  */
-QList<QRegExp> Config::getRegExpList(const QString &var) const
+QVector<QRegExp> Config::getRegExpList(const QString &var) const
 {
     const QStringList strs = getStringList(var);
-    QList<QRegExp> regExps;
+    QVector<QRegExp> regExps;
     for (const auto &str : strs)
         regExps += QRegExp(str);
     return regExps;
diff --git a/src/qdoc/config.h b/src/qdoc/config.h
index 61ed53d87..7006f002a 100644
--- a/src/qdoc/config.h
+++ b/src/qdoc/config.h
@@ -100,7 +100,7 @@ public:
     QStringList getStringList(const QString &var) const;
     QStringList getCanonicalPathList(const QString &var, bool validate = false) const;
     QRegExp getRegExp(const QString &var) const;
-    QList<QRegExp> getRegExpList(const QString &var) const;
+    QVector<QRegExp> getRegExpList(const QString &var) const;
     QSet<QString> subVars(const QString &var) const;
     void subVarsAndValues(const QString &var, ConfigVarMultimap &t) const;
     QStringList getAllFiles(const QString &filesVar,
diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/cppcodemarker.cpp
index 06e33d09e..843e24db6 100644
--- a/src/qdoc/cppcodemarker.cpp
+++ b/src/qdoc/cppcodemarker.cpp
@@ -495,7 +495,7 @@ QString CppCodeMarker::addMarkUp(const QString &in,
             keywords.insert(keywordTable[j]);
     }
 #define readChar() \
-    ch = (i < (int)code.length()) ? code[i++].cell() : EOF
+    ch = (i < code.length()) ? code[i++].cell() : EOF
 
     QString code = in;
     QString out;
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp
index e92a5d7de..ce92448de 100644
--- a/src/qdoc/cppcodeparser.cpp
+++ b/src/qdoc/cppcodeparser.cpp
@@ -1015,7 +1015,7 @@ void CppCodeParser::processTopicArgs(const Doc &doc, const QString &topic, NodeL
 
 void CppCodeParser::processMetaCommands(NodeList &nodes, DocList &docs)
 {
-    QList<Doc>::Iterator d = docs.begin();
+    QVector<Doc>::Iterator d = docs.begin();
     for (const auto &node : nodes) {
         if (node != nullptr) {
             processMetaCommands(*d, node);
diff --git a/src/qdoc/doc.cpp b/src/qdoc/doc.cpp
index a038be439..83033ca51 100644
--- a/src/qdoc/doc.cpp
+++ b/src/qdoc/doc.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 Q_GLOBAL_STATIC(QSet<QString>, null_Set_QString)
 Q_GLOBAL_STATIC(TopicList, nullTopicList)
 Q_GLOBAL_STATIC(QStringList, null_QStringList)
-Q_GLOBAL_STATIC(QList<Text>, null_QList_Text)
+Q_GLOBAL_STATIC(QVector<Text>, null_QVector_Text)
 Q_GLOBAL_STATIC(QStringMultiMap, null_QStringMultiMap)
 
 struct Macro
@@ -298,10 +298,10 @@ class DocPrivateExtra
 public:
     Doc::Sections       granularity_;
     Doc::Sections       section_; // ###
-    QList<Atom *>       tableOfContents_;
+    QVector<Atom *>     tableOfContents_;
     QVector<int>        tableOfContentsLevels_;
-    QList<Atom *>       keywords_;
-    QList<Atom *>       targets_;
+    QVector<Atom *>     keywords_;
+    QVector<Atom *>     targets_;
     QStringMultiMap     metaMap_;
 
     DocPrivateExtra()
@@ -349,7 +349,7 @@ public:
     QString src;
     Text text;
     QSet<QString> params;
-    QList<Text> alsoList;
+    QVector<Text> alsoList;
     QStringList enumItemList;
     QStringList omitEnumItemList;
     QSet<QString> metacommandsUsed;
@@ -3098,9 +3098,9 @@ ArgList Doc::metaCommandArgs(const QString &metacommand) const
     return priv == nullptr ? ArgList() : priv->metaCommandMap.value(metacommand);
 }
 
-const QList<Text> &Doc::alsoList() const
+const QVector<Text> &Doc::alsoList() const
 {
-    return priv == nullptr ? *null_QList_Text() : priv->alsoList;
+    return priv == nullptr ? *null_QVector_Text() : priv->alsoList;
 }
 
 bool Doc::hasTableOfContents() const
@@ -3118,7 +3118,7 @@ bool Doc::hasTargets() const
     return priv && priv->extra && !priv->extra->targets_.isEmpty();
 }
 
-const QList<Atom *> &Doc::tableOfContents() const
+const QVector<Atom *> &Doc::tableOfContents() const
 {
     priv->constructExtra();
     return priv->extra->tableOfContents_;
@@ -3130,13 +3130,13 @@ const QVector<int> &Doc::tableOfContentsLevels() const
     return priv->extra->tableOfContentsLevels_;
 }
 
-const QList<Atom *> &Doc::keywords() const
+const QVector<Atom *> &Doc::keywords() const
 {
     priv->constructExtra();
     return priv->extra->keywords_;
 }
 
-const QList<Atom *> &Doc::targets() const
+const QVector<Atom *> &Doc::targets() const
 {
     priv->constructExtra();
     return priv->extra->targets_;
diff --git a/src/qdoc/doc.h b/src/qdoc/doc.h
index d67275565..38c469ee3 100644
--- a/src/qdoc/doc.h
+++ b/src/qdoc/doc.h
@@ -50,7 +50,7 @@ class Text;
 class DitaRef;
 
 typedef QPair<QString, Location> ArgLocPair;
-typedef QList<ArgLocPair> ArgList;
+typedef QVector<ArgLocPair> ArgList;
 typedef QMap<QString, QString> QStringMap;
 typedef QMultiMap<QString, QString> QStringMultiMap;
 
@@ -63,9 +63,9 @@ struct Topic
     bool isEmpty() const { return topic.isEmpty(); }
     void clear() { topic.clear(); args.clear(); }
 };
-typedef QList<Topic> TopicList;
+typedef QVector<Topic> TopicList;
 
-typedef QList<DitaRef *> DitaRefList;
+typedef QVector<DitaRef *> DitaRefList;
 
 class DitaRef
 {
@@ -154,16 +154,16 @@ public:
     const QSet<QString> &metaCommandsUsed() const;
     const TopicList &topicsUsed() const;
     ArgList metaCommandArgs(const QString &metaCommand) const;
-    const QList<Text> &alsoList() const;
+    const QVector<Text> &alsoList() const;
     bool hasTableOfContents() const;
     bool hasKeywords() const;
     bool hasTargets() const;
     bool isInternal() const;
     bool isMarkedReimp() const;
-    const QList<Atom *> &tableOfContents() const;
+    const QVector<Atom *> &tableOfContents() const;
     const QVector<int> &tableOfContentsLevels() const;
-    const QList<Atom *> &keywords() const;
-    const QList<Atom *> &targets() const;
+    const QVector<Atom *> &keywords() const;
+    const QVector<Atom *> &targets() const;
     const QStringMultiMap &metaTagMap() const;
 
     static void initialize(const Config &config);
@@ -184,7 +184,7 @@ private:
     static const Config *config_;
 };
 Q_DECLARE_TYPEINFO(Doc, Q_MOVABLE_TYPE);
-typedef QList<Doc> DocList;
+typedef QVector<Doc> DocList;
 
 QT_END_NAMESPACE
 
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp
index 0b2d24f27..fe2b56b7a 100644
--- a/src/qdoc/generator.cpp
+++ b/src/qdoc/generator.cpp
@@ -57,7 +57,7 @@ QStringList Generator::exampleDirs;
 QStringList Generator::exampleImgExts;
 QMap<QString, QMap<QString, QString> > Generator::fmtLeftMaps;
 QMap<QString, QMap<QString, QString> > Generator::fmtRightMaps;
-QList<Generator *> Generator::generators;
+QVector<Generator *> Generator::generators;
 QStringList Generator::imageDirs;
 QStringList Generator::imageFiles;
 QMap<QString, QStringList> Generator::imgFileExts;
@@ -185,7 +185,7 @@ void Generator::signatureList(const NodeList &nodes, const Node *relative, CodeM
     generateText(text, relative, marker);
 }
 
-int Generator::appendSortedNames(Text &text, const ClassNode *cn, const QList<RelatedClass> &rc)
+int Generator::appendSortedNames(Text &text, const ClassNode *cn, const QVector<RelatedClass> &rc)
 {
     QMap<QString,Text> classMap;
     for (const auto &relatedClass : rc) {
@@ -716,7 +716,7 @@ QString Generator::fullDocumentLocation(const Node *node, bool useSubdir)
 
 void Generator::generateAlsoList(const Node *node, CodeMarker *marker)
 {
-    QList<Text> alsoList = node->doc().alsoList();
+    QVector<Text> alsoList = node->doc().alsoList();
     supplementAlsoList(node, alsoList);
 
     if (!alsoList.isEmpty()) {
@@ -879,7 +879,7 @@ void Generator::generateBody(const Node *node, CodeMarker *marker)
             const EnumNode *enume = static_cast<const EnumNode *>(node);
 
             QSet<QString> definedItems;
-            const QList<EnumItem> &items = enume->items();
+            const QVector<EnumItem> &items = enume->items();
             for (const auto &item : items)
                 definedItems.insert(item.name());
 
@@ -1114,7 +1114,7 @@ void Generator::generateInherits(const ClassNode *classe, CodeMarker *marker)
              << Atom(Atom::FormattingRight,ATOM_FORMATTING_BOLD);
 
         int index = 0;
-        const QList<RelatedClass> &baseClasses = classe->baseClasses();
+        const QVector<RelatedClass> &baseClasses = classe->baseClasses();
         for (const auto &cls : baseClasses) {
             if (cls.node_) {
                 appendFullName(text, cls.node_, classe);
@@ -2163,7 +2163,7 @@ void Generator::initializeTextOutput()
     sectionNumber_.clear();
 }
 
-void Generator::supplementAlsoList(const Node *node, QList<Text> &alsoList)
+void Generator::supplementAlsoList(const Node *node, QVector<Text> &alsoList)
 {
     if (node->isFunction() && !node->isMacro()) {
         const auto fn = static_cast<const FunctionNode *>(node);
diff --git a/src/qdoc/generator.h b/src/qdoc/generator.h
index 24fd5bb48..2ed902ec6 100644
--- a/src/qdoc/generator.h
+++ b/src/qdoc/generator.h
@@ -141,7 +141,7 @@ protected:
     static QString outputPrefix(const Node *node);
     static QString outputSuffix(const Node *node);
     static void singularPlural(Text &text, const NodeList &nodes);
-    static void supplementAlsoList(const Node *node, QList<Text> &alsoList);
+    static void supplementAlsoList(const Node *node, QVector<Text> &alsoList);
     static QString trimmedTrailing(const QString &string,
                                    const QString &prefix,
                                    const QString &suffix);
@@ -204,7 +204,8 @@ protected:
                         const QString &fullName,
                         const Node *actualNode);
     void appendFullNames(Text &text, const NodeList &nodes, const Node *relative);
-    int appendSortedNames(Text &text, const ClassNode *classe, const QList<RelatedClass> &classes);
+    int appendSortedNames(Text &text, const ClassNode *classe,
+                          const QVector<RelatedClass> &classes);
     void appendSignature(Text &text, const Node *node);
     void signatureList(const NodeList &nodes, const Node *relative, CodeMarker *marker);
 
@@ -216,7 +217,7 @@ private:
     static QStringList exampleImgExts;
     static QMap<QString, QMap<QString, QString> > fmtLeftMaps;
     static QMap<QString, QMap<QString, QString> > fmtRightMaps;
-    static QList<Generator *> generators;
+    static QVector<Generator *> generators;
     static QStringList imageDirs;
     static QStringList imageFiles;
     static QMap<QString, QStringList> imgFileExts;
diff --git a/src/qdoc/helpprojectwriter.h b/src/qdoc/helpprojectwriter.h
index 64ad3aaec..222a5f097 100644
--- a/src/qdoc/helpprojectwriter.h
+++ b/src/qdoc/helpprojectwriter.h
@@ -67,13 +67,13 @@ struct HelpProject
     QString fileName;
     QString indexRoot;
     QString indexTitle;
-    QList<QStringList> keywords;
+    QVector<QStringList> keywords;
     QSet<QString> files;
     QSet<QString> extraFiles;
     QSet<QString> filterAttributes;
     QHash<QString, QSet<QString>> customFilters;
     QSet<QString> excluded;
-    QList<SubProject> subprojects;
+    QVector<SubProject> subprojects;
     QHash<const Node *, NodeStatusSet> memberStatus;
     bool includeIndexNodes;
 };
@@ -112,7 +112,7 @@ private:
     Generator *gen_;
 
     QString outputDir;
-    QList<HelpProject> projects;
+    QVector<HelpProject> projects;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index 415309157..a336467ba 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -2423,7 +2423,7 @@ void HtmlGenerator::generateTableOfContents(const Node *node,
                                             CodeMarker *marker,
                                             QVector<Section> *sections)
 {
-    QList<Atom *> toc;
+    QVector<Atom *> toc;
     if (node->doc().hasTableOfContents())
         toc = node->doc().tableOfContents();
     if (tocDepth == 0 || (toc.isEmpty() && !sections && !node->isModule())) {
@@ -3182,7 +3182,7 @@ void HtmlGenerator::generateList(const Node *relative, CodeMarker *marker, const
     if (type != Node::NoType) {
         NodeList nodeList;
         qdb_->mergeCollections(type, cnm, relative);
-        const CollectionList collectionList = cnm.values();
+        const auto collectionList = cnm.values();
         nodeList.reserve(collectionList.size());
         for (auto *collectionNode : collectionList)
             nodeList.append(collectionNode);
@@ -3346,7 +3346,7 @@ void HtmlGenerator::generateSectionList(const Section& section,
 
 void HtmlGenerator::generateSectionInheritedList(const Section& section, const Node *relative)
 {
-    const QList<QPair<Aggregate *, int>> &inheritedMembers = section.inheritedMembers();
+    const QVector<QPair<Aggregate *, int>> &inheritedMembers = section.inheritedMembers();
     for (const auto &member : inheritedMembers) {
         out() << "<li class=\"fn\">";
         out() << member.second << ' ';
@@ -3720,7 +3720,7 @@ void HtmlGenerator::generateDetailedMember(const Node *node,
     generateSince(node, marker);
 
     if (node->isProperty()) {
-        const PropertyNode *property = static_cast<const PropertyNode *>(node);
+        const auto property = static_cast<const PropertyNode *>(node);
         Section section(Section::Accessors, Section::Active);
 
         section.appendMembers(property->getters().toVector());
diff --git a/src/qdoc/htmlgenerator.h b/src/qdoc/htmlgenerator.h
index 36385e8f0..86801e0af 100644
--- a/src/qdoc/htmlgenerator.h
+++ b/src/qdoc/htmlgenerator.h
@@ -221,7 +221,7 @@ private:
     bool obsoleteLinks;
     QStack<QXmlStreamWriter *> xmlWriterStack;
     static int id;
-    QList<ManifestMetaFilter> manifestMetaContent;
+    QVector<ManifestMetaFilter> manifestMetaContent;
     QString homepage;
     QString hometitle;
     QString landingpage;
diff --git a/src/qdoc/jscodemarker.cpp b/src/qdoc/jscodemarker.cpp
index 6a26fce2e..cc1a234fb 100644
--- a/src/qdoc/jscodemarker.cpp
+++ b/src/qdoc/jscodemarker.cpp
@@ -67,7 +67,7 @@ bool JsCodeMarker::recognizeCode(const QString &code)
     QQmlJS::Parser parser(&engine);
 
     QString newCode = code;
-    QList<QQmlJS::AST::SourceLocation> pragmas = extractPragmas(newCode);
+    QVector<QQmlJS::AST::SourceLocation> pragmas = extractPragmas(newCode);
     lexer.setCode(newCode, 1);
 
     return parser.parseProgram();
@@ -118,7 +118,7 @@ QString JsCodeMarker::addMarkUp(const QString &code,
     QQmlJS::Lexer lexer(&engine);
 
     QString newCode = code;
-    QList<QQmlJS::AST::SourceLocation> pragmas = extractPragmas(newCode);
+    QVector<QQmlJS::AST::SourceLocation> pragmas = extractPragmas(newCode);
     lexer.setCode(newCode, 1);
 
     QQmlJS::Parser parser(&engine);
diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp
index e8f03e559..127bcf0d5 100644
--- a/src/qdoc/main.cpp
+++ b/src/qdoc/main.cpp
@@ -73,7 +73,7 @@ bool creationTimeBefore(const QFileInfo &fi1, const QFileInfo &fi2)
 
 #ifndef QT_NO_TRANSLATION
 typedef QPair<QString, QTranslator *> Translator;
-static QList<Translator> translators;
+static QVector<Translator> translators;
 #endif
 
 static ClangCodeParser* clangParser_ = nullptr;
@@ -167,7 +167,7 @@ static void loadIndexFiles(Config &config, const QSet<QString> &formats)
             for (int i = 0; i < config.dependModules().size(); i++) {
                 QString indexToAdd;
                 QString dependModule = config.dependModules()[i];
-                QList<QFileInfo> foundIndices;
+                QVector<QFileInfo> foundIndices;
                 // Always look in module-specific subdir, even with *.nosubdirs config
                 bool useModuleSubDir = !subDirs.contains(dependModule);
                 subDirs << dependModule;
diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp
index 6cd3c74f7..a1df93cb8 100644
--- a/src/qdoc/node.cpp
+++ b/src/qdoc/node.cpp
@@ -659,7 +659,7 @@ QString Node::fullName(const Node *relative) const
   If a match is found, return true. If no match is found,
   return false.
  */
-bool Node::match(const QList<int> &types) const
+bool Node::match(const QVector<int> &types) const
 {
     for (int i=0; i<types.size(); ++i) {
         if (nodeType() == types.at(i))
@@ -2928,7 +2928,7 @@ QString Aggregate::typeWord(bool cap) const
   is called recursively with the list of base classes from
   that private or internal class node.
  */
-void ClassNode::promotePublicBases(const QList<RelatedClass> &bases)
+void ClassNode::promotePublicBases(const QVector<RelatedClass> &bases)
 {
     if (!bases.isEmpty()) {
         for (int i = bases.size() - 1; i >= 0; --i) {
@@ -2978,7 +2978,7 @@ void ClassNode::removePrivateAndInternalBases()
         ClassNode *dc = derived_.at(i).node_;
         if (dc != nullptr && (dc->isPrivate() || dc->isInternal())) {
             derived_.removeAt(i);
-            const QList<RelatedClass> &dd = dc->derivedClasses();
+            const QVector<RelatedClass> &dd = dc->derivedClasses();
             for (int j = dd.size() - 1; j >= 0; --j)
                 derived_.insert(i, dd.at(j));
         }
@@ -3377,7 +3377,7 @@ PropertyNode *ClassNode::findPropertyNode(const QString &name)
 
     PropertyNode *pn = nullptr;
 
-    const QList<RelatedClass> &bases = baseClasses();
+    const QVector<RelatedClass> &bases = baseClasses();
     if (!bases.isEmpty()) {
         for (int i = 0; i < bases.size(); ++i) {
             ClassNode *cn = bases[i].node_;
@@ -3388,7 +3388,7 @@ PropertyNode *ClassNode::findPropertyNode(const QString &name)
             }
         }
     }
-    const QList<RelatedClass> &ignoredBases = ignoredBaseClasses();
+    const QVector<RelatedClass> &ignoredBases = ignoredBaseClasses();
     if (!ignoredBases.isEmpty()) {
         for (int i = 0; i < ignoredBases.size(); ++i) {
             ClassNode *cn = ignoredBases[i].node_;
@@ -3412,7 +3412,7 @@ PropertyNode *ClassNode::findPropertyNode(const QString &name)
 QmlTypeNode *ClassNode::findQmlBaseNode()
 {
     QmlTypeNode *result = nullptr;
-    const QList<RelatedClass> &bases = baseClasses();
+    const QVector<RelatedClass> &bases = baseClasses();
 
     if (!bases.isEmpty()) {
         for (int i = 0; i < bases.size(); ++i) {
diff --git a/src/qdoc/node.h b/src/qdoc/node.h
index 9629ca418..6594df921 100644
--- a/src/qdoc/node.h
+++ b/src/qdoc/node.h
@@ -58,7 +58,7 @@ class SharedCommentNode;
 
 typedef QMap<QString, FunctionNode *> FunctionMap;
 typedef QList<Node *> NodeList;
-typedef QList<ClassNode *> ClassList;
+typedef QVector<ClassNode *> ClassList;
 typedef QVector<Node *> NodeVector;
 typedef QMap<QString, Node *> NodeMap;
 typedef QMap<QString, NodeMap> NodeMapMap;
@@ -66,7 +66,7 @@ typedef QMultiMap<QString, Node *> NodeMultiMap;
 typedef QMap<QString, NodeMultiMap> NodeMultiMapMap;
 typedef QMap<QString, CollectionNode *> CNMap;
 typedef QMultiMap<QString, CollectionNode *> CNMultiMap;
-typedef QList<CollectionNode *> CollectionList;
+typedef QVector<CollectionNode *> CollectionList;
 
 class Node
 {
@@ -287,7 +287,7 @@ public:
     virtual void markDefault() { }
     virtual void markReadOnly(bool ) { }
 
-    bool match(const QList<int> &types) const;
+    bool match(const QVector<int> &types) const;
     Aggregate *parent() const { return parent_; }
     const QString &name() const { return name_; }
     QString physicalModuleName() const;
@@ -615,15 +615,15 @@ public:
     void removePrivateAndInternalBases();
     void resolvePropertyOverriddenFromPtrs(PropertyNode *pn);
 
-    QList<RelatedClass> &baseClasses() { return bases_; }
-    QList<RelatedClass> &derivedClasses() { return derived_; }
-    QList<RelatedClass> &ignoredBaseClasses() { return ignoredBases_; }
-    QList<UsingClause> &usingClauses() { return usingClauses_; }
+    QVector<RelatedClass> &baseClasses() { return bases_; }
+    QVector<RelatedClass> &derivedClasses() { return derived_; }
+    QVector<RelatedClass> &ignoredBaseClasses() { return ignoredBases_; }
+    QVector<UsingClause> &usingClauses() { return usingClauses_; }
 
-    const QList<RelatedClass> &baseClasses() const { return bases_; }
-    const QList<RelatedClass> &derivedClasses() const { return derived_; }
-    const QList<RelatedClass> &ignoredBaseClasses() const { return ignoredBases_; }
-    const QList<UsingClause> &usingClauses() const { return usingClauses_; }
+    const QVector<RelatedClass> &baseClasses() const { return bases_; }
+    const QVector<RelatedClass> &derivedClasses() const { return derived_; }
+    const QVector<RelatedClass> &ignoredBaseClasses() const { return ignoredBases_; }
+    const QVector<UsingClause> &usingClauses() const { return usingClauses_; }
 
     QmlTypeNode *qmlElement() { return qmlelement; }
     void setQmlElement(QmlTypeNode *qcn) { qmlelement = qcn; }
@@ -636,13 +636,13 @@ public:
     bool docMustBeGenerated() const override;
 
 private:
-    void promotePublicBases(const QList<RelatedClass> &bases);
+    void promotePublicBases(const QVector<RelatedClass> &bases);
 
 private:
-    QList<RelatedClass> bases_;
-    QList<RelatedClass> derived_;
-    QList<RelatedClass> ignoredBases_;
-    QList<UsingClause> usingClauses_;
+    QVector<RelatedClass> bases_;
+    QVector<RelatedClass> derived_;
+    QVector<RelatedClass> ignoredBases_;
+    QVector<UsingClause> usingClauses_;
     bool abstract_;
     bool wrapper_;
     QString obsoleteLink_;
@@ -707,7 +707,7 @@ struct ImportRec {
     bool isEmpty() const { return name_.isEmpty(); }
 };
 
-typedef QList<ImportRec> ImportList;
+typedef QVector<ImportRec> ImportList;
 
 class QmlTypeNode : public Aggregate
 {
@@ -847,14 +847,14 @@ public:
     void setFlagsType(TypedefNode *typedeff);
     bool hasItem(const QString &name) const { return names_.contains(name); }
 
-    const QList<EnumItem> &items() const { return items_; }
+    const QVector<EnumItem> &items() const { return items_; }
     Access itemAccess(const QString &name) const;
     const TypedefNode *flagsType() const { return flagsType_; }
     QString itemValue(const QString &name) const;
     Node *clone(Aggregate *parent) override;
 
 private:
-    QList<EnumItem> items_;
+    QVector<EnumItem> items_;
     QSet<QString> names_;
     const TypedefNode *flagsType_;
 };
diff --git a/src/qdoc/qdocindexfiles.cpp b/src/qdoc/qdocindexfiles.cpp
index 0d284f6bf..022d658b1 100644
--- a/src/qdoc/qdocindexfiles.cpp
+++ b/src/qdoc/qdocindexfiles.cpp
@@ -955,7 +955,7 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter &writer, Node *node,
         {
             // Classes contain information about their base classes.
             const ClassNode *classNode = static_cast<const ClassNode *>(node);
-            const QList<RelatedClass> bases = classNode->baseClasses();
+            const QVector<RelatedClass> bases = classNode->baseClasses();
             QSet<QString> baseStrings;
             for (const auto &related : bases) {
                 ClassNode *n = related.node_;
diff --git a/src/qdoc/qdoctagfiles.cpp b/src/qdoc/qdoctagfiles.cpp
index bdf001469..cd4e9e0e5 100644
--- a/src/qdoc/qdoctagfiles.cpp
+++ b/src/qdoc/qdoctagfiles.cpp
@@ -138,7 +138,7 @@ void QDocTagFiles::generateTagFileCompounds(QXmlStreamWriter &writer, const Aggr
 
             // Classes contain information about their base classes.
             const ClassNode *classNode = static_cast<const ClassNode *>(node);
-            const QList<RelatedClass> bases = classNode->baseClasses();
+            const QVector<RelatedClass> bases = classNode->baseClasses();
             for (const auto &related : bases) {
                 ClassNode *n = related.node_;
                 if (n)
diff --git a/src/qdoc/qmlcodemarker.cpp b/src/qdoc/qmlcodemarker.cpp
index cb31b62b0..719fc710b 100644
--- a/src/qdoc/qmlcodemarker.cpp
+++ b/src/qdoc/qmlcodemarker.cpp
@@ -172,7 +172,7 @@ QString QmlCodeMarker::addMarkUp(const QString &code,
     QQmlJS::Lexer lexer(&engine);
 
     QString newCode = code;
-    QList<QQmlJS::AST::SourceLocation> pragmas = extractPragmas(newCode);
+    QVector<QQmlJS::AST::SourceLocation> pragmas = extractPragmas(newCode);
     lexer.setCode(newCode, 1);
 
     QQmlJS::Parser parser(&engine);
@@ -224,11 +224,11 @@ static void replaceWithSpace(QString &str, int idx, int n)
   Searches for ".pragma <value>" or ".import <stuff>" declarations
   in \a script. Currently supported pragmas are: library
 */
-QList<QQmlJS::AST::SourceLocation> QmlCodeMarker::extractPragmas(QString &script)
+QVector<QQmlJS::AST::SourceLocation> QmlCodeMarker::extractPragmas(QString &script)
 {
     const QString pragma(QLatin1String("pragma"));
     const QString library(QLatin1String("library"));
-    QList<QQmlJS::AST::SourceLocation> removed;
+    QVector<QQmlJS::AST::SourceLocation> removed;
 
     QQmlJS::Lexer l(nullptr);
     l.setCode(script, 0);
diff --git a/src/qdoc/qmlcodemarker.h b/src/qdoc/qmlcodemarker.h
index e28d46309..81194cb36 100644
--- a/src/qdoc/qmlcodemarker.h
+++ b/src/qdoc/qmlcodemarker.h
@@ -65,7 +65,7 @@ public:
 
     /* Copied from src/declarative/qml/qdeclarativescriptparser.cpp */
 #ifndef QT_NO_DECLARATIVE
-    QList<QQmlJS::AST::SourceLocation> extractPragmas(QString &script);
+    QVector<QQmlJS::AST::SourceLocation> extractPragmas(QString &script);
 #endif
 
 private:
diff --git a/src/qdoc/qmlmarkupvisitor.cpp b/src/qdoc/qmlmarkupvisitor.cpp
index e99bf5fc3..dbcdf8aa5 100644
--- a/src/qdoc/qmlmarkupvisitor.cpp
+++ b/src/qdoc/qmlmarkupvisitor.cpp
@@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_DECLARATIVE
 QmlMarkupVisitor::QmlMarkupVisitor(const QString &source,
-                                   const QList<QQmlJS::AST::SourceLocation> &pragmas,
+                                   const QVector<QQmlJS::AST::SourceLocation> &pragmas,
                                    QQmlJS::Engine *engine)
 {
     this->source = source;
diff --git a/src/qdoc/qmlmarkupvisitor.h b/src/qdoc/qmlmarkupvisitor.h
index 1f48722b1..a0e3f870b 100644
--- a/src/qdoc/qmlmarkupvisitor.h
+++ b/src/qdoc/qmlmarkupvisitor.h
@@ -51,7 +51,7 @@ public:
     };
 
     QmlMarkupVisitor(const QString &code,
-                     const QList<QQmlJS::AST::SourceLocation> &pragmas,
+                     const QVector<QQmlJS::AST::SourceLocation> &pragmas,
                      QQmlJS::Engine *engine);
     virtual ~QmlMarkupVisitor();
 
@@ -158,7 +158,7 @@ private:
 
     QQmlJS::Engine *engine;
     QVector<ExtraType> extraTypes;
-    QList<QQmlJS::AST::SourceLocation> extraLocations;
+    QVector<QQmlJS::AST::SourceLocation> extraLocations;
     QString source;
     QString output;
     quint32 cursor;
diff --git a/src/qdoc/sections.cpp b/src/qdoc/sections.cpp
index b21369aea..7fd39bc4f 100644
--- a/src/qdoc/sections.cpp
+++ b/src/qdoc/sections.cpp
@@ -938,7 +938,7 @@ void Sections::distributeQmlNodeInSummaryVector(SectionVector &sv, Node *n, bool
 
 static void pushBaseClasses(QStack<ClassNode *> &stack, ClassNode *cn)
 {
-    const QList<RelatedClass> &baseClasses = cn->baseClasses();
+    const QVector<RelatedClass> baseClasses = cn->baseClasses();
     for (const auto &cls : baseClasses) {
         if (cls.node_)
             stack.prepend(cls.node_);
diff --git a/src/qdoc/sections.h b/src/qdoc/sections.h
index d9aeeb28f..9c1514c2d 100644
--- a/src/qdoc/sections.h
+++ b/src/qdoc/sections.h
@@ -37,11 +37,11 @@ QT_BEGIN_NAMESPACE
 
 typedef QMultiMap<QString, Node *> MemberMap; // the string is the member signature
 typedef QPair<const QmlTypeNode *, MemberMap> ClassMap;    // the node is the QML type
-typedef QList<ClassMap *> ClassMapList;
+typedef QVector<ClassMap *> ClassMapList;
 
 typedef QPair<QStringList, NodeVector> KeysAndNodes;
 typedef QPair<const QmlTypeNode *, KeysAndNodes> ClassKeysNodes;
-typedef QList<ClassKeysNodes *> ClassKeysNodesList;
+typedef QVector<ClassKeysNodes *> ClassKeysNodesList;
 
 class Section
 {
@@ -101,7 +101,7 @@ public:
     const QStringList &keys(Status t) const { return (t == Obsolete ? obsoleteKeys_ : keys_); }
     const NodeVector &members() const { return members_; }
     const NodeVector &reimplementedMembers() const { return reimplementedMembers_; }
-    const QList<QPair<Aggregate*, int> > &inheritedMembers() const { return inheritedMembers_; }
+    const QVector<QPair<Aggregate*, int> > &inheritedMembers() const { return inheritedMembers_; }
     ClassKeysNodesList &classKeysNodesList() { return classKeysNodesList_; }
     const NodeVector &obsoleteMembers() const { return obsoleteMembers_; }
     void appendMembers(const NodeVector &nv) { members_.append(nv); }
@@ -125,7 +125,7 @@ private:
     NodeVector members_;
     NodeVector obsoleteMembers_;
     NodeVector reimplementedMembers_;
-    QList<QPair<Aggregate *, int> > inheritedMembers_;
+    QVector<QPair<Aggregate *, int> > inheritedMembers_;
     ClassKeysNodesList classKeysNodesList_;
 
     QMultiMap<QString, Node *> memberMap_;
diff --git a/src/qdoc/tree.cpp b/src/qdoc/tree.cpp
index e85952934..6ff473bdc 100644
--- a/src/qdoc/tree.cpp
+++ b/src/qdoc/tree.cpp
@@ -237,10 +237,10 @@ void Tree::resolveBaseClasses(Aggregate *n)
     for (auto it = n->constBegin(); it != n->constEnd(); ++it) {
         if ((*it)->isClassNode()) {
             ClassNode *cn = static_cast<ClassNode *>(*it);
-            QList<RelatedClass> &bases = cn->baseClasses();
-            for (auto &cls : bases) {
-                if (cls.node_ == nullptr) {
-                    Node *n = qdb_->findClassNode(cls.path_);
+            QVector<RelatedClass> &bases = cn->baseClasses();
+            for (auto &base : bases) {
+                if (base.node_ == nullptr) {
+                    Node *n = qdb_->findClassNode(base.path_);
                     /*
                       If the node for the base class was not found,
                       the reason might be that the subclass is in a
@@ -256,12 +256,12 @@ void Tree::resolveBaseClasses(Aggregate *n)
                         if (parent != nullptr)
                             // Exclude the root namespace
                             if (parent->isNamespace() && !parent->name().isEmpty())
-                                n = findClassNode(cls.path_, parent);
+                                n = findClassNode(base.path_, parent);
                     }
                     if (n != nullptr) {
                         ClassNode *bcn = static_cast<ClassNode *>(n);
-                        cls.node_ = bcn;
-                        bcn->addDerivedClass(cls.access_, cn);
+                        base.node_ = bcn;
+                        bcn->addDerivedClass(base.access_, cn);
                     }
                 }
             }
@@ -366,7 +366,7 @@ void Tree::resolveUsingClauses()
     for (auto *child : children) {
         if (child->isClassNode()) {
             ClassNode *cn = static_cast<ClassNode *>(child);
-            QList<UsingClause> &usingClauses = cn->usingClauses();
+            QVector<UsingClause> &usingClauses = cn->usingClauses();
             for (auto &usingClause : usingClauses) {
                 if (usingClause.node() == nullptr) {
                     const Node *n = qdb_->findFunctionNode(usingClause.signature(), cn, Node::CPP);
@@ -792,7 +792,7 @@ void Tree::resolveTargets(Aggregate *root)
         }
 
         if (child->doc().hasTableOfContents()) {
-            const QList<Atom *> &toc = child->doc().tableOfContents();
+            const QVector<Atom *> &toc = child->doc().tableOfContents();
             for (int i = 0; i < toc.size(); ++i) {
                 QString ref = refForAtom(toc.at(i));
                 QString title = Text::sectionHeading(toc.at(i)).toString();
@@ -805,7 +805,7 @@ void Tree::resolveTargets(Aggregate *root)
             }
         }
         if (child->doc().hasKeywords()) {
-            const QList<Atom *> &keywords = child->doc().keywords();
+            const QVector<Atom *> &keywords = child->doc().keywords();
             for (int i = 0; i < keywords.size(); ++i) {
                 QString ref = refForAtom(keywords.at(i));
                 QString title = keywords.at(i)->string();
@@ -817,7 +817,7 @@ void Tree::resolveTargets(Aggregate *root)
             }
         }
         if (child->doc().hasTargets()) {
-            const QList<Atom *> &targets = child->doc().targets();
+            const QVector<Atom *> &targets = child->doc().targets();
             for (int i = 0; i < targets.size(); ++i) {
                 QString ref = refForAtom(targets.at(i));
                 QString title = targets.at(i)->string();
@@ -843,7 +843,7 @@ Tree::findUnambiguousTarget(const QString &target, Node::Genus genus, QString &r
 {
     int numBestTargets = 0;
     TargetRec *bestTarget = nullptr;
-    QList<TargetRec *> bestTargetList;
+    QVector<TargetRec *> bestTargetList;
 
     QString key = target;
     for (auto it = nodesByTargetTitle_.find(key); it != nodesByTargetTitle_.constEnd(); ++it) {
diff --git a/src/qdoc/webxmlgenerator.cpp b/src/qdoc/webxmlgenerator.cpp
index 54373815a..330f3d474 100644
--- a/src/qdoc/webxmlgenerator.cpp
+++ b/src/qdoc/webxmlgenerator.cpp
@@ -222,7 +222,7 @@ void WebXMLGenerator::append(QXmlStreamWriter &writer, Node *node)
     while (atom)
         atom = addAtomElements(writer, atom, node, marker_);
 
-    QList<Text> alsoList = node->doc().alsoList();
+    QVector<Text> alsoList = node->doc().alsoList();
     supplementAlsoList(node, alsoList);
 
     if (!alsoList.isEmpty()) {