summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThibaut Cuvelier <cuvelier.thibaut@gmail.com>2022-07-03 03:56:15 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-08-09 15:29:20 +0000
commitb1d954cd9c1b0416e6a78554aa6a25e4bc535bc9 (patch)
treeec1f211c4e3ba27123e095f11731652ee5a72f28
parent4e708f5be7117d84ad9691df7e72b99034259da2 (diff)
Replace occurrences of QPair with std::pair
Change-Id: I5827e23bf4d2e4df31a4309c9d54db0496c36331 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 8afe81bd980e8134981c90e9ca0cd159a474e91a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qdoc/docbookgenerator.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qdoc/docbookgenerator.cpp b/src/qdoc/docbookgenerator.cpp
index b1e7cf628..9b08a7833 100644
--- a/src/qdoc/docbookgenerator.cpp
+++ b/src/qdoc/docbookgenerator.cpp
@@ -649,7 +649,7 @@ qsizetype DocBookGenerator::generateAtom(const Atom *atom, const Node *relative)
newLine();
m_writer->writeStartElement(dbNamespace, "item");
} else { // (atom->string() == ATOM_LIST_VALUE)
- QPair<QString, int> pair = getAtomListValue(atom);
+ std::pair<QString, int> pair = getAtomListValue(atom);
skipAhead = pair.second;
m_writer->writeStartElement(dbNamespace, "tr");
@@ -816,7 +816,7 @@ qsizetype DocBookGenerator::generateAtom(const Atom *atom, const Node *relative)
m_writer->writeCharacters(atom->string());
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;
@@ -1500,8 +1500,8 @@ void DocBookGenerator::generateHeader(const QString &title, const QString &subTi
// or useSeparator field, as this content is only output in the info tag, not in the main
// content).
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;
if (node->links().contains(Node::PreviousLink)) {
@@ -3854,7 +3854,7 @@ void DocBookGenerator::generateSectionList(const Section &section, const Node *r
void DocBookGenerator::generateSectionInheritedList(const Section &section, const Node *relative)
{
// From HtmlGenerator::generateSectionInheritedList.
- QList<QPair<Aggregate *, int>>::ConstIterator p = section.inheritedMembers().constBegin();
+ QList<std::pair<Aggregate *, int>>::ConstIterator p = section.inheritedMembers().constBegin();
while (p != section.inheritedMembers().constEnd()) {
m_writer->writeStartElement(dbNamespace, "listitem");
m_writer->writeCharacters(QString::number((*p).second) + u' ');