diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-03 16:52:19 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-08 02:23:42 +0200 |
commit | f00ee657a579e6a0da34492c221c9ca2059a2db0 (patch) | |
tree | bbf9d132f1b89e4c48a4388a0e8ca845f90eaf78 /src/location | |
parent | 88b6015918d6b113a45ea514bbd8083873609486 (diff) | |
download | qtlocation-f00ee657a579e6a0da34492c221c9ca2059a2db0.tar.gz |
Change uses of {to,from}Ascii to {to,from}Latin1
This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.
Task-number: QTBUG-21872
Change-Id: I2e16486d80df6257ab88dc8c3b5d9dd497a19708
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/location')
-rw-r--r-- | src/location/maps/qgeoserviceprovider.cpp | 2 | ||||
-rw-r--r-- | src/location/qlocationutils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp index 0a2833ee..628148cc 100644 --- a/src/location/maps/qgeoserviceprovider.cpp +++ b/src/location/maps/qgeoserviceprovider.cpp @@ -182,7 +182,7 @@ Flags QGeoServiceProviderPrivate::features(const char *enumName) && this->metaData.value(QStringLiteral("Features")).isArray()) { QJsonArray features = this->metaData.value(QStringLiteral("Features")).toArray(); foreach (QJsonValue v, features) { - int val = en.keyToValue(v.toString().toAscii().constData()); + int val = en.keyToValue(v.toString().toLatin1().constData()); if (v.isString() && val != -1) { ret |= typename Flags::enum_type(val); } diff --git a/src/location/qlocationutils.cpp b/src/location/qlocationutils.cpp index a0202a36..96481e1a 100644 --- a/src/location/qlocationutils.cpp +++ b/src/location/qlocationutils.cpp @@ -296,7 +296,7 @@ bool QLocationUtils::hasValidNmeaChecksum(const char *data, int size) QString s; s.sprintf("%02x", result); - return s.toAscii() == QByteArray(&data[asteriskIndex+1], 2); + return s.toLatin1() == QByteArray(&data[asteriskIndex+1], 2); } bool QLocationUtils::getNmeaTime(const QByteArray &bytes, QTime *time) |