QDoc: prefer std::pair over QPair

Following the replacement in DocBookGenerator, replace
the use of QPair with std::pair across QDoc's code base
for consistency.

Change-Id: I2fc9f5f730a1bc570133b07d9eabad56d27ed9e8
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
Reviewed-by: Thibaut Cuvelier <cuvelier.thibaut@gmail.com>
(cherry picked from commit 2be66f9f8f609bc3cbd467ccf73b7ecfcad19c55)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

13 files changed, 31 insertions, 35 deletions

diff --git a/src/qdoc/config.h b/src/qdoc/config.h
index c4d2d40c7..58413ae62 100644
--- a/src/qdoc/config.h
+++ b/src/qdoc/config.h
@@ -9,7 +9,6 @@
 #include "singleton.h"
 
 #include <QtCore/qmap.h>
-#include <QtCore/qpair.h>
 #include <QtCore/qset.h>
 #include <QtCore/qstack.h>
 #include <QtCore/qstringlist.h>
diff --git a/src/qdoc/doc.h b/src/qdoc/doc.h
index 6a7843d69..9499ec6a8 100644
--- a/src/qdoc/doc.h
+++ b/src/qdoc/doc.h
@@ -23,7 +23,7 @@ class DocPrivate;
 class Quoter;
 class Text;
 
