summaryrefslogtreecommitdiffstats
path: root/src/corelib/doc/src
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2023-12-12 09:52:14 +0100
committerMarc Mutz <marc.mutz@qt.io>2023-12-13 07:56:48 +0100
commitec67d0c942a7756afbb6e21c76e835efd3557427 (patch)
tree1f5dad4e6eead7ad520faff9302fae04664a7ba7 /src/corelib/doc/src
parent87361727ffafbee460970cdb8e72056653fd2443 (diff)
Replace QPair with std::pair in the docs
QPair _is_ std::pair. It's confusing that debuggers consistently show the real name, std::pair, while the API and docs continue to maintain the illusion that there is such a thing as QPair. Use std::pair everywhere. Pick-to: 6.7 6.6 6.5 Task-number: QTBUG-115841 Change-Id: I009e2fc415a79a74b583a13cf11e4ff9483a7f6b Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Diffstat (limited to 'src/corelib/doc/src')
-rw-r--r--src/corelib/doc/src/datastreamformat.qdoc2
-rw-r--r--src/corelib/doc/src/foreach-keyword.qdoc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/doc/src/datastreamformat.qdoc b/src/corelib/doc/src/datastreamformat.qdoc
index b1b2e6ba34..978a233982 100644
--- a/src/corelib/doc/src/datastreamformat.qdoc
+++ b/src/corelib/doc/src/datastreamformat.qdoc
@@ -46,7 +46,7 @@
\li QMap<Key, T>
\li QMargins
\li QMatrix4x4
- \li QPair<T1, T2>
+ \li std::pair<T1, T2>
\li QPalette
\li QPen
\li QPicture
diff --git a/src/corelib/doc/src/foreach-keyword.qdoc b/src/corelib/doc/src/foreach-keyword.qdoc
index 780be6e09c..e0109f1f0c 100644
--- a/src/corelib/doc/src/foreach-keyword.qdoc
+++ b/src/corelib/doc/src/foreach-keyword.qdoc
@@ -31,7 +31,7 @@
\snippet code/doc_src_containers.cpp 16
- Unless the data type contains a comma (e.g., \c{QPair<int,
+ Unless the data type contains a comma (e.g., \c{std::pair<int,
int>}), the variable used for iteration can be defined within the
\c foreach statement: