From 56c8033d3e6b7874c046fdddc27e80e3ee3c0055 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 21 Nov 2022 11:46:31 +0100
Subject: Documentation: Modernize the Qt container doc snippets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use auto and initializer lists. Avoid repeated instantiations
of end().

Pick-to: 6.4 6.2
Task-number: QTBUG-108687
Change-Id: I8482638cda63e21feaa7ca21370e7947dfb4b606
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
---
 .../doc/snippets/code/doc_src_containers.cpp       | 38 +++++++++-------------
 1 file changed, 15 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/corelib/doc/snippets/code/doc_src_containers.cpp b/src/corelib/doc/snippets/code/doc_src_containers.cpp
index 51d369d1d5..ab7f8c8b7f 100644
--- a/src/corelib/doc/snippets/code/doc_src_containers.cpp
+++ b/src/corelib/doc/snippets/code/doc_src_containers.cpp
@@ -18,8 +18,7 @@ private:
 
 
 //! [1]
-QList<QString> list;
-list << "A" << "B" << "C" << "D";
+QList<QString> list = {"A", "B", "C", "D"};
 
 QListIterator<QString> i(list);
 while (i.hasNext())
@@ -71,11 +70,12 @@ while (i.hasNext())
 
 
 //! [7]
-QMap<QString, QString> map;
-map.insert("Paris", "France");
-map.insert("Guatemala City", "Guatemala");
-map.insert("Mexico City", "Mexico");
-map.insert("Moscow", "Russia");
+QMap<QString, QString> map = {
+    {"Paris", "France"},
+    {"Guatemala City", "Guatemala"},
+    {"Mexico City", "Mexico"},
+    {"Moscow", "Russia"}
+};
 ...
 
 QMutableMapIterator<QString, QString> i(map);
@@ -106,28 +106,23 @@ while (i.findNext(widget))
 
 
 //! [10]
-QList<QString> list;
-list << "A" << "B" << "C" << "D";
+QList<QString> list = {"A", "B", "C", "D"};
 
-QList<QString>::iterator i;
-for (i = list.begin(); i != list.end(); ++i)
+for (auto i = list.begin(), end = list.end(); i != end; ++i)
     *i = (*i).toLower();
 //! [10]
 
 
 //! [11]
-QList<QString> list;
-list << "A" << "B" << "C" << "D";
+QList<QString> list = {"A", "B", "C", "D"};
 
-QList<QString>::reverse_iterator i;
-for (i = list.rbegin(); i != list.rend(); ++i)
+for (auto i = list.rbegin(), rend = list.rend(); i != rend; ++i)
     *i = i->toLower();
 //! [11]
 
 
 //! [12]
-QList<QString>::const_iterator i;
-for (i = list.constBegin(); i != list.constEnd(); ++i)
+for (auto i = list.cbegin(), end = list.cend(); i != end; ++i)
     qDebug() << *i;
 //! [12]
 
@@ -135,8 +130,7 @@ for (i = list.constBegin(); i != list.constEnd(); ++i)
 //! [13]
 QMap<int, int> map;
 ...
-QMap<int, int>::const_iterator i;
-for (i = map.constBegin(); i != map.constEnd(); ++i)
+for (auto i = map.cbegin(), end = map.cend(); i != end; ++i)
     qDebug() << i.key() << ':' << i.value();
 //! [13]
 
@@ -144,13 +138,11 @@ for (i = map.constBegin(); i != map.constEnd(); ++i)
 //! [14]
 // RIGHT
 const QList<int> sizes = splitter->sizes();
-QList<int>::const_iterator i;
-for (i = sizes.begin(); i != sizes.end(); ++i)
+for (auto i = sizes.begin(), end = sizes.end(); i != end; ++i)
     ...
 
 // WRONG
-QList<int>::const_iterator i;
-for (i = splitter->sizes().begin();
+for (auto i = splitter->sizes().begin();
         i != splitter->sizes().end(); ++i)
     ...
 //! [14]
-- 
cgit v1.2.3