From 713967ae3066eabaee1148eabfd0d3ababb618e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Thu, 6 Jan 2022 14:46:40 +0100 Subject: Doc: Make QListIterator snippets more robust qDebug() << i.next(); can become a NOOP if the code is compiled with QT_NO_DEBUG_OUTPUT. Pick-to: 5.15 6.2 6.3 Fixes: QTBUG-97535 Change-Id: I9085b40ac9b4de2bb06f16e03fd5100902b08d4f Reviewed-by: Marc Mutz --- src/corelib/doc/snippets/code/doc_src_containers.cpp | 10 ++++++---- src/corelib/doc/snippets/code/doc_src_qiterator.cpp | 14 +++++++------- src/corelib/doc/snippets/code/doc_src_qset.cpp | 6 ++++-- .../doc/snippets/code/src_corelib_io_qdiriterator.cpp | 4 ++-- .../doc/snippets/code/src_corelib_text_qstringiterator.cpp | 2 +- .../doc/snippets/code/src_corelib_thread_qfuture.cpp | 4 ++-- src/corelib/doc/src/java-style-iterators.qdoc | 2 +- 7 files changed, 23 insertions(+), 19 deletions(-) (limited to 'src/corelib/doc') diff --git a/src/corelib/doc/snippets/code/doc_src_containers.cpp b/src/corelib/doc/snippets/code/doc_src_containers.cpp index 834056174f..47cfb0dc51 100644 --- a/src/corelib/doc/snippets/code/doc_src_containers.cpp +++ b/src/corelib/doc/snippets/code/doc_src_containers.cpp @@ -70,7 +70,7 @@ list << "A" << "B" << "C" << "D"; QListIterator i(list); while (i.hasNext()) - qDebug() << i.next(); + QString s = i.next(); //! [1] @@ -78,7 +78,7 @@ while (i.hasNext()) QListIterator i(list); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + QString s = i.previous(); //! [2] @@ -216,8 +216,10 @@ foreach (str, values) QList values; ... QListIterator i(values); -while (i.hasNext()) - qDebug() << i.next(); +while (i.hasNext()) { + QString s = i.next(); + qDebug() << s; +} //! [16] diff --git a/src/corelib/doc/snippets/code/doc_src_qiterator.cpp b/src/corelib/doc/snippets/code/doc_src_qiterator.cpp index 44801dda09..cc54b2b8fb 100644 --- a/src/corelib/doc/snippets/code/doc_src_qiterator.cpp +++ b/src/corelib/doc/snippets/code/doc_src_qiterator.cpp @@ -53,7 +53,7 @@ QList list; ... QListIterator i(list); while (i.hasNext()) - qDebug() << i.next(); + float f = i.next(); //! [0] @@ -61,7 +61,7 @@ while (i.hasNext()) QListIterator i(list); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + float f = i.previous(); //! [1] //! [6] @@ -69,7 +69,7 @@ QSet set; ... QSetIterator i(set); while (i.hasNext()) - qDebug() << i.next(); + float f = i.next(); //! [6] @@ -77,7 +77,7 @@ while (i.hasNext()) QSetIterator i(set); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + QString s = i.previous(); //! [7] @@ -86,7 +86,7 @@ QList list; ... QMutableListIterator i(list); while (i.hasNext()) - qDebug() << i.next(); + float f = i.next(); //! [8] @@ -94,7 +94,7 @@ while (i.hasNext()) QMutableListIterator i(list); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + float f = i.previous(); //! [9] @@ -115,7 +115,7 @@ QSet set; ... QMutableSetIterator i(set); while (i.hasNext()) - qDebug() << i.next(); + float f = i.next(); //! [17] //! [19] diff --git a/src/corelib/doc/snippets/code/doc_src_qset.cpp b/src/corelib/doc/snippets/code/doc_src_qset.cpp index 96ef07738b..d95d960d8f 100644 --- a/src/corelib/doc/snippets/code/doc_src_qset.cpp +++ b/src/corelib/doc/snippets/code/doc_src_qset.cpp @@ -73,8 +73,10 @@ if (!set.contains("ninety-nine")) //! [4] QSetIterator i(set); -while (i.hasNext()) - qDebug() << i.next(); +while (i.hasNext()) { + QWidget *w = i.next(); + qDebug() << w; +} //! [4] diff --git a/src/corelib/doc/snippets/code/src_corelib_io_qdiriterator.cpp b/src/corelib/doc/snippets/code/src_corelib_io_qdiriterator.cpp index 56cf9ed699..39fb629b94 100644 --- a/src/corelib/doc/snippets/code/src_corelib_io_qdiriterator.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_io_qdiriterator.cpp @@ -51,8 +51,8 @@ //! [0] QDirIterator it("/etc", QDirIterator::Subdirectories); while (it.hasNext()) { - qDebug() << it.next(); - + QString dir = it.next(); + qDebug() << dir; // /etc/. // /etc/.. // /etc/X11 diff --git a/src/corelib/doc/snippets/code/src_corelib_text_qstringiterator.cpp b/src/corelib/doc/snippets/code/src_corelib_text_qstringiterator.cpp index 8085e32787..22c30edc2c 100644 --- a/src/corelib/doc/snippets/code/src_corelib_text_qstringiterator.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_text_qstringiterator.cpp @@ -63,7 +63,7 @@ QStringIterator i(string); // implicitly converted to QStringView //! [1] while (i.hasNext()) - qDebug() << i.next(); + uint c = i.next(); //! [1] } diff --git a/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp b/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp index 176fb4a043..ffb78dc4c8 100644 --- a/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp @@ -62,7 +62,7 @@ QFuture future; ... QFutureIterator i(future); while (i.hasNext()) - qDebug() << i.next(); + QString s = i.next(); //! [1] @@ -70,7 +70,7 @@ while (i.hasNext()) QFutureIterator i(future); i.toBack(); while (i.hasPrevious()) - qDebug() << i.previous(); + QString s = i.previous(); //! [2] //! [3] diff --git a/src/corelib/doc/src/java-style-iterators.qdoc b/src/corelib/doc/src/java-style-iterators.qdoc index 69b9592996..7e3c9db69b 100644 --- a/src/corelib/doc/src/java-style-iterators.qdoc +++ b/src/corelib/doc/src/java-style-iterators.qdoc @@ -71,7 +71,7 @@ \image javaiterators1.png Here's a typical loop for iterating through all the elements of a - QList in order and printing them to the console: + QList in order: \snippet code/doc_src_containers.cpp 1 -- cgit v1.2.3