diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-02-01 20:47:26 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 11:10:04 +0100 |
commit | 7edd623957b958d7d3db20772571810d7be9da85 (patch) | |
tree | 2e89fd13e14c25b34d6e7bc03752d1eedcd72911 /src/corelib/io/qtextstream.cpp | |
parent | 35b19be4784a65894ac9dfe64a6c036b95b06304 (diff) |
Fix QTextStream and QDebug operator<< for QLatin1String
QLatin1String now has a constructor that takes explicit length, which
makes it possible to create a QLatin1String that isn't null-terminated.
Made the QTextStream and QDebug << operators work in that case.
Change-Id: I94d051ce2ebfb2d2a403b96d25e040c80a54bf7c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/io/qtextstream.cpp')
-rw-r--r-- | src/corelib/io/qtextstream.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp index 7ea00ceec2..7f37866226 100644 --- a/src/corelib/io/qtextstream.cpp +++ b/src/corelib/io/qtextstream.cpp @@ -2533,6 +2533,21 @@ QTextStream &QTextStream::operator<<(const QString &string) /*! \overload + Writes \a string to the stream, and returns a reference to the + QTextStream. The contents of \a string are converted with the + QString constructor that takes a QLatin1String as argument. +*/ +QTextStream &QTextStream::operator<<(const QLatin1String &string) +{ + Q_D(QTextStream); + CHECK_VALID_STREAM(*this); + d->putString(QString(string)); + return *this; +} + +/*! + \overload + Writes \a array to the stream. The contents of \a array are converted with QString::fromAscii(). */ |