diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-02 06:00:42 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-02 06:00:42 (GMT) |
commit | fdf48e6dc126414bd34db1af3ede601f025acbb0 (patch) | |
tree | ef40c8cf72477f968bcbb657f570a10fb1a9330e /src/corelib/tools/qstringbuilder.cpp | |
parent | 120ce340065ab62780032589fd79b8d3e154c81d (diff) | |
parent | 63fba94e074c29f17e35c7cf9133d1878b18401f (diff) | |
download | Qt-fdf48e6dc126414bd34db1af3ede601f025acbb0.zip Qt-fdf48e6dc126414bd34db1af3ede601f025acbb0.tar.gz Qt-fdf48e6dc126414bd34db1af3ede601f025acbb0.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/tools/qstringbuilder.cpp')
-rw-r--r-- | src/corelib/tools/qstringbuilder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp index b807a89..2b4a242 100644 --- a/src/corelib/tools/qstringbuilder.cpp +++ b/src/corelib/tools/qstringbuilder.cpp @@ -71,8 +71,8 @@ /*! \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 @@ -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 |