1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port the QTextStream / QDebug functions away from fromAscii

Browse Source 
No behaviour change since fromAscii (temporarily, at this point) means
fromUtf8.

Change-Id: I0e4d3ccfac7b5beaaaececb9f088324ee4838f84
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
This commit is contained in:
Thiago Macieira 2012-05-02 13:29:54 +02:00 committed by Qt by Nokia
parent fba4d96750
commit 360b682288
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qdebug.h
View File

@ -110,7 +110,7 @@ public:
{ stream->ts << QString::number(t); return maybeSpace(); } { stream->ts << QString::number(t); return maybeSpace(); }
inline QDebug &operator<<(float t) { stream->ts << 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<<(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 QString & t) { stream->ts << '\"' << t << '\"'; return maybeSpace(); }
inline QDebug &operator<<(const QStringRef & t) { return operator<<(t.toString()); } inline QDebug &operator<<(const QStringRef & t) { return operator<<(t.toString()); }
inline QDebug &operator<<(const QLatin1String &t) { stream->ts << '\"' << t << '\"'; return maybeSpace(); } inline QDebug &operator<<(const QLatin1String &t) { stream->ts << '\"' << t << '\"'; return maybeSpace(); }

4
src/corelib/io/qtextstream.cpp
View File

@ -2544,13 +2544,13 @@ QTextStream &QTextStream::operator<<(const QLatin1String &string)
\overload \overload
Writes \a array to the stream. The contents of \a array are 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) QTextStream &QTextStream::operator<<(const QByteArray &array)
{ {
Q_D(QTextStream); Q_D(QTextStream);
CHECK_VALID_STREAM(*this); CHECK_VALID_STREAM(*this);
d->putString(QString::fromAscii(array.constData(), array.length())); d->putString(QString::fromUtf8(array.constData(), array.length()));
return *this; return *this;
} }