From 360b6822884777ddf12bc69d1791f22c4802a674 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 2 May 2012 13:29:54 +0200 Subject: Port the QTextStream / QDebug functions away from fromAscii No behaviour change since fromAscii (temporarily, at this point) means fromUtf8. Change-Id: I0e4d3ccfac7b5beaaaececb9f088324ee4838f84 Reviewed-by: Lars Knoll Reviewed-by: Robin Burchell --- src/corelib/io/qdebug.h | 2 +- src/corelib/io/qtextstream.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 34abb5b75b..e3ecc3662d 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -110,7 +110,7 @@ public: { stream->ts << QString::number(t); return maybeSpace(); } inline QDebug &operator<<(float t) { stream->ts << t; return maybeSpace(); } inline QDebug &operator<<(double t) { stream->ts << t; return maybeSpace(); } - inline QDebug &operator<<(const char* t) { stream->ts << QString::fromAscii(t); return maybeSpace(); } + inline QDebug &operator<<(const char* t) { stream->ts << QString::fromUtf8(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 << '\"'; return maybeSpace(); } diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp index c11a0e25f7..829eae0c89 100644 --- a/src/corelib/io/qtextstream.cpp +++ b/src/corelib/io/qtextstream.cpp @@ -2544,13 +2544,13 @@ QTextStream &QTextStream::operator<<(const QLatin1String &string) \overload Writes \a array to the stream. The contents of \a array are - converted with QString::fromAscii(). + converted with QString::fromUtf8(). */ QTextStream &QTextStream::operator<<(const QByteArray &array) { Q_D(QTextStream); CHECK_VALID_STREAM(*this); - d->putString(QString::fromAscii(array.constData(), array.length())); + d->putString(QString::fromUtf8(array.constData(), array.length())); return *this; } -- cgit v1.2.3