-typedef QPair<QString, QString> ArgPair;
+typedef std::pair<QString, QString> ArgPair;
 typedef QList<ArgPair> ArgList;
 typedef QMultiMap<QString, QString> QStringMultiMap;
 
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index e72cd9fcc..6c50fa14d 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -777,7 +777,7 @@ qsizetype HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, Co
         if (atom->string() == ATOM_LIST_TAG) {
             out() << "<dt>";
         } else { // (atom->string() == ATOM_LIST_VALUE)
-            QPair<QString, int> pair = getAtomListValue(atom);
+            std::pair<QString, int> pair = getAtomListValue(atom);
             skipAhead = pair.second;
             QString t = protectEnc(plainCode(marker->markedUpEnumValue(pair.first, relative)));
             out() << "<tr><td class=\"topAlign\"><code>" << t << "</code>";
@@ -883,7 +883,7 @@ qsizetype HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, Co
         }
         break;
     case Atom::TableLeft: {
-        QPair<QString, QString> pair = getTableWidthAttr(atom);
+        std::pair<QString, QString> pair = getTableWidthAttr(atom);
         QString attr = pair.second;
         QString width = pair.first;
 
@@ -1753,8 +1753,8 @@ void HtmlGenerator::generateHeader(const QString &title, const Node *node, CodeM
     refMap.clear();
 
     if (node && !node->links().empty()) {
-        QPair<QString, QString> linkPair;
-        QPair<QString, QString> anchorPair;
+        std::pair<QString, QString> linkPair;
+        std::pair<QString, QString> anchorPair;
         const Node *linkNode;
         bool useSeparator = false;
 
@@ -3085,7 +3085,7 @@ void HtmlGenerator::generateSectionList(const Section &section, const Node *rela
 
 void HtmlGenerator::generateSectionInheritedList(const Section &section, const Node *relative)
 {
-    const QList<QPair<Aggregate *, int>> &inheritedMembers = section.inheritedMembers();
+    const QList<std::pair<Aggregate *, int>> &inheritedMembers = section.inheritedMembers();
     for (const auto &member : inheritedMembers) {
         out() << "<li class=\"fn\">";
         out() << member.second << ' ';
diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp
index f2a9bb50f..eaca9e697 100644
--- a/src/qdoc/main.cpp
+++ b/src/qdoc/main.cpp
@@ -44,7 +44,7 @@ bool creationTimeBefore(const QFileInfo &fi1, const QFileInfo &fi2)
 }
 
 #ifndef QT_NO_TRANSLATION
-typedef QPair<QString, QTranslator *> Translator;
+typedef std::pair<QString, QTranslator *> Translator;
 static QList<Translator> translators;
 #endif
 
diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp
index e5fd9eb85..dec7ea217 100644
--- a/src/qdoc/node.cpp
+++ b/src/qdoc/node.cpp
@@ -988,7 +988,7 @@ bool Node::fromFlagValue(FlagValue fv, bool defaultValue)
  */
 void Node::setLink(LinkType linkType, const QString &link, const QString &desc)
 {
-    QPair<QString, QString> linkPair;
+    std::pair<QString, QString> linkPair;
     linkPair.first = link;
     linkPair.second = desc;
     m_linkMap[linkType] = linkPair;
@@ -1538,7 +1538,7 @@ void Node::setDeprecatedSince(const QString &sinceVersion)
   \c false. I don't know what the tag is used for.
  */
 
-/*! \fn const QMap<LinkType, QPair<QString, QString> > &Node::links() const
+/*! \fn const QMap<LinkType, std::pair<QString, QString> > &Node::links() const
   Returns a reference to this node's link map. The link map should
   probably be moved to the PageNode, because it contains links to the
   start page, next page, previous page, and contents page, and these
diff --git a/src/qdoc/node.h b/src/qdoc/node.h
index 197e4d340..5b6f8cdda 100644
--- a/src/qdoc/node.h
+++ b/src/qdoc/node.h
@@ -15,7 +15,6 @@
 #include <QtCore/qdir.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qmap.h>
-#include <QtCore/qpair.h>
 #include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
@@ -283,7 +282,7 @@ public:
     void setDeprecatedSince(const QString &sinceVersion);
     [[nodiscard]] const QString &deprecatedSince() const { return m_deprecatedSince; }
 
-    [[nodiscard]] const QMap<LinkType, QPair<QString, QString>> &links() const { return m_linkMap; }
+    [[nodiscard]] const QMap<LinkType, std::pair<QString, QString>> &links() const { return m_linkMap; }
     void setLink(LinkType linkType, const QString &link, const QString &desc);
     [[nodiscard]] const Node *navigationParent() const { return m_navParent; }
     void setNavigationParent(const Node *parent) { m_navParent = parent; }
@@ -362,7 +361,7 @@ private:
     Location m_declLocation {};
     Location m_defLocation {};
     Doc m_doc {};
-    QMap<LinkType, QPair<QString, QString>> m_linkMap {};
+    QMap<LinkType, std::pair<QString, QString>> m_linkMap {};
     QString m_fileNameBase {};
     QString m_physicalModuleName {};
     QString m_url {};
diff --git a/src/qdoc/qdocindexfiles.cpp b/src/qdoc/qdocindexfiles.cpp
index 608f8d8cf..3d899ffcc 100644
--- a/src/qdoc/qdocindexfiles.cpp
+++ b/src/qdoc/qdocindexfiles.cpp
@@ -226,7 +226,7 @@ void QDocIndexFiles::readIndexSection(QXmlStreamReader &reader, Node *current,
             QString bases = attributes.value(QLatin1String("bases")).toString();
             if (!bases.isEmpty())
                 m_basesList.append(
-                        QPair<ClassNode *, QString>(static_cast<ClassNode *>(node), bases));
+                        std::pair<ClassNode *, QString>(static_cast<ClassNode *>(node), bases));
         }
         if (!indexUrl.isEmpty())
             location = Location(indexUrl + QLatin1Char('/') + name.toLower() + ".html");
diff --git a/src/qdoc/qdocindexfiles.h b/src/qdoc/qdocindexfiles.h
index 4c603a007..f66980726 100644
--- a/src/qdoc/qdocindexfiles.h
+++ b/src/qdoc/qdocindexfiles.h
@@ -61,7 +61,7 @@ private:
     QDocDatabase *m_qdb {};
     Generator *m_gen {};
     QString m_project;
-    QList<QPair<ClassNode *, QString>> m_basesList;
+    QList<std::pair<ClassNode *, QString>> m_basesList;
     NodeList m_relatedNodes;
     bool m_storeLocationInfo;
 };
diff --git a/src/qdoc/sections.cpp b/src/qdoc/sections.cpp
index 02d2ad6be..480e247f9 100644
--- a/src/qdoc/sections.cpp
+++ b/src/qdoc/sections.cpp
@@ -175,7 +175,7 @@ void Section::insert(Node *node)
             if (inherited && (node->parent()->isClassNode() || node->parent()->isNamespace())) {
                 if (m_inheritedMembers.isEmpty()
                     || m_inheritedMembers.last().first != node->parent()) {
-                    QPair<Aggregate *, int> p(node->parent(), 0);
+                    std::pair<Aggregate *, int> p(node->parent(), 0);
                     m_inheritedMembers.append(p);
                 }
                 m_inheritedMembers.last().second++;
diff --git a/src/qdoc/sections.h b/src/qdoc/sections.h
index 6969030f9..0260be67c 100644
--- a/src/qdoc/sections.h
+++ b/src/qdoc/sections.h
@@ -6,18 +6,16 @@
 
 #include "node.h"
 
-#include <QtCore/qpair.h>
-
 QT_BEGIN_NAMESPACE
 
 class Aggregate;
 
 typedef QMultiMap<QString, Node *> MemberMap; // the string is the member signature
-typedef QPair<const QmlTypeNode *, MemberMap> ClassMap; // the node is the QML type
+typedef std::pair<const QmlTypeNode *, MemberMap> ClassMap; // the node is the QML type
 typedef QList<ClassMap *> ClassMapList;
 
-typedef QPair<QStringList, NodeVector> KeysAndNodes;
-typedef QPair<const QmlTypeNode *, KeysAndNodes> ClassKeysNodes;
+typedef std::pair<QStringList, NodeVector> KeysAndNodes;
+typedef std::pair<const QmlTypeNode *, KeysAndNodes> ClassKeysNodes;
 typedef QList<ClassKeysNodes *> ClassKeysNodesList;
 
 class Section
@@ -82,7 +80,7 @@ public:
     }
     [[nodiscard]] const NodeVector &members() const { return m_members; }
     [[nodiscard]] const NodeVector &reimplementedMembers() const { return m_reimplementedMembers; }
-    [[nodiscard]] const QList<QPair<Aggregate *, int>> &inheritedMembers() const
+    [[nodiscard]] const QList<std::pair<Aggregate *, int>> &inheritedMembers() const
     {
         return m_inheritedMembers;
     }
@@ -109,7 +107,7 @@ private:
     NodeVector m_members {};
     NodeVector m_obsoleteMembers {};
     NodeVector m_reimplementedMembers {};
-    QList<QPair<Aggregate *, int>> m_inheritedMembers {};
+    QList<std::pair<Aggregate *, int>> m_inheritedMembers {};
     ClassKeysNodesList m_classKeysNodesList {};
 
     QMultiMap<QString, Node *> m_memberMap {};
diff --git a/src/qdoc/webxmlgenerator.cpp b/src/qdoc/webxmlgenerator.cpp
index eb55ef06e..e3da42236 100644
--- a/src/qdoc/webxmlgenerator.cpp
+++ b/src/qdoc/webxmlgenerator.cpp
@@ -834,7 +834,7 @@ void WebXMLGenerator::endLink(QXmlStreamWriter &writer)
 void WebXMLGenerator::generateRelations(QXmlStreamWriter &writer, const Node *node)
 {
     if (node && !node->links().empty()) {
-        QPair<QString, QString> anchorPair;
+        std::pair<QString, QString> anchorPair;
         const Node *linkNode;
 
         for (auto it = node->links().cbegin(); it != node->links().cend(); ++it) {
diff --git a/src/qdoc/xmlgenerator.cpp b/src/qdoc/xmlgenerator.cpp
index 1db363d1f..8b8f61303 100644
--- a/src/qdoc/xmlgenerator.cpp
+++ b/src/qdoc/xmlgenerator.cpp
@@ -128,16 +128,16 @@ void XmlGenerator::setImageFileName(const Node *relative, const QString &fileNam
   returns the content of the list entry \a atom (first member of the pair).
   It also returns the number of items to skip ahead (second member of the pair).
  */
-QPair<QString, int> XmlGenerator::getAtomListValue(const Atom *atom)
+std::pair<QString, int> XmlGenerator::getAtomListValue(const Atom *atom)
 {
     const Atom *lookAhead = atom->next();
     if (!lookAhead)
-        return QPair<QString, int>(QString(), 1);
+        return std::pair<QString, int>(QString(), 1);
 
     QString t = lookAhead->string();
     lookAhead = lookAhead->next();
     if (!lookAhead || lookAhead->type() != Atom::ListTagRight)
-        return QPair<QString, int>(QString(), 1);
+        return std::pair<QString, int>(QString(), 1);
 
     lookAhead = lookAhead->next();
     int skipAhead;
@@ -152,7 +152,7 @@ QPair<QString, int> XmlGenerator::getAtomListValue(const Atom *atom)
     } else {
         skipAhead = 1;
     }
-    return QPair<QString, int>(t, skipAhead);
+    return std::pair<QString, int>(t, skipAhead);
 }
 
 /*!
@@ -161,7 +161,7 @@ QPair<QString, int> XmlGenerator::getAtomListValue(const Atom *atom)
   the attribute for this table (either "generic" or
   "borderless").
  */
-QPair<QString, QString> XmlGenerator::getTableWidthAttr(const Atom *atom)
+std::pair<QString, QString> XmlGenerator::getTableWidthAttr(const Atom *atom)
 {
     QString p0, p1;
     QString attr = "generic";
@@ -183,7 +183,7 @@ QPair<QString, QString> XmlGenerator::getTableWidthAttr(const Atom *atom)
         else if (p1.contains(QLatin1Char('%')))
             width = p1;
     }
-    return QPair<QString, QString>(width, attr);
+    return std::pair<QString, QString>(width, attr);
 }
 
 /*!
@@ -412,9 +412,9 @@ QString XmlGenerator::getAutoLink(const Atom *atom, const Node *relative, const
     return link;
 }
 
-QPair<QString, QString> XmlGenerator::anchorForNode(const Node *node)
+std::pair<QString, QString> XmlGenerator::anchorForNode(const Node *node)
 {
-    QPair<QString, QString> anchorPair;
+    std::pair<QString, QString> anchorPair;
 
     anchorPair.first = Generator::fileName(node);
     if (node->isTextPageNode())
diff --git a/src/qdoc/xmlgenerator.h b/src/qdoc/xmlgenerator.h
index 26b5a0694..7fe1ed7ca 100644
--- a/src/qdoc/xmlgenerator.h
+++ b/src/qdoc/xmlgenerator.h
@@ -29,8 +29,8 @@ protected:
     static void rewritePropertyBrief(const Atom *atom, const Node *relative);
     static Node::NodeType typeFromString(const Atom *atom);
     static void setImageFileName(const Node *relative, const QString &fileName);
-    static QPair<QString, int> getAtomListValue(const Atom *atom);
-    static QPair<QString, QString> getTableWidthAttr(const Atom *atom);
+    static std::pair<QString, int> getAtomListValue(const Atom *atom);
+    static std::pair<QString, QString> getTableWidthAttr(const Atom *atom);
 
     QString registerRef(const QString &ref);
     QString refForNode(const Node *node);
@@ -39,7 +39,7 @@ protected:
     QString getAutoLink(const Atom *atom, const Node *relative, const Node **node,
                         Node::Genus = Node::DontCare);
 
-    QPair<QString, QString> anchorForNode(const Node *node);
+    std::pair<QString, QString> anchorForNode(const Node *node);
 
     static QString targetType(const Node *node);