diff options
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/io/qdebug.h | 2 | ||||
-rw-r--r-- | src/corelib/io/qtextstream.cpp | 15 | ||||
-rw-r--r-- | src/corelib/io/qtextstream.h | 1 |
3 files changed, 17 insertions, 1 deletions
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index c268660573..48a382eea6 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -113,7 +113,7 @@ public: inline QDebug &operator<<(const char* t) { stream->ts << QString::fromAscii(t); return maybeSpace(); } inline QDebug &operator<<(const QString & t) { stream->ts << '\"' << t << '\"'; return maybeSpace(); } inline QDebug &operator<<(const QStringRef & t) { return operator<<(t.toString()); } - inline QDebug &operator<<(const QLatin1String &t) { stream->ts << '\"' << t.latin1() << '\"'; return maybeSpace(); } + inline QDebug &operator<<(const QLatin1String &t) { stream->ts << '\"' << t << '\"'; return maybeSpace(); } inline QDebug &operator<<(const QByteArray & t) { stream->ts << '\"' << t << '\"'; return maybeSpace(); } inline QDebug &operator<<(const void * t) { stream->ts << t; return maybeSpace(); } inline QDebug &operator<<(QTextStreamFunction f) { 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(). */ diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h index 3e1d0faa25..011d43ebb0 100644 --- a/src/corelib/io/qtextstream.h +++ b/src/corelib/io/qtextstream.h @@ -187,6 +187,7 @@ public: QTextStream &operator<<(float f); QTextStream &operator<<(double f); QTextStream &operator<<(const QString &s); + QTextStream &operator<<(const QLatin1String &s); QTextStream &operator<<(const QByteArray &array); QTextStream &operator<<(const char *c); QTextStream &operator<<(const void *ptr); |