From b6e4c859d38674e77fb3b1372cb7751f3cfe1682 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 2 May 2012 13:25:16 +0200 Subject: Change to/fromAscii to to/fromUtf8 in the QString conversions This commit matches the previous documentation commit that says that the conversions are applied using to/fromUtf8. Change-Id: I304e4d866ddedac5094fef8500cbeba299a02cb5 Reviewed-by: Konstantin Ritt Reviewed-by: hjk Reviewed-by: Olivier Goffart Reviewed-by: Lars Knoll --- src/corelib/kernel/qvariant.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/kernel') diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 30ca728208..cb50603354 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -330,7 +330,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) *str = QLatin1String(d->data.b ? "true" : "false"); break; case QVariant::ByteArray: - *str = QString::fromAscii(v_cast(d)->constData()); + *str = QString::fromUtf8(v_cast(d)->constData()); break; case QVariant::StringList: if (v_cast(d)->count() == 1) @@ -484,7 +484,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) QByteArray *ba = static_cast(result); switch (d->type) { case QVariant::String: - *ba = v_cast(d)->toAscii(); + *ba = v_cast(d)->toUtf8(); break; case QVariant::Double: *ba = QByteArray::number(d->data.d, 'g', DBL_DIG); @@ -1178,7 +1178,7 @@ QVariant::QVariant(QDataStream &s) #ifndef QT_NO_CAST_FROM_ASCII QVariant::QVariant(const char *val) { - QString s = QString::fromAscii(val); + QString s = QString::fromUtf8(val); create(String, &s); } #endif -- cgit v1.2.3