diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2011-08-29 17:49:48 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-17 09:10:57 +0100 |
| commit | d823646db3e9f72569717dc656e5b2e4d3ce7709 (patch) | |
| tree | 734f7f11b381eb890d406b05f93424e3081795d6 /tests/auto/corelib/tools/qset | |
| parent | 7c7e47493edec987569a60e12456de5a2c62a230 (diff) | |
containers: add C++11-style c{begin,end}() as alias for const{Begin,End}()
C++11 adds cbegin()/cend() functions for the same reason Qt has
constBegin()/constEnd(). This patch adds these functions to the
Qt containers with the same implementation as constBegin()/constEnd().
It also fixes the return types in the documentation of existing
constFind() functions (documentation only).
C++11 only adds cbegin()/cend() (and crbegin()/crend(), which Qt doesn't have).
In particular, it doesn't add cfind(), so I didn't supply these, even though
Qt comes with constFind().
This is a forward-port of https://qt.gitorious.org/qt/qt/merge_requests/1365.
Change-Id: Ida086b64246b24e25254eafbcb06c8e33388502b
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests/auto/corelib/tools/qset')
| -rw-r--r-- | tests/auto/corelib/tools/qset/tst_qset.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/corelib/tools/qset/tst_qset.cpp b/tests/auto/corelib/tools/qset/tst_qset.cpp index d7d8c99071..ee83339d50 100644 --- a/tests/auto/corelib/tools/qset/tst_qset.cpp +++ b/tests/auto/corelib/tools/qset/tst_qset.cpp @@ -393,9 +393,9 @@ void tst_QSet::begin() { QSet<int>::const_iterator i = set1.constBegin(); - QSet<int>::const_iterator j = set1.constBegin(); + QSet<int>::const_iterator j = set1.cbegin(); QSet<int>::const_iterator k = set2.constBegin(); - QSet<int>::const_iterator ell = set2.constBegin(); + QSet<int>::const_iterator ell = set2.cbegin(); QVERIFY(i == j); QVERIFY(k == ell); @@ -407,9 +407,9 @@ void tst_QSet::begin() { QSet<int>::const_iterator i = set1.constBegin(); - QSet<int>::const_iterator j = set1.constBegin(); + QSet<int>::const_iterator j = set1.cbegin(); QSet<int>::const_iterator k = set2.constBegin(); - QSet<int>::const_iterator ell = set2.constBegin(); + QSet<int>::const_iterator ell = set2.cbegin(); QVERIFY(i == j); QVERIFY(k == ell); @@ -421,9 +421,9 @@ void tst_QSet::begin() { QSet<int>::const_iterator i = set1.constBegin(); - QSet<int>::const_iterator j = set1.constBegin(); + QSet<int>::const_iterator j = set1.cbegin(); QSet<int>::const_iterator k = set2.constBegin(); - QSet<int>::const_iterator ell = set2.constBegin(); + QSet<int>::const_iterator ell = set2.cbegin(); QVERIFY(i == j); QVERIFY(k == ell); @@ -439,9 +439,9 @@ void tst_QSet::end() { QSet<int>::const_iterator i = set1.constEnd(); - QSet<int>::const_iterator j = set1.constEnd(); + QSet<int>::const_iterator j = set1.cend(); QSet<int>::const_iterator k = set2.constEnd(); - QSet<int>::const_iterator ell = set2.constEnd(); + QSet<int>::const_iterator ell = set2.cend(); QVERIFY(i == j); QVERIFY(k == ell); @@ -456,9 +456,9 @@ void tst_QSet::end() { QSet<int>::const_iterator i = set1.constEnd(); - QSet<int>::const_iterator j = set1.constEnd(); + QSet<int>::const_iterator j = set1.cend(); QSet<int>::const_iterator k = set2.constEnd(); - QSet<int>::const_iterator ell = set2.constEnd(); + QSet<int>::const_iterator ell = set2.cend(); QVERIFY(i == j); QVERIFY(k == ell); @@ -473,9 +473,9 @@ void tst_QSet::end() { QSet<int>::const_iterator i = set1.constEnd(); - QSet<int>::const_iterator j = set1.constEnd(); + QSet<int>::const_iterator j = set1.cend(); QSet<int>::const_iterator k = set2.constEnd(); - QSet<int>::const_iterator ell = set2.constEnd(); + QSet<int>::const_iterator ell = set2.cend(); QVERIFY(i == j); QVERIFY(k == ell); |