diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-02 13:25:16 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-11 01:42:02 +0200 |
| commit | b6e4c859d38674e77fb3b1372cb7751f3cfe1682 (patch) | |
| tree | 0330fb4c702cfaaf537f0492ec77bedbe91600e7 /src/corelib/kernel | |
| parent | 3f9b5086525ac4552fd4d7cc89c74bf76f45b1dc (diff) | |
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 <ritt.ks@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<QByteArray>(d)->constData()); + *str = QString::fromUtf8(v_cast<QByteArray>(d)->constData()); break; case QVariant::StringList: if (v_cast<QStringList>(d)->count() == 1) @@ -484,7 +484,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) QByteArray *ba = static_cast<QByteArray *>(result); switch (d->type) { case QVariant::String: - *ba = v_cast<QString>(d)->toAscii(); + *ba = v_cast<QString>(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 |