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

make testlib's toString() use local8Bit, not latin1

Browse Source 
this is consistent with what qDebug does. consequently, this makes the
code usable with 8-bit strings in the first place.

note that some {to,from}Latin1 is left - this is where we know that we
are dealing with ascii-only text.

Change-Id: I26cfdf3622250b8bf95ebfe221465ca89d7cd082
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-03-06 11:17:46 +01:00 committed by The Qt Project
parent de5562ff38
commit 62266ef813
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/testlib/qtest.h
View File

@ -68,12 +68,12 @@ namespace QTest
template<> inline char *toString(const QLatin1String &str) template<> inline char *toString(const QLatin1String &str)
{ {
return qstrdup(str.latin1()); return qstrdup(qPrintable(QString(str)));
} }
template<> inline char *toString(const QString &str) template<> inline char *toString(const QString &str)
{ {
return qstrdup(str.toLatin1().constData()); return qstrdup(qPrintable(str));
} }
template<> inline char *toString(const QByteArray &ba) template<> inline char *toString(const QByteArray &ba)
@ -85,29 +85,29 @@ template<> inline char *toString(const QByteArray &ba)
template<> inline char *toString(const QTime &time) template<> inline char *toString(const QTime &time)
{ {
return time.isValid() return time.isValid()
? qstrdup(time.toString(QLatin1String("hh:mm:ss.zzz")).toLatin1().constData()) ? qstrdup(qPrintable(time.toString(QLatin1String("hh:mm:ss.zzz"))))
: qstrdup("Invalid QTime"); : qstrdup("Invalid QTime");
} }
template<> inline char *toString(const QDate &date) template<> inline char *toString(const QDate &date)
{ {
return date.isValid() return date.isValid()
? qstrdup(date.toString(QLatin1String("yyyy/MM/dd")).toLatin1().constData()) ? qstrdup(qPrintable(date.toString(QLatin1String("yyyy/MM/dd"))))
: qstrdup("Invalid QDate"); : qstrdup("Invalid QDate");
} }
template<> inline char *toString(const QDateTime &dateTime) template<> inline char *toString(const QDateTime &dateTime)
{ {
return dateTime.isValid() return dateTime.isValid()
? qstrdup((dateTime.toString(QLatin1String("yyyy/MM/dd hh:mm:ss.zzz")) + ? qstrdup(qPrintable(dateTime.toString(QLatin1String("yyyy/MM/dd hh:mm:ss.zzz")) +
(dateTime.timeSpec() == Qt::LocalTime ? QLatin1String("[local time]") : QLatin1String("[UTC]"))).toLatin1().constData()) (dateTime.timeSpec() == Qt::LocalTime ? QLatin1String("[local time]") : QLatin1String("[UTC]"))))
: qstrdup("Invalid QDateTime"); : qstrdup("Invalid QDateTime");
} }
#endif // QT_NO_DATESTRING #endif // QT_NO_DATESTRING
template<> inline char *toString(const QChar &c) template<> inline char *toString(const QChar &c)
{ {
return qstrdup(QString::fromLatin1("QChar: '%1' (0x%2)").arg(c).arg(QString::number(static_cast<int>(c.unicode()), 16)).toLatin1().constData()); return qstrdup(qPrintable(QString::fromLatin1("QChar: '%1' (0x%2)").arg(c).arg(QString::number(static_cast<int>(c.unicode()), 16))));
} }
template<> inline char *toString(const QPoint &p) template<> inline char *toString(const QPoint &p)
@ -143,7 +143,7 @@ template<> inline char *toString(const QRectF &s)
template<> inline char *toString(const QUrl &uri) template<> inline char *toString(const QUrl &uri)
{ {
if (!uri.isValid()) if (!uri.isValid())
return qstrdup(QByteArray("Invalid URL: " + uri.errorString().toLatin1()).constData()); return qstrdup(qPrintable(QStringLiteral("Invalid URL: ") + uri.errorString()));
return qstrdup(uri.toEncoded().constData()); return qstrdup(uri.toEncoded().constData());
} }
@ -159,7 +159,7 @@ template<> inline char *toString(const QVariant &v)
if (!v.isNull()) { if (!v.isNull()) {
vstring.append(','); vstring.append(',');
if (v.canConvert(QVariant::String)) { if (v.canConvert(QVariant::String)) {
vstring.append(qvariant_cast<QString>(v).toLatin1()); vstring.append(qvariant_cast<QString>(v).toLocal8Bit());
} }
else { else {
vstring.append("<value not representable as string>"); vstring.append("<value not representable as string>");