summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qset.qdoc
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-03 14:20:01 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-04 11:12:05 +0100
commitca2f44680cb97e7a7c46ee0ab26654822fe65e2d (patch)
treeb9d85ad8ec1b18a6aa56b7657812cf3791bdf72e /src/corelib/tools/qset.qdoc
parent28a21d98ef8d880a6dd86ee19dd803424bb5eae1 (diff)
parent83188c6499ccdc87c0a2c468bb497e287f5db369 (diff)
Merge branch 'stable' into dev
Conflicts: examples/widgets/painting/shared/shared.pri src/corelib/tools/qharfbuzz_p.h src/corelib/tools/qunicodetools.cpp src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/qwindowsfontdatabase.cpp Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
Diffstat (limited to 'src/corelib/tools/qset.qdoc')
-rw-r--r--src/corelib/tools/qset.qdoc16
1 files changed, 8 insertions, 8 deletions
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()