summaryrefslogtreecommitdiff
path: root/src/positioning
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-05-14 14:34:34 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-15 14:57:31 +0200
commitcb424d26eac75a14316726b4687758fd10c85563 (patch)
tree9d1b96301734b8c20652607823bb6dacb63afff8 /src/positioning
parent8922ae1ef4f0cb01c15632dfe19ed514e0d49dbe (diff)
downloadqtlocation-cb424d26eac75a14316726b4687758fd10c85563.tar.gz
Use QStringLiteral whereever possible
This replaces a lot of old QLatin1String cases Change-Id: I47aec711f5e00de68bde6c2c8ee09506f577cfd4 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/positioning')
-rw-r--r--src/positioning/qgeoaddress.cpp6
-rw-r--r--src/positioning/qgeocoordinate.cpp4
-rw-r--r--src/positioning/qlocationutils.cpp6
3 files changed, 8 insertions, 8 deletions
diff --git a/src/positioning/qgeoaddress.cpp b/src/positioning/qgeoaddress.cpp
index 4b8ef36a..1e26c9ae 100644
--- a/src/positioning/qgeoaddress.cpp
+++ b/src/positioning/qgeoaddress.cpp
@@ -105,9 +105,9 @@ static QString addressLine(const QStringList &parts)
static QString formattedAddress(const QGeoAddress &address,
const QString &newLine = QLatin1String("<br/>"))
{
- const QString Comma(QLatin1String(", "));
- const QString Dash(QLatin1String("-"));
- const QString Space(QLatin1String(" "));
+ const QString Comma(QStringLiteral(", "));
+ const QString Dash(QStringLiteral("-"));
+ const QString Space(QStringLiteral(" "));
QString text;
diff --git a/src/positioning/qgeocoordinate.cpp b/src/positioning/qgeocoordinate.cpp
index dc1a0e15..246b8126 100644
--- a/src/positioning/qgeocoordinate.cpp
+++ b/src/positioning/qgeocoordinate.cpp
@@ -547,9 +547,9 @@ QString QGeoCoordinate::toString(CoordinateFormat format) const
case DegreesMinutes:
case DegreesMinutesSeconds: {
if (d->lat < 0)
- latStr.insert(0, QLatin1String("-"));
+ latStr.insert(0, QStringLiteral("-"));
if (d->lng < 0)
- longStr.insert(0, QLatin1String("-"));
+ longStr.insert(0, QStringLiteral("-"));
break;
}
case DegreesWithHemisphere:
diff --git a/src/positioning/qlocationutils.cpp b/src/positioning/qlocationutils.cpp
index 830ac64a..0423913e 100644
--- a/src/positioning/qlocationutils.cpp
+++ b/src/positioning/qlocationutils.cpp
@@ -166,7 +166,7 @@ static void qlocationutils_readRmc(const char *data, int size, QGeoPositionInfo
*hasFix = (parts[2][0] == 'A');
if (parts.count() > 9 && parts[9].count() == 6) {
- date = QDate::fromString(QString::fromLatin1(parts[9]), QLatin1String("ddMMyy"));
+ date = QDate::fromString(QString::fromLatin1(parts[9]), QStringLiteral("ddMMyy"));
if (date.isValid())
date = date.addYears(100); // otherwise starts from 1900
else
@@ -355,10 +355,10 @@ bool QLocationUtils::getNmeaTime(const QByteArray &bytes, QTime *time)
if (dotIndex < 0) {
tempTime = QTime::fromString(QString::fromLatin1(bytes.constData()),
- QLatin1String("hhmmss"));
+ QStringLiteral("hhmmss"));
} else {
tempTime = QTime::fromString(QString::fromLatin1(bytes.mid(0, dotIndex)),
- QLatin1String("hhmmss"));
+ QStringLiteral("hhmmss"));
bool hasMsecs = false;
int midLen = qMin(3, bytes.size() - dotIndex - 1);
int msecs = bytes.mid(dotIndex + 1, midLen).toUInt(&hasMsecs);