summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qtextstream.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-08-17 18:16:13 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-08-17 18:16:13 (GMT)
commit42e342d1b3924206c7fa4175cb064dc2bbe0f00c (patch)
tree12f01bb114f956dd257507f0106c39d5a5247a12 /src/corelib/io/qtextstream.cpp
parent7332e42363eb93f1de032319439a7250e16b3b12 (diff)
parentf37c1ea90b4265f1e2b2e7de9bbb0a021ca230d6 (diff)
downloadQt-42e342d1b3924206c7fa4175cb064dc2bbe0f00c.zip
Qt-42e342d1b3924206c7fa4175cb064dc2bbe0f00c.tar.gz
Qt-42e342d1b3924206c7fa4175cb064dc2bbe0f00c.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/io/qtextstream.cpp')
-rw-r--r--src/corelib/io/qtextstream.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index 151a4a2..9c82976 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -49,7 +49,7 @@ static const int QTEXTSTREAM_BUFFERSIZE = 16384;
reading and writing text.
\ingroup io
- \ingroup text
+ \ingroup string-processing
\reentrant
QTextStream can operate on a QIODevice, a QByteArray or a
@@ -3088,8 +3088,6 @@ QLocale QTextStream::locale() const
\compat
\reentrant
- \ingroup io
- \ingroup text
Use QTextStream instead.
*/
@@ -3116,8 +3114,6 @@ QLocale QTextStream::locale() const
\compat
\reentrant
- \ingroup io
- \ingroup text
Use QTextStream instead.
*/