summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qstringbuilder.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-06-04 22:43:05 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-06-04 22:43:05 (GMT)
commit53dbf8688b3e30af9e166cd962c8b242d94c2f8e (patch)
treef74b90820a4043b73126d0efe977a18444239c53 /src/corelib/tools/qstringbuilder.cpp
parent0288e838e9d2ab80cea65134861692cc09f528fb (diff)
parent2dcbb2efac5f5722e1980c01dd8ec0adaec114f3 (diff)
downloadQt-53dbf8688b3e30af9e166cd962c8b242d94c2f8e.zip
Qt-53dbf8688b3e30af9e166cd962c8b242d94c2f8e.tar.gz
Qt-53dbf8688b3e30af9e166cd962c8b242d94c2f8e.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/corelib/tools/qstringbuilder.cpp')
-rw-r--r--src/corelib/tools/qstringbuilder.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp
index b807a89..4f24f76 100644
--- a/src/corelib/tools/qstringbuilder.cpp
+++ b/src/corelib/tools/qstringbuilder.cpp
@@ -64,15 +64,15 @@
\sa QStringBuilder, QLatin1String, QString, QStringRef
*/
-/*! \fn QLatin1Literal::QLatin1Literal(const char(&string)[])
+/*! \fn QLatin1Literal::QLatin1Literal(const char(&string)[N])
Constructs a new literal from the given \a string.
*/
/*! \fn int QLatin1Literal::size() const
- Returns the number of characters in the literal \i{excluding} the trailing
- NUL char.
+ Returns the number of characters in the literal \e{excluding} the trailing
+ NULL char.
*/
/*! \fn char *QLatin1Literal::data() const
@@ -93,7 +93,7 @@
\reentrant
\since 4.6
- \brief QStringBuilder is a template class that provides a facility to build
+ \brief The QStringBuilder class is a template class that provides a facility to build
up QStrings from smaller chunks.
\ingroup tools
@@ -102,7 +102,7 @@
\mainclass
When creating strings from smaller chunks, typically \c QString::operator+()
- is used, resulting in \i{n - 1} reallocations when operating on \i{n} chunks.
+ is used, resulting in \e{n - 1} reallocations when operating on \e{n} chunks.
QStringBuilder uses expression templates to collect the individual parts,
compute the total size, allocate memory for the resulting QString object,
@@ -122,7 +122,7 @@
\sa QLatin1Literal, QString
*/
-/* !fn template <class A, class B> QStringBuilder<A, B> operator%(const A &a, const B &b)
+/* \fn template <class A, class B> QStringBuilder<A, B> operator%(const A &a, const B &b)
Returns a \c QStringBuilder object that is converted to a QString object
when assigned to a variable of QString type or passed to a function that