diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 10:03:48 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 10:03:48 +0100 |
| commit | 95d6f8a4cf3fba2fd675f0e6b5de0ce1d702da26 (patch) | |
| tree | a0bb36e478c97761afa36baf8026726b3d2fdbc8 /src/corelib/tools/qstring.h | |
| parent | 3f64a7b67bfbcaab65ebb03f84962cce5834790b (diff) | |
| parent | 25e004bfe493e18be255b057ae5c132a5ec5458b (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/tools/qvector.h
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6
Diffstat (limited to 'src/corelib/tools/qstring.h')
| -rw-r--r-- | src/corelib/tools/qstring.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 781afc5bba..fa5ef3bbf0 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -573,9 +573,11 @@ public: typedef const_iterator ConstIterator; iterator begin(); const_iterator begin() const; + const_iterator cbegin() const; const_iterator constBegin() const; iterator end(); const_iterator end() const; + const_iterator cend() const; const_iterator constEnd() const; // STL compatibility @@ -921,12 +923,16 @@ inline QString::iterator QString::begin() { detach(); return reinterpret_cast<QChar*>(d->data()); } inline QString::const_iterator QString::begin() const { return reinterpret_cast<const QChar*>(d->data()); } +inline QString::const_iterator QString::cbegin() const +{ return reinterpret_cast<const QChar*>(d->data()); } inline QString::const_iterator QString::constBegin() const { return reinterpret_cast<const QChar*>(d->data()); } inline QString::iterator QString::end() { detach(); return reinterpret_cast<QChar*>(d->data() + d->size); } inline QString::const_iterator QString::end() const { return reinterpret_cast<const QChar*>(d->data() + d->size); } +inline QString::const_iterator QString::cend() const +{ return reinterpret_cast<const QChar*>(d->data() + d->size); } inline QString::const_iterator QString::constEnd() const { return reinterpret_cast<const QChar*>(d->data() + d->size); } inline bool QString::contains(const QString &s, Qt::CaseSensitivity cs) const |