diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 18:33:02 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-26 19:40:45 +0000 |
commit | f3060312c89344744832e3352fe4f53efcb94c9b (patch) | |
tree | de69be5e25a1acd3207a8952376f634fe94fefcc /src/corelib/doc | |
parent | c29d3692d700f7ef6d5833242878b4ec6f81c928 (diff) | |
parent | a15c3d086dafea83e4760f0b447be43d26b80697 (diff) |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/doc')
-rw-r--r-- | src/corelib/doc/snippets/code/doc_src_containers.cpp | 7 | ||||
-rw-r--r-- | src/corelib/doc/src/containers.qdoc | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/corelib/doc/snippets/code/doc_src_containers.cpp b/src/corelib/doc/snippets/code/doc_src_containers.cpp index 395e48bc89..5b0d829367 100644 --- a/src/corelib/doc/snippets/code/doc_src_containers.cpp +++ b/src/corelib/doc/snippets/code/doc_src_containers.cpp @@ -156,10 +156,9 @@ for (i = list.begin(); i != list.end(); ++i) QList<QString> list; list << "A" << "B" << "C" << "D"; -QList<QString>::iterator i = list.end(); -while (i != list.begin()) { - --i; - *i = (*i).toLower(); +QList<QString>::reverse_iterator i; +for (i = list.rbegin(); i != list.rend(); ++i) + *i = i->toLower(); } //! [11] diff --git a/src/corelib/doc/src/containers.qdoc b/src/corelib/doc/src/containers.qdoc index 0ae3817ac7..988f728946 100644 --- a/src/corelib/doc/src/containers.qdoc +++ b/src/corelib/doc/src/containers.qdoc @@ -472,9 +472,7 @@ \image stliterators1.png - Iterating backward with an STL-style iterator requires us to - decrement the iterator \e before we access the item. This - requires a \c while loop: + Iterating backward with an STL-style iterator is done with reverse iterators: \snippet code/doc_src_containers.cpp 11 |