diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2022-08-09 08:09:42 +0200 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2022-08-09 14:13:26 +0200 |
| commit | 2be66f9f8f609bc3cbd467ccf73b7ecfcad19c55 (patch) | |
| tree | 8dd8f3270791db2bc2b7bb3bc46e602a52969dc4 /src/qdoc/xmlgenerator.cpp | |
| parent | 3315e0deb50c11c2a2c6461656f407da9619de92 (diff) | |
| download | qttools-2be66f9f8f609bc3cbd467ccf73b7ecfcad19c55.tar.gz | |
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.
Pick-to: 6.4
Change-Id: I2fc9f5f730a1bc570133b07d9eabad56d27ed9e8
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
Reviewed-by: Thibaut Cuvelier <cuvelier.thibaut@gmail.com>
Diffstat (limited to 'src/qdoc/xmlgenerator.cpp')
| -rw-r--r-- | src/qdoc/xmlgenerator.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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()) |