1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Documentation: Modernize the Qt container doc snippets

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

Task-number: QTBUG-108687
Change-Id: I8482638cda63e21feaa7ca21370e7947dfb4b606
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 56c8033d3e6b7874c046fdddc27e80e3ee3c0055)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Friedemann Kleint 2022-11-21 11:46:31 +01:00 committed by Qt Cherry-pick Bot
parent 7b9f01e0f4
commit 8aeee132f5
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/corelib/doc/snippets/code/doc_src_containers.cpp
View File

@ -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]