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/qmap.cpp | |
| 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/qmap.cpp')
| -rw-r--r-- | src/corelib/tools/qmap.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp index c922d7aab0..b585bdbbc8 100644 --- a/src/corelib/tools/qmap.cpp +++ b/src/corelib/tools/qmap.cpp @@ -682,6 +682,15 @@ void QMapData::dump() \overload */ +/*! \fn QMap::const_iterator QMap::cbegin() const + \since 5.0 + + Returns a const \l{STL-style iterator} pointing to the first item + in the map. + + \sa begin(), cend() +*/ + /*! \fn QMap::const_iterator QMap::constBegin() const Returns a const \l{STL-style iterator} pointing to the first item @@ -703,6 +712,15 @@ void QMapData::dump() \overload */ +/*! \fn QMap::const_iterator QMap::cend() const + \since 5.0 + + Returns a const \l{STL-style iterator} pointing to the imaginary + item after the last item in the map. + + \sa cbegin(), end() +*/ + /*! \fn QMap::const_iterator QMap::constEnd() const Returns a const \l{STL-style iterator} pointing to the imaginary @@ -744,7 +762,7 @@ void QMapData::dump() \overload */ -/*! \fn QMap::iterator QMap::constFind(const Key &key) const +/*! \fn QMap::const_iterator QMap::constFind(const Key &key) const \since 4.1 Returns an const iterator pointing to the item with key \a key in the |