1 files changed, 31 insertions, 30 deletions

diff --git a/src/qdoc/sections.h b/src/qdoc/sections.h
index d9aeeb28f..c8d17b141 100644
--- a/src/qdoc/sections.h
+++ b/src/qdoc/sections.h
@@ -36,12 +36,12 @@
 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 QPair<const QmlTypeNode *, MemberMap> ClassMap; // the node is the QML type
+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
 {
@@ -50,31 +50,34 @@ public:
     enum Status { Obsolete, Active };
 
 public:
-    Section() : style_(Details), status_(Active), aggregate_(nullptr) { }
+    Section() : style_(Details), status_(Active), aggregate_(nullptr) {}
     Section(Style style, Status status);
     ~Section();
 
-    void init(const QString &title) {
-        title_ = title;
-    }
-    void init(const QString &singular,
-              const QString &plural) {
-        singular_ = singular; plural_ = plural;
+    void init(const QString &title) { title_ = title; }
+    void init(const QString &singular, const QString &plural)
+    {
+        singular_ = singular;
+        plural_ = plural;
     }
-    void init(const QString &title,
-              const QString &singular,
-              const QString &plural) {
-        title_ = title; divClass_.clear(); singular_= singular; plural_ = plural;
+    void init(const QString &title, const QString &singular, const QString &plural)
+    {
+        title_ = title;
+        divClass_.clear();
+        singular_ = singular;
+        plural_ = plural;
     }
-    void init(const QString &title,
-              const QString &divClass,
-              const QString &singular,
-              const QString &plural) {
-        title_ = title; divClass_ = divClass; singular_= singular; plural_ = plural;
+    void init(const QString &title, const QString &divClass, const QString &singular,
+              const QString &plural)
+    {
+        title_ = title;
+        divClass_ = divClass;
+        singular_ = singular;
+        plural_ = plural;
     }
 
     void insert(Node *node);
-    void insert(const QString &key, Node *node) { memberMap_.insertMulti(key, node); }
+    void insert(const QString &key, Node *node) { memberMap_.insert(key, node); }
     bool insertReimplementedMember(Node *node);
 
     ClassMap *newClassMap(const Aggregate *aggregate);
@@ -84,11 +87,10 @@ public:
 
     void clear();
     void reduce();
-    bool isEmpty() const {
-        return (memberMap_.isEmpty() &&
-                inheritedMembers_.isEmpty() &&
-                reimplementedMemberMap_.isEmpty() &&
-                classMapList_.isEmpty());
+    bool isEmpty() const
+    {
+        return (memberMap_.isEmpty() && inheritedMembers_.isEmpty()
+                && reimplementedMemberMap_.isEmpty() && classMapList_.isEmpty());
     }
 
     Style style() const { return style_; }
@@ -101,7 +103,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); }
@@ -112,8 +114,8 @@ private:
     QString sortName(const Node *node, const QString *name = nullptr);
 
 private:
-    Style   style_;
-    Status  status_;
+    Style style_;
+    Status status_;
     QString title_;
     QString divClass_;
     QString singular_;
@@ -125,7 +127,7 @@ private:
     NodeVector members_;
     NodeVector obsoleteMembers_;
     NodeVector reimplementedMembers_;
-    QList<QPair<Aggregate *, int> > inheritedMembers_;
+    QVector<QPair<Aggregate *, int>> inheritedMembers_;
     ClassKeysNodesList classKeysNodesList_;
 
     QMultiMap<QString, Node *> memberMap_;
@@ -247,7 +249,6 @@ private:
     static SectionVector stdQmlTypeDetailsSections_;
     static SectionVector sinceSections_;
     static SectionVector allMembers_;
-
 };
 
 QT_END_NAMESPACE