summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2022-08-18 16:51:10 +0200
committerKai Köhne <kai.koehne@qt.io>2022-08-24 17:50:25 +0200
commit4b3cb1329a36448bc636c9e43ed53b8b9e102acd (patch)
treea7824ad0db10c2462018dec6525e1733943db928
parent836b2ae1e6c76775b38eb59f0b01c66a83a0fe9a (diff)
Doc: Remove "Container keywords" section from containers.html
For foreach, we just mention that it is deprecated, and forever is not actually directly related to Qt containers. Both macros are also documented in qglobal.cpp, and the section title is not referenced anywhere so this patch won't break any links. Pick-to: 6.4 Change-Id: I6c3e11b205237e5b502173f2216606adf5812f55 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--src/corelib/doc/src/containers.qdoc24
1 files changed, 1 insertions, 23 deletions
diff --git a/src/corelib/doc/src/containers.qdoc b/src/corelib/doc/src/containers.qdoc
index bed184de15..4ff333b7cc 100644
--- a/src/corelib/doc/src/containers.qdoc
+++ b/src/corelib/doc/src/containers.qdoc
@@ -333,28 +333,6 @@
on Java's iterator classes.
New code should should prefer \l{STL-Style Iterators}.
- \section1 Container keywords
-
- \target foreach
- \section2 The foreach Keyword
- \l{foreach-keyword}{The foreach keyword} is discouraged, new code should
- prefer C++11 range-based loops.
-
- \target forever
- \section2 The forever keyword.
- In addition to \c foreach, Qt also provides a \c forever
- pseudo-keyword for infinite loops:
-
- \snippet code/doc_src_containers.cpp 21
-
- If you're worried about namespace pollution, you can disable
- these macros by adding the following line to your \c .pro file:
-
- \snippet code/doc_src_containers.cpp 22
-
- \note The alternative macros Q_FOREACH and Q_FOREVER remain defined
- regardless.
-
\section1 Qt containers compared with std containers
\table
@@ -410,7 +388,7 @@
Qt includes other template classes that resemble containers in
some respects. These classes don't provide iterators and cannot
- be used with the \c foreach keyword.
+ be used with the \l foreach keyword.
\list
\li QCache<Key, T> provides a cache to store objects of a certain