summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qbitarray.cpp15
-rw-r--r--src/corelib/tools/qhash.cpp3
-rw-r--r--src/corelib/tools/qlinkedlist.cpp4
-rw-r--r--src/corelib/tools/qlist.cpp4
-rw-r--r--src/corelib/tools/qmap.cpp8
-rw-r--r--src/corelib/tools/qregexp.cpp10
-rw-r--r--src/corelib/tools/qset.qdoc4
-rw-r--r--src/corelib/tools/qstring.cpp5
-rw-r--r--src/corelib/tools/qvector.cpp4
9 files changed, 26 insertions, 31 deletions
diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp
index 0e74e15a27..6d26d93508 100644
--- a/src/corelib/tools/qbitarray.cpp
+++ b/src/corelib/tools/qbitarray.cpp
@@ -55,11 +55,10 @@ QT_BEGIN_NAMESPACE
\reentrant
A QBitArray is an array that gives access to individual bits and
- provides operators (\link operator&() AND\endlink, \link
- operator|() OR\endlink, \link operator^() XOR\endlink, and \link
- operator~() NOT\endlink) that work on entire arrays of bits. It
- uses \l{implicit sharing} (copy-on-write) to reduce memory usage
- and to avoid the needless copying of data.
+ provides operators (\l{operator&()}{AND}, \l{operator|()}{OR},
+ \l{operator^()}{XOR}, and \l{operator~()}{NOT}) that work on
+ entire arrays of bits. It uses \l{implicit sharing} (copy-on-write)
+ to reduce memory usage and to avoid the needless copying of data.
The following code constructs a QBitArray containing 200 bits
initialized to false (0):
@@ -83,9 +82,9 @@ QT_BEGIN_NAMESPACE
\snippet code/src_corelib_tools_qbitarray.cpp 2
- QBitArray supports \c{&} (\link operator&() AND\endlink), \c{|}
- (\link operator|() OR\endlink), \c{^} (\link operator^()
- XOR\endlink), \c{~} (\link operator~() NOT\endlink), as well as
+ QBitArray supports \c{&} (\l{operator&()}{AND}), \c{|}
+ (\l{operator|()}{OR}), \c{^} (\l{operator^()}{XOR}),
+ \c{~} (\l{operator~()}{NOT}), as well as
\c{&=}, \c{|=}, and \c{^=}. These operators work in the same way
as the built-in C++ bitwise operators of the same name. For
example:
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index fb566333ac..0a6d51ced0 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -1186,8 +1186,7 @@ void QHashData::checkSanity()
Returns the first key mapped to \a value.
If the hash contains no item with the \a value, the function
- returns a \link {default-constructed value} default-constructed
- key \endlink.
+ returns a \l{default-constructed value}{default-constructed key}.
This function can be slow (\l{linear time}), because QHash's
internal data structure is optimized for fast lookup by key, not
diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp
index 3682818099..46f5b7c2df 100644
--- a/src/corelib/tools/qlinkedlist.cpp
+++ b/src/corelib/tools/qlinkedlist.cpp
@@ -1059,7 +1059,7 @@ const QLinkedListData QLinkedListData::shared_null = {
This function requires the value type to implement \c
operator<<().
- \sa \link datastreamformat.html Format of the QDataStream operators \endlink
+ \sa{Serializing Qt Data Types}{Format of the QDataStream operators}
*/
/*! \fn QDataStream &operator>>(QDataStream &in, QLinkedList<T> &list)
@@ -1069,7 +1069,7 @@ const QLinkedListData QLinkedListData::shared_null = {
This function requires the value type to implement \c operator>>().
- \sa \link datastreamformat.html Format of the QDataStream operators \endlink
+ \sa{Serializing Qt Data Types}{Format of the QDataStream operators}
*/
/*!
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp
index b3514d35ef..72924ef84c 100644
--- a/src/corelib/tools/qlist.cpp
+++ b/src/corelib/tools/qlist.cpp
@@ -1718,7 +1718,7 @@ void **QListData::erase(void **xi)
This function requires the value type to implement \c
operator<<().
- \sa \link datastreamformat.html Format of the QDataStream operators \endlink
+ \sa{Serializing Qt Data Types}{Format of the QDataStream operators}
*/
/*! \fn QDataStream &operator>>(QDataStream &in, QList<T> &list)
@@ -1729,7 +1729,7 @@ void **QListData::erase(void **xi)
This function requires the value type to implement \c
operator>>().
- \sa \link datastreamformat.html Format of the QDataStream operators \endlink
+ \sa{Serializing Qt Data Types}{Format of the QDataStream operators}
*/
/*! \fn QList<T> QList<T>::fromVector(const QVector<T> &vector)
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index 8002e7c1f0..d1f8222f1d 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -753,8 +753,8 @@ void QMapDataBase::freeData(QMapDataBase *d)
Returns the first key with value \a value, or \a defaultKey if
the map contains no item with value \a value. If no \a defaultKey
- is provided the function returns a \link {default-constructed value}
- default-constructed key \endlink.
+ is provided the function returns a
+ \l{default-constructed value}{default-constructed key}.
This function can be slow (\l{linear time}), because QMap's
internal data structure is optimized for fast lookup by key, not
@@ -1491,7 +1491,7 @@ void QMapDataBase::freeData(QMapDataBase *d)
This function requires the key and value types to implement \c
operator<<().
- \sa \link datastreamformat.html Format of the QDataStream operators \endlink
+ \sa{Serializing Qt Data Types}{Format of the QDataStream operators}
*/
/*! \fn QDataStream &operator>>(QDataStream &in, QMap<Key, T> &map)
@@ -1502,7 +1502,7 @@ void QMapDataBase::freeData(QMapDataBase *d)
This function requires the key and value types to implement \c
operator>>().
- \sa \link datastreamformat.html Format of the QDataStream operators \endlink
+ \sa{Serializing Qt Data Types}{Format of the QDataStream operators}
*/
/*! \class QMultiMap
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index 792b9cee4a..54b8103b3b 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -236,7 +236,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
spellings than we want: 'Eric', 'Erik', 'Eiric' and 'Eirik'.
Some of the examples discussed above are implemented in the
- \link #code-examples code examples \endlink section.
+ \l{#code-examples}{code examples} section.
\target characters-and-abbreviations-for-sets-of-characters
\section1 Characters and Abbreviations for Sets of Characters
@@ -453,8 +453,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
writing \c{\\^}. For example, \b{^#include} will only
match strings which \e begin with the characters '#include'.
(When the caret is the first character of a character set it
- has a special meaning, see \link #sets-of-characters Sets of
- Characters \endlink.)
+ has a special meaning, see \l{#sets-of-characters}{Sets of Characters}.)
\row \li \b{$}
\li The dollar signifies the end of the string. For example
@@ -538,9 +537,8 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
\section1 Notes for Perl Users
Most of the character class abbreviations supported by Perl are
- supported by QRegExp, see \link
- #characters-and-abbreviations-for-sets-of-characters characters
- and abbreviations for sets of characters \endlink.
+ supported by QRegExp, see \l{#characters-and-abbreviations-for-sets-of-characters}
+ {characters and abbreviations for sets of characters}.
In QRegExp, apart from within character classes, \c{^} always
signifies the start of the string, so carets must always be
diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc
index 51d9caad70..e6b653d9d0 100644
--- a/src/corelib/tools/qset.qdoc
+++ b/src/corelib/tools/qset.qdoc
@@ -939,7 +939,7 @@
This function requires the value type to implement \c operator<<().
- \sa \link datastreamformat.html Format of the QDataStream operators \endlink
+ \sa{Serializing Qt Data Types}{Format of the QDataStream operators}
*/
/*!
@@ -950,5 +950,5 @@
This function requires the value type to implement \c operator>>().
- \sa \link datastreamformat.html Format of the QDataStream operators \endlink
+ \sa{Serializing Qt Data Types}{Format of the QDataStream operators}
*/
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index a0a3a28b96..8d8bda4644 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -7459,9 +7459,8 @@ QString &QString::setRawData(const QChar *unicode, int size)
Many of QString's member functions are overloaded to accept
\c{const char *} instead of QString. This includes the copy
constructor, the assignment operator, the comparison operators,
- and various other functions such as \link QString::insert()
- insert() \endlink, \link QString::replace() replace()\endlink,
- and \link QString::indexOf() indexOf()\endlink. These functions
+ and various other functions such as \l{QString::insert()}{insert()}, \l{QString::replace()}{replace()},
+ and \l{QString::indexOf()}{indexOf()}. These functions
are usually optimized to avoid constructing a QString object for
the \c{const char *} data. For example, assuming \c str is a
QString,
diff --git a/src/corelib/tools/qvector.cpp b/src/corelib/tools/qvector.cpp
index 20501f98ff..329727c8ea 100644
--- a/src/corelib/tools/qvector.cpp
+++ b/src/corelib/tools/qvector.cpp
@@ -1011,7 +1011,7 @@ int QVectorData::grow(int sizeOfHeader, int size, int sizeOfT)
This function requires the value type to implement \c operator<<().
- \sa \link datastreamformat.html Format of the QDataStream operators \endlink
+ \sa{Serializing Qt Data Types}{Format of the QDataStream operators}
*/
/*! \fn QDataStream &operator>>(QDataStream &in, QVector<T> &vector)
@@ -1021,7 +1021,7 @@ int QVectorData::grow(int sizeOfHeader, int size, int sizeOfT)
This function requires the value type to implement \c operator>>().
- \sa \link datastreamformat.html Format of the QDataStream operators \endlink
+ \sa{Serializing Qt Data Types}{Format of the QDataStream operators}
*/
QT_END_NAMESPACE