diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
| commit | 4456984da780b14572e1ec0f079a4d349ab299bd (patch) | |
| tree | f586a281a81c57c91c49e83a5d3ec6c7eece0578 /src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp | |
| parent | e824abd987d77efaa085fe1f9fb514d270798d55 (diff) | |
| parent | 281121697340084f7d385eab530f41916789b94d (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
Diffstat (limited to 'src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp')
| -rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp index 29e53fc700..3241991129 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp @@ -234,7 +234,7 @@ for (i = map.begin(); i != map.end(); ++i) //! [20] QMap<QString, int>::iterator i = map.begin(); while (i != map.end()) { - if (i.key().startsWith("_")) + if (i.key().startsWith('_')) i = map.erase(i); else ++i; @@ -247,7 +247,7 @@ QMap<QString, int>::iterator i = map.begin(); while (i != map.end()) { QMap<QString, int>::iterator prev = i; ++i; - if (prev.key().startsWith("_")) + if (prev.key().startsWith('_')) map.erase(prev); } //! [21] @@ -256,7 +256,7 @@ while (i != map.end()) { //! [22] // WRONG while (i != map.end()) { - if (i.key().startsWith("_")) + if (i.key().startsWith('_')) map.erase(i); ++i; } |