From ad0f3c4edbf7c27dd6e7d427acbe75ee075bbb21 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 6 Dec 2012 09:49:07 +0100 Subject: QtBase: Doc: Fix links to STL-style iterators Change-Id: I2822c2a7e9bfc1949c20ff81e08961f641e961fb Reviewed-by: Jerome Pasion --- src/corelib/doc/src/implicit-sharing.qdoc | 2 +- src/corelib/json/qjsonarray.cpp | 8 ++++---- src/corelib/json/qjsonobject.cpp | 8 ++++---- src/corelib/thread/qfuture.qdoc | 8 ++++---- src/corelib/tools/qhash.cpp | 12 ++++++------ src/corelib/tools/qlinkedlist.cpp | 12 ++++++------ src/corelib/tools/qlist.cpp | 12 ++++++------ src/corelib/tools/qmap.cpp | 12 ++++++------ src/corelib/tools/qset.qdoc | 16 ++++++++-------- src/corelib/tools/qstring.cpp | 12 ++++++------ src/corelib/tools/qvarlengtharray.qdoc | 12 ++++++------ src/corelib/tools/qvector.cpp | 12 ++++++------ 12 files changed, 63 insertions(+), 63 deletions(-) (limited to 'src') diff --git a/src/corelib/doc/src/implicit-sharing.qdoc b/src/corelib/doc/src/implicit-sharing.qdoc index 39ba702d55..baed85fb18 100644 --- a/src/corelib/doc/src/implicit-sharing.qdoc +++ b/src/corelib/doc/src/implicit-sharing.qdoc @@ -135,7 +135,7 @@ \warning Do not copy an implicitly shared container (QMap, QVector, etc.) while you are iterating over it using an non-const - \l{STL-style iterator}. + \l{STL-style iterators}{STL-style iterator}. \keyword implicitly shared classes \annotatedlist shared diff --git a/src/corelib/json/qjsonarray.cpp b/src/corelib/json/qjsonarray.cpp index 0cd436a3b9..a669a5533d 100644 --- a/src/corelib/json/qjsonarray.cpp +++ b/src/corelib/json/qjsonarray.cpp @@ -535,7 +535,7 @@ bool QJsonArray::operator!=(const QJsonArray &other) const /*! \fn QJsonArray::iterator QJsonArray::begin() - Returns an \l{STL-style iterator} pointing to the first item in + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in the array. \sa constBegin(), end() @@ -548,7 +548,7 @@ bool QJsonArray::operator!=(const QJsonArray &other) const /*! \fn QJsonArray::const_iterator QJsonArray::constBegin() const - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the array. \sa begin(), constEnd() @@ -556,7 +556,7 @@ bool QJsonArray::operator!=(const QJsonArray &other) const /*! \fn QJsonArray::iterator QJsonArray::end() - Returns an \l{STL-style iterator} pointing to the imaginary item + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the array. \sa begin(), constEnd() @@ -569,7 +569,7 @@ bool QJsonArray::operator!=(const QJsonArray &other) const /*! \fn QJsonArray::const_iterator QJsonArray::constEnd() const - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the array. \sa constBegin(), end() diff --git a/src/corelib/json/qjsonobject.cpp b/src/corelib/json/qjsonobject.cpp index 728bbbd0ec..e595753fec 100644 --- a/src/corelib/json/qjsonobject.cpp +++ b/src/corelib/json/qjsonobject.cpp @@ -525,7 +525,7 @@ QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const /*! \fn QJsonObject::iterator QJsonObject::begin() - Returns an \l{STL-style iterator} pointing to the first item in + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in the object. \sa constBegin(), end() @@ -538,7 +538,7 @@ QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const /*! \fn QJsonObject::const_iterator QJsonObject::constBegin() const - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the object. \sa begin(), constEnd() @@ -546,7 +546,7 @@ QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const /*! \fn QJsonObject::iterator QJsonObject::end() - Returns an \l{STL-style iterator} pointing to the imaginary item + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the object. \sa begin(), constEnd() @@ -559,7 +559,7 @@ QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const /*! \fn QJsonObject::const_iterator QJsonObject::constEnd() const - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the object. \sa constBegin(), end() diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc index b67d711536..6ba5d564cf 100644 --- a/src/corelib/thread/qfuture.qdoc +++ b/src/corelib/thread/qfuture.qdoc @@ -328,7 +328,7 @@ /*! \fn QFuture::const_iterator QFuture::begin() const - Returns a const \l{STL-style iterator} pointing to the first result in the + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first result in the future. \sa constBegin(), end() @@ -336,7 +336,7 @@ /*! \fn QFuture::const_iterator QFuture::end() const - Returns a const \l{STL-style iterator} pointing to the imaginary result + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary result after the last result in the future. \sa begin(), constEnd() @@ -344,7 +344,7 @@ /*! \fn QFuture::const_iterator QFuture::constBegin() const - Returns a const \l{STL-style iterator} pointing to the first result in the + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first result in the future. \sa begin(), constEnd() @@ -352,7 +352,7 @@ /*! \fn QFuture::const_iterator QFuture::constEnd() const - Returns a const \l{STL-style iterator} pointing to the imaginary result + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary result after the last result in the future. \sa constBegin(), end() diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index 3fab2f68e6..eca66d75b0 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -1261,7 +1261,7 @@ void QHashData::checkSanity() /*! \fn QHash::iterator QHash::begin() - Returns an \l{STL-style iterator} pointing to the first item in + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in the hash. \sa constBegin(), end() @@ -1275,7 +1275,7 @@ void QHashData::checkSanity() /*! \fn QHash::const_iterator QHash::cbegin() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the hash. \sa begin(), cend() @@ -1283,7 +1283,7 @@ void QHashData::checkSanity() /*! \fn QHash::const_iterator QHash::constBegin() const - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the hash. \sa begin(), constEnd() @@ -1291,7 +1291,7 @@ void QHashData::checkSanity() /*! \fn QHash::iterator QHash::end() - Returns an \l{STL-style iterator} pointing to the imaginary item + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the hash. \sa begin(), constEnd() @@ -1304,7 +1304,7 @@ void QHashData::checkSanity() /*! \fn QHash::const_iterator QHash::constEnd() const - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the hash. \sa constBegin(), end() @@ -1313,7 +1313,7 @@ void QHashData::checkSanity() /*! \fn QHash::const_iterator QHash::cend() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the hash. \sa cbegin(), end() diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp index 025d48b595..0c5894f150 100644 --- a/src/corelib/tools/qlinkedlist.cpp +++ b/src/corelib/tools/qlinkedlist.cpp @@ -320,7 +320,7 @@ const QLinkedListData QLinkedListData::shared_null = { /*! \fn QLinkedList::iterator QLinkedList::begin() - Returns an \l{STL-style iterator} pointing to the first item in + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in the list. \sa constBegin(), end() @@ -334,7 +334,7 @@ const QLinkedListData QLinkedListData::shared_null = { /*! \fn QLinkedList::const_iterator QLinkedList::cbegin() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the list. \sa begin(), cend() @@ -342,7 +342,7 @@ const QLinkedListData QLinkedListData::shared_null = { /*! \fn QLinkedList::const_iterator QLinkedList::constBegin() const - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the list. \sa begin(), constEnd() @@ -350,7 +350,7 @@ const QLinkedListData QLinkedListData::shared_null = { /*! \fn QLinkedList::iterator QLinkedList::end() - Returns an \l{STL-style iterator} pointing to the imaginary item + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the list. \sa begin(), constEnd() @@ -364,7 +364,7 @@ const QLinkedListData QLinkedListData::shared_null = { /*! \fn QLinkedList::const_iterator QLinkedList::cend() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the list. \sa cbegin(), end() @@ -372,7 +372,7 @@ const QLinkedListData QLinkedListData::shared_null = { /*! \fn QLinkedList::const_iterator QLinkedList::constEnd() const - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the list. \sa constBegin(), end() diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp index 4f26b25fec..f31b184f81 100644 --- a/src/corelib/tools/qlist.cpp +++ b/src/corelib/tools/qlist.cpp @@ -915,7 +915,7 @@ void **QListData::erase(void **xi) /*! \fn QList::iterator QList::begin() - Returns an \l{STL-style iterator} pointing to the first item in + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in the list. \sa constBegin(), end() @@ -929,7 +929,7 @@ void **QListData::erase(void **xi) /*! \fn QList::const_iterator QList::cbegin() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the list. \sa begin(), cend() @@ -937,7 +937,7 @@ void **QListData::erase(void **xi) /*! \fn QList::const_iterator QList::constBegin() const - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the list. \sa begin(), constEnd() @@ -945,7 +945,7 @@ void **QListData::erase(void **xi) /*! \fn QList::iterator QList::end() - Returns an \l{STL-style iterator} pointing to the imaginary item + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the list. \sa begin(), constEnd() @@ -959,7 +959,7 @@ void **QListData::erase(void **xi) /*! \fn QList::const_iterator QList::cend() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the list. \sa cbegin(), end() @@ -967,7 +967,7 @@ void **QListData::erase(void **xi) /*! \fn QList::const_iterator QList::constEnd() const - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the list. \sa constBegin(), end() diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp index 7c33d60750..9f6b5f3f4f 100644 --- a/src/corelib/tools/qmap.cpp +++ b/src/corelib/tools/qmap.cpp @@ -811,7 +811,7 @@ void QMapDataBase::freeData(QMapDataBase *d) /*! \fn QMap::iterator QMap::begin() - Returns an \l{STL-style iterator} pointing to the first item in + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in the map. \sa constBegin(), end() @@ -825,7 +825,7 @@ void QMapDataBase::freeData(QMapDataBase *d) /*! \fn QMap::const_iterator QMap::cbegin() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the map. \sa begin(), cend() @@ -833,7 +833,7 @@ void QMapDataBase::freeData(QMapDataBase *d) /*! \fn QMap::const_iterator QMap::constBegin() const - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the map. \sa begin(), constEnd() @@ -841,7 +841,7 @@ void QMapDataBase::freeData(QMapDataBase *d) /*! \fn QMap::iterator QMap::end() - Returns an \l{STL-style iterator} pointing to the imaginary item + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the map. \sa begin(), constEnd() @@ -855,7 +855,7 @@ void QMapDataBase::freeData(QMapDataBase *d) /*! \fn QMap::const_iterator QMap::cend() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the map. \sa cbegin(), end() @@ -863,7 +863,7 @@ void QMapDataBase::freeData(QMapDataBase *d) /*! \fn QMap::const_iterator QMap::constEnd() const - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the map. \sa constBegin(), end() diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc index 6649d5ba69..dc07f482f9 100644 --- a/src/corelib/tools/qset.qdoc +++ b/src/corelib/tools/qset.qdoc @@ -330,7 +330,7 @@ /*! \fn QSet::const_iterator QSet::begin() const - Returns a const \l{STL-style iterator} positioned at the first + Returns a const \l{STL-style iterators}{STL-style iterator} positioned at the first item in the set. \sa constBegin(), end() @@ -340,14 +340,14 @@ \since 4.2 \overload - Returns a non-const \l{STL-style iterator} positioned at the first + Returns a non-const \l{STL-style iterators}{STL-style iterator} positioned at the first item in the set. */ /*! \fn QSet::const_iterator QSet::cbegin() const \since 5.0 - Returns a const \l{STL-style iterator} positioned at the first + Returns a const \l{STL-style iterators}{STL-style iterator} positioned at the first item in the set. \sa begin(), cend() @@ -355,7 +355,7 @@ /*! \fn QSet::const_iterator QSet::constBegin() const - Returns a const \l{STL-style iterator} positioned at the first + Returns a const \l{STL-style iterators}{STL-style iterator} positioned at the first item in the set. \sa begin(), constEnd() @@ -363,7 +363,7 @@ /*! \fn QSet::const_iterator QSet::end() const - Returns a const \l{STL-style iterator} positioned at the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} positioned at the imaginary item after the last item in the set. \sa constEnd(), begin() @@ -373,14 +373,14 @@ \since 4.2 \overload - Returns a non-const \l{STL-style iterator} pointing to the + Returns a non-const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the set. */ /*! \fn QSet::const_iterator QSet::cend() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the set. \sa cbegin(), end() @@ -388,7 +388,7 @@ /*! \fn QSet::const_iterator QSet::constEnd() const - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the set. \sa constBegin(), end() diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 34a8cbe4c8..6db4fed0f8 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -840,7 +840,7 @@ const QString::Null QString::null = { }; /*! \fn QString::iterator QString::begin() - Returns an \l{STL-style iterator} pointing to the first character in + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first character in the string. \sa constBegin(), end() @@ -854,7 +854,7 @@ const QString::Null QString::null = { }; /*! \fn QString::const_iterator QString::cbegin() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the first character + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first character in the string. \sa begin(), cend() @@ -862,7 +862,7 @@ const QString::Null QString::null = { }; /*! \fn QString::const_iterator QString::constBegin() const - Returns a const \l{STL-style iterator} pointing to the first character + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first character in the string. \sa begin(), constEnd() @@ -870,7 +870,7 @@ const QString::Null QString::null = { }; /*! \fn QString::iterator QString::end() - Returns an \l{STL-style iterator} pointing to the imaginary character + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary character after the last character in the string. \sa begin(), constEnd() @@ -884,7 +884,7 @@ const QString::Null QString::null = { }; /*! \fn QString::const_iterator QString::cend() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the list. \sa cbegin(), end() @@ -892,7 +892,7 @@ const QString::Null QString::null = { }; /*! \fn QString::const_iterator QString::constEnd() const - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the list. \sa constBegin(), end() diff --git a/src/corelib/tools/qvarlengtharray.qdoc b/src/corelib/tools/qvarlengtharray.qdoc index 452bc0a598..0481373f2d 100644 --- a/src/corelib/tools/qvarlengtharray.qdoc +++ b/src/corelib/tools/qvarlengtharray.qdoc @@ -483,7 +483,7 @@ /*! \fn QVarLengthArray::iterator QVarLengthArray::begin() \since 4.8 - Returns an \l{STL-style iterator} pointing to the first item in + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in the array. \sa constBegin(), end() @@ -497,7 +497,7 @@ /*! \fn QVarLengthArray::const_iterator QVarLengthArray::cbegin() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the array. \sa begin(), cend() @@ -506,7 +506,7 @@ /*! \fn QVarLengthArray::const_iterator QVarLengthArray::constBegin() const \since 4.8 - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the array. \sa begin(), constEnd() @@ -515,7 +515,7 @@ /*! \fn QVarLengthArray::iterator QVarLengthArray::end() \since 4.8 - Returns an \l{STL-style iterator} pointing to the imaginary item + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the array. \sa begin(), constEnd() @@ -530,7 +530,7 @@ /*! \fn QVarLengthArray::const_iterator QVarLengthArray::cend() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the array. \sa cbegin(), end() @@ -539,7 +539,7 @@ /*! \fn QVarLengthArray::const_iterator QVarLengthArray::constEnd() const \since 4.8 - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the array. \sa constBegin(), end() diff --git a/src/corelib/tools/qvector.cpp b/src/corelib/tools/qvector.cpp index f33bb930c2..ab8127159f 100644 --- a/src/corelib/tools/qvector.cpp +++ b/src/corelib/tools/qvector.cpp @@ -636,7 +636,7 @@ /*! \fn QVector::iterator QVector::begin() - Returns an \l{STL-style iterator} pointing to the first item in + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the first item in the vector. \sa constBegin(), end() @@ -650,7 +650,7 @@ /*! \fn QVector::const_iterator QVector::cbegin() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the vector. \sa begin(), cend() @@ -658,7 +658,7 @@ /*! \fn QVector::const_iterator QVector::constBegin() const - Returns a const \l{STL-style iterator} pointing to the first item + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item in the vector. \sa begin(), constEnd() @@ -666,7 +666,7 @@ /*! \fn QVector::iterator QVector::end() - Returns an \l{STL-style iterator} pointing to the imaginary item + Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the vector. \sa begin(), constEnd() @@ -680,7 +680,7 @@ /*! \fn QVector::const_iterator QVector::cend() const \since 5.0 - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the vector. \sa cbegin(), end() @@ -688,7 +688,7 @@ /*! \fn QVector::const_iterator QVector::constEnd() const - Returns a const \l{STL-style iterator} pointing to the imaginary + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item after the last item in the vector. \sa constBegin(), end() -- cgit v1.2.3