remove compiler warnings caused by ASCII conversions

19 files changed, 129 insertions, 129 deletions

diff --git a/src/location/landmarks/qlandmarkabstractrequest.cpp b/src/location/landmarks/qlandmarkabstractrequest.cpp
index e3cad813..f5cc51f8 100644
--- a/src/location/landmarks/qlandmarkabstractrequest.cpp
+++ b/src/location/landmarks/qlandmarkabstractrequest.cpp
@@ -325,14 +325,14 @@ bool QLandmarkAbstractRequest::start()
     QMutexLocker ml(&d_ptr->mutex);
     if (!d_ptr->manager) {
         d_ptr->error = QLandmarkManager::BadArgumentError;
-        d_ptr->errorString = "No manager assigned to landmark request object";
+        d_ptr->errorString = QLatin1String("No manager assigned to landmark request object");
         qWarning() << d_ptr->errorString;
         return false;
     }
     QLandmarkManagerEngine *engine = d_ptr->manager->engine();
     if (!engine) {
         d_ptr->error = QLandmarkManager::InvalidManagerError;
-        d_ptr->errorString = "The manager is invalid";
+        d_ptr->errorString = QLatin1String("The manager is invalid");
         return false;
     }
 
@@ -362,7 +362,7 @@ bool QLandmarkAbstractRequest::cancel()
     QMutexLocker ml(&d_ptr->mutex);
     if (!d_ptr->manager) {
         d_ptr->error = QLandmarkManager::BadArgumentError;
-        d_ptr->errorString = "No manager assigned to landmark request object";
+        d_ptr->errorString = QLatin1String("No manager assigned to landmark request object");
         qWarning() << d_ptr->errorString;
         return false;
     }
@@ -401,7 +401,7 @@ bool QLandmarkAbstractRequest::waitForFinished(int msecs)
     QMutexLocker ml(&d_ptr->mutex);
     if (!d_ptr->manager) {
         d_ptr->error = QLandmarkManager::BadArgumentError;
-        d_ptr->errorString = "No manager assigned to landmark request object";
+        d_ptr->errorString = QLatin1String("No manager assigned to landmark request object");
         qWarning() << d_ptr->errorString;
         return false;
     }
diff --git a/src/location/landmarks/qlandmarkmanager.cpp b/src/location/landmarks/qlandmarkmanager.cpp
index e97b7463..11499a92 100644
--- a/src/location/landmarks/qlandmarkmanager.cpp
+++ b/src/location/landmarks/qlandmarkmanager.cpp
@@ -230,11 +230,11 @@ QLandmarkManager::QLandmarkManager(QObject *parent)
     QString managerName;
 
 #ifdef Q_OS_SYMBIAN
-     managerName = "com.nokia.qt.landmarks.engines.symbian";
+     managerName = QLatin1String("com.nokia.qt.landmarks.engines.symbian");
 #elif defined(Q_WS_MAEMO_6) || defined(Q_WS_MEEGO)
-     managerName = "com.nokia.qt.landmarks.engines.qsparql";
+     managerName = QLatin1String("com.nokia.qt.landmarks.engines.qsparql");
 #else
-    managerName = "com.nokia.qt.landmarks.engines.sqlite";
+    managerName = QLatin1String("com.nokia.qt.landmarks.engines.sqlite");
 #endif
 
     d->createEngine(managerName);
@@ -299,7 +299,7 @@ bool QLandmarkManager::saveLandmark(QLandmark *landmark)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->saveLandmark(landmark,
@@ -330,7 +330,7 @@ bool QLandmarkManager::saveLandmarks(QList<QLandmark> *landmarks)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->saveLandmarks(landmarks,
@@ -355,7 +355,7 @@ bool QLandmarkManager::removeLandmark(const QLandmarkId &landmarkId)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->removeLandmark(landmarkId,
@@ -380,7 +380,7 @@ bool QLandmarkManager::removeLandmark(const QLandmark &landmark)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->removeLandmark(landmark.landmarkId(),
@@ -411,7 +411,7 @@ bool QLandmarkManager::removeLandmarks(const QList<QLandmarkId> &landmarkIds)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
 
@@ -445,7 +445,7 @@ bool QLandmarkManager::removeLandmarks(const QList<QLandmark> &landmarks)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     QList<QLandmarkId> landmarkIds;
@@ -490,7 +490,7 @@ bool QLandmarkManager::saveCategory(QLandmarkCategory *category)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->saveCategory(category,
@@ -514,7 +514,7 @@ bool QLandmarkManager::removeCategory(const QLandmarkCategoryId &categoryId)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->removeCategory(categoryId,
@@ -538,7 +538,7 @@ bool QLandmarkManager::removeCategory(const QLandmarkCategory &category)
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->removeCategory(category.categoryId(),
@@ -559,7 +559,7 @@ QLandmarkCategory QLandmarkManager::category(const QLandmarkCategoryId &category
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     QLandmarkCategory cat = d->engine->category(categoryId,
@@ -590,7 +590,7 @@ QList<QLandmarkCategory> QLandmarkManager::categories(const QList<QLandmarkCateg
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     QList<QLandmarkCategory> cats = d->engine->categories(categoryIds,
@@ -618,7 +618,7 @@ QList<QLandmarkCategory> QLandmarkManager::categories(int limit, int offset, con
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     QList<QLandmarkCategory> cats = d->engine->categories(limit, offset, nameSort,
@@ -648,7 +648,7 @@ QList<QLandmarkCategoryId> QLandmarkManager::categoryIds(int limit, int offset,
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     QList<QLandmarkCategoryId> ids = d->engine->categoryIds(limit, offset, nameSort,
@@ -674,7 +674,7 @@ QLandmark QLandmarkManager::landmark(const QLandmarkId &landmarkId) const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     QLandmark lm = d->engine->landmark(landmarkId,
@@ -703,7 +703,7 @@ QList<QLandmark> QLandmarkManager::landmarks(const QLandmarkFilter &filter, int
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     QList<QLandmark> lms = d->engine->landmarks(filter,
@@ -736,7 +736,7 @@ QList<QLandmark> QLandmarkManager::landmarks(const QLandmarkFilter &filter, int
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     QList<QLandmarkSortOrder> sortOrders;
@@ -775,7 +775,7 @@ QList<QLandmark> QLandmarkManager::landmarks(const QList<QLandmarkId> &landmarkI
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     QList<QLandmark> lms = d->engine->landmarks(landmarkIds,
@@ -804,7 +804,7 @@ QList<QLandmarkId> QLandmarkManager::landmarkIds(const QLandmarkFilter &filter,
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     QList<QLandmarkId> ids = d->engine->landmarkIds(filter,
@@ -841,7 +841,7 @@ QList<QLandmarkId> QLandmarkManager::landmarkIds(const QLandmarkFilter &filter,
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     QList<QLandmarkSortOrder> sortOrders;
@@ -886,7 +886,7 @@ bool QLandmarkManager::importLandmarks(QIODevice *device, const QString &format,
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     return d->engine->importLandmarks(device,
@@ -946,7 +946,7 @@ bool QLandmarkManager::exportLandmarks(QIODevice *device, const QString &format,
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     return d->engine->exportLandmarks(device,
@@ -994,7 +994,7 @@ QStringList QLandmarkManager::supportedFormats(QLandmarkManager::TransferOperati
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     return d->engine->supportedFormats(operation, &(d->errorCode), &(d->errorString));
@@ -1053,7 +1053,7 @@ bool QLandmarkManager::isFeatureSupported(QLandmarkManager::ManagerFeature featu
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->isFeatureSupported(feature, &(d->errorCode), &(d->errorString));
@@ -1074,7 +1074,7 @@ QLandmarkManager::SupportLevel QLandmarkManager::filterSupportLevel(const QLandm
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     return d->engine->filterSupportLevel(filter, &(d->errorCode), &(d->errorString));
@@ -1093,7 +1093,7 @@ QLandmarkManager::SupportLevel QLandmarkManager::sortOrderSupportLevel(const QLa
     }
 
      d->errorCode = QLandmarkManager::NoError;
-     d->errorString = "";
+     d->errorString = QLatin1String("");
      d->errorMap.clear();
 
     return d->engine->sortOrderSupportLevel(sortOrder, &(d->errorCode), &(d->errorString));
@@ -1112,7 +1112,7 @@ bool QLandmarkManager::isReadOnly() const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->isReadOnly(&(d->errorCode), &(d->errorString));
@@ -1134,7 +1134,7 @@ bool QLandmarkManager::isReadOnly(const QLandmarkId &landmarkId) const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->isReadOnly(landmarkId, &(d->errorCode), &(d->errorString));
@@ -1156,7 +1156,7 @@ bool QLandmarkManager::isReadOnly(const QLandmarkCategoryId &categoryId) const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->isReadOnly(categoryId, &(d->errorCode), &(d->errorString));
@@ -1175,7 +1175,7 @@ QStringList QLandmarkManager::searchableLandmarkAttributeKeys() const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
 
     return d->engine->searchableLandmarkAttributeKeys(&(d->errorCode), &(d->errorString));
@@ -1197,7 +1197,7 @@ QString QLandmarkManager::managerName() const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
     return d->engine->managerName();
 }
@@ -1218,7 +1218,7 @@ QMap<QString, QString> QLandmarkManager::managerParameters() const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
     return d->engine->managerParameters();
 }
@@ -1236,7 +1236,7 @@ QString QLandmarkManager::managerUri() const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
     return d->engine->managerUri();
 }
@@ -1254,7 +1254,7 @@ int QLandmarkManager::managerVersion() const
     }
 
     d->errorCode = QLandmarkManager::NoError;
-    d->errorString = "";
+    d->errorString = QLatin1String("");
     d->errorMap.clear();
     return d->engine->managerVersion();
 }
@@ -1390,14 +1390,14 @@ void QLandmarkManager::connectNotify(const char *signal)
 
     if (!d_ptr->isConnected) {
         if (d_ptr->engine) {
-            if (QLatin1String(signal) == SIGNAL(landmarksAdded(QList<QLandmarkId>))
-                || (QLatin1String(signal) == SIGNAL(landmarksChanged(QList<QLandmarkId>)))
-                || (QLatin1String(signal) == SIGNAL(landmarksRemoved(QList<QLandmarkId>)))
-                || (QLatin1String(signal) == SIGNAL(landmarksChanged(QList<QLandmarkId>)))
-                || (QLatin1String(signal) == SIGNAL(categoriesAdded(QList<QLandmarkCategoryId>)))
-                || (QLatin1String(signal) == SIGNAL(categoriesChanged(QList<QLandmarkCategoryId>)))
-                || (QLatin1String(signal) == SIGNAL(categoriesRemoved(QList<QLandmarkCategoryId>)))
-                || (QLatin1String(signal) == SIGNAL(dataChanged()))) {
+            if (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksAdded(QList<QLandmarkId>)))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksChanged(QList<QLandmarkId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksRemoved(QList<QLandmarkId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksChanged(QList<QLandmarkId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesAdded(QList<QLandmarkCategoryId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesChanged(QList<QLandmarkCategoryId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesRemoved(QList<QLandmarkCategoryId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(dataChanged())))) {
                 connect(d_ptr->engine,SIGNAL(landmarksAdded(QList<QLandmarkId>)),
                         this, SIGNAL(landmarksAdded(QList<QLandmarkId>)));
                 connect(d_ptr->engine,SIGNAL(landmarksChanged(QList<QLandmarkId>)),
@@ -1427,13 +1427,13 @@ void QLandmarkManager::disconnectNotify(const char *signal)
 {
     if (d_ptr->isConnected) {
         if (d_ptr->engine) {
-            if ((QLatin1String(signal) == SIGNAL(landmarksAdded(QList<QLandmarkId>)))
-                || (QLatin1String(signal) == SIGNAL(landmarksChanged(QList<QLandmarkId>)))
-                || (QLatin1String(signal) == SIGNAL(landmarksRemoved(QList<QLandmarkId>)))
-                || (QLatin1String(signal) == SIGNAL(categoriesAdded(QList<QLandmarkCategoryId>)))
-                || (QLatin1String(signal) == SIGNAL(categoriesChanged(QList<QLandmarkCategoryId>)))
-                || (QLatin1String(signal) == SIGNAL(categoriesRemoved(QList<QLandmarkCategoryId>)))
-                || (QLatin1String(signal) == SIGNAL(dataChanged()))) {
+            if ((QLatin1String(signal) == QLatin1String(SIGNAL(landmarksAdded(QList<QLandmarkId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksChanged(QList<QLandmarkId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(landmarksRemoved(QList<QLandmarkId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesAdded(QList<QLandmarkCategoryId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesChanged(QList<QLandmarkCategoryId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(categoriesRemoved(QList<QLandmarkCategoryId>))))
+                || (QLatin1String(signal) == QLatin1String(SIGNAL(dataChanged())))) {
                 disconnect(d_ptr->engine,SIGNAL(landmarksAdded(QList<QLandmarkId>)),
                            this, SIGNAL(landmarksAdded(QList<QLandmarkId>)));
                 disconnect(d_ptr->engine,SIGNAL(landmarksChanged(QList<QLandmarkId>)),
diff --git a/src/location/landmarks/qlandmarkmanager_p.cpp b/src/location/landmarks/qlandmarkmanager_p.cpp
index 0405a9fa..37ce5f06 100644
--- a/src/location/landmarks/qlandmarkmanager_p.cpp
+++ b/src/location/landmarks/qlandmarkmanager_p.cpp
@@ -68,7 +68,7 @@ void QLandmarkManagerPrivate::createEngine(const QString &managerName, const QMa
 
     if (!q->availableManagers().contains(managerName)) {
         errorCode = QLandmarkManager::InvalidManagerError;
-        errorString = QString("The landmark manager, %1, was not found").arg(managerName);
+        errorString = QString::fromLatin1("The landmark manager, %1, was not found").arg(managerName);
         qWarning() << errorString;
         engine = 0;
         return;
@@ -77,7 +77,7 @@ void QLandmarkManagerPrivate::createEngine(const QString &managerName, const QMa
     QList<QLandmarkManagerEngineFactory *> factories = QLandmarkManagerPrivate::factories().values(managerName);
 
     bool ok;
-    int implementationVersion = parameters.value(QTLANDMARKS_IMPLEMENTATION_VERSION_NAME).toInt(&ok);
+    int implementationVersion = parameters.value(QLatin1String(QTLANDMARKS_IMPLEMENTATION_VERSION_NAME)).toInt(&ok);
     if (!ok)
         implementationVersion = -1;
 
@@ -95,7 +95,7 @@ void QLandmarkManagerPrivate::createEngine(const QString &managerName, const QMa
     if (!engine) {
         if (errorCode == QLandmarkManager::NoError) {
             errorCode = QLandmarkManager::InvalidManagerError;
-            errorString = "The landmark manager could not return the requested engine instance";
+            errorString = QLatin1String("The landmark manager could not return the requested engine instance");
         }
     }
 }
diff --git a/src/location/landmarks/qlandmarkmanagerengine.cpp b/src/location/landmarks/qlandmarkmanagerengine.cpp
index 1a6d54f7..bc8d4de2 100644
--- a/src/location/landmarks/qlandmarkmanagerengine.cpp
+++ b/src/location/landmarks/qlandmarkmanagerengine.cpp
@@ -102,44 +102,44 @@ bool matchString(const QString &sourceString, const QString &matchString, QLandm
 
 QVariant getLandmarkAttribute(const QString key, const QLandmark &landmark)
 {
-    if (key == "name") {
+    if (key == QLatin1String("name")) {
         return landmark.name();
-    } else if (key == "description") {
+    } else if (key == QLatin1String("description")) {
         return landmark.description();
-    } else if (key == "countryCode") {
+    } else if (key == QLatin1String("countryCode")) {
         return landmark.address().countryCode();
-    } else if (key == "country") {
+    } else if (key == QLatin1String("country")) {
         return landmark.address().country();
-    } else if (key == "state") {
+    } else if (key == QLatin1String("state")) {
         return landmark.address().state();
-    } else if (key == "city") {
+    } else if (key == QLatin1String("city")) {
         return landmark.address().city();
-    } else if (key == "district") {
+    } else if (key == QLatin1String("district")) {
         return landmark.address().district();
-    }  else if (key == "district") {
+    }  else if (key == QLatin1String("district")) {
         return landmark.address().district();
-    } else if (key == "street") {
+    } else if (key == QLatin1String("street")) {
         return landmark.address().street();
-    } else if (key == "postcode") {
+    } else if (key == QLatin1String("postcode")) {
         return landmark.address().postcode();
-    } else if (key == "phoneNumber") {
+    } else if (key == QLatin1String("phoneNumber")) {
         return landmark.phoneNumber();
     } else {
         return QVariant(); // shouldn't be possible
     }
 }
 
-QStringList commonLandmarkKeys = QStringList() << "name"
-                                << "description"
-                                << "countryCode"
-                                << "country"
-                                << "state"
-                                << "county"
-                                << "city"
-                                << "district"
-                                << "street"
-                                << "postcode"
-                                << "phoneNumber";
+QStringList commonLandmarkKeys = QStringList() << QLatin1String("name")
+                                << QLatin1String("description")
+                                << QLatin1String("countryCode")
+                                << QLatin1String("country")
+                                << QLatin1String("state")
+                                << QLatin1String("county")
+                                << QLatin1String("city")
+                                << QLatin1String("district")
+                                << QLatin1String("street")
+                                << QLatin1String("postcode")
+                                << QLatin1String("phoneNumber");
 
 /*!
     \class QLandmarkManagerEngine
@@ -503,7 +503,7 @@ bool QLandmarkManagerEngine::importLandmarks(QIODevice* /*device*/, const QStrin
     Q_ASSERT(error);
     Q_ASSERT(errorString);
     *error = QLandmarkManager::NotSupportedError;
-    *errorString ="Not supported";
+    *errorString = QLatin1String("Not supported");
     return false;
 }
 
@@ -532,7 +532,7 @@ bool QLandmarkManagerEngine::exportLandmarks(QIODevice * /*device*/, const QStri
     Q_ASSERT(error);
     Q_ASSERT(errorString);
     *error = QLandmarkManager::NotSupportedError;
-    *errorString = "Not supported";
+    *errorString = QLatin1String("Not supported");
     return false;
 }
 
@@ -546,7 +546,7 @@ QStringList QLandmarkManagerEngine::supportedFormats(QLandmarkManager::TransferO
     Q_ASSERT(error);
     Q_ASSERT(errorString);
     *error = QLandmarkManager::NoError;
-    *errorString = "";
+    *errorString = QLatin1String("");
     return QStringList();
 }
 
diff --git a/src/location/maps/qgeomapdata.cpp b/src/location/maps/qgeomapdata.cpp
index 795daa63..6f7a2be3 100644
--- a/src/location/maps/qgeomapdata.cpp
+++ b/src/location/maps/qgeomapdata.cpp
@@ -785,9 +785,9 @@ QGeoMapDataPrivate::QGeoMapDataPrivate(QGeoMapData *parent, QGeoMappingManagerEn
       containerObject(0),
       zoomLevel(-1.0),
       shiftSinceLastInval(0, 0),
-      windowSize(0, 0),
       bearing(0.0),
       tilt(0.0),
+      windowSize(0, 0),
       blockPropertyChangeSignals(false),
       q_ptr(parent)
 {}
diff --git a/src/location/maps/qgeomapobjectengine_p.cpp b/src/location/maps/qgeomapobjectengine_p.cpp
index e40f07f4..5722dda2 100644
--- a/src/location/maps/qgeomapobjectengine_p.cpp
+++ b/src/location/maps/qgeomapobjectengine_p.cpp
@@ -285,12 +285,12 @@ bool QGeoMapObjectEngine::exactMetersToSeconds(const QGeoCoordinate &origin,
                                               QGraphicsItem *item,
                                               QList<QPolygonF> &polys)
 {
-    QString projStr = "+proj=tmerc +lat_0=%1 +lon_0=%2 +k=1.0 +x_0=0 +y_0=0 +ellps=WGS84";
+    QString projStr = QLatin1String("+proj=tmerc +lat_0=%1 +lon_0=%2 +k=1.0 +x_0=0 +y_0=0 +ellps=WGS84");
     projStr = projStr.arg(origin.latitude(), 0, 'f', 12)
                      .arg(origin.longitude(), 0, 'f', 12);
 
     ProjCoordinateSystem localSys(projStr, false);
-    ProjCoordinateSystem wgs84("+proj=latlon +ellps=WGS84");
+    ProjCoordinateSystem wgs84(QLatin1String("+proj=latlon +ellps=WGS84"));
 
     QTransform west;
     west.translate(360.0 * 3600.0, 0.0);
@@ -491,12 +491,12 @@ void QGeoMapObjectEngine::bilinearMetersToSeconds(const QGeoCoordinate &origin,
                                                  QPolygonF &local,
                                                  QTransform &latLon)
 {
-    QString projStr = "+proj=tmerc +lat_0=%1 +lon_0=%2 +k=1.0 +x_0=0 +y_0=0 +ellps=WGS84";
+    QString projStr = QLatin1String("+proj=tmerc +lat_0=%1 +lon_0=%2 +k=1.0 +x_0=0 +y_0=0 +ellps=WGS84");
     projStr = projStr.arg(origin.latitude(), 0, 'f', 12)
                      .arg(origin.longitude(), 0, 'f', 12);
 
     ProjCoordinateSystem localSys(projStr, false);
-    ProjCoordinateSystem wgs84("+proj=latlon +ellps=WGS84");
+    ProjCoordinateSystem wgs84(QLatin1String("+proj=latlon +ellps=WGS84"));
 
     ProjPolygon p(local, localSys);
     if (!p.convert(wgs84)) {
diff --git a/src/location/maps/qgeoroutereply.cpp b/src/location/maps/qgeoroutereply.cpp
index f4c0e840..a741c6f4 100644
--- a/src/location/maps/qgeoroutereply.cpp
+++ b/src/location/maps/qgeoroutereply.cpp
@@ -255,7 +255,7 @@ void QGeoRouteReply::abort()
 
 QGeoRouteReplyPrivate::QGeoRouteReplyPrivate(const QGeoRouteRequest &request)
     : error(QGeoRouteReply::NoError),
-      errorString(""),
+      errorString(QLatin1String("")),
       isFinished(false),
       request(request) {}
 
diff --git a/src/location/maps/qgeoroutingmanagerengine.cpp b/src/location/maps/qgeoroutingmanagerengine.cpp
index beac9604..0cf1d1e2 100644
--- a/src/location/maps/qgeoroutingmanagerengine.cpp
+++ b/src/location/maps/qgeoroutingmanagerengine.cpp
@@ -207,7 +207,7 @@ QGeoRouteReply* QGeoRoutingManagerEngine::updateRoute(const QGeoRoute &route, co
     Q_UNUSED(route)
     Q_UNUSED(position)
     return new QGeoRouteReply(QGeoRouteReply::UnsupportedOptionError,
-                              "The updating of routes is not supported by this service provider.", this);
+                              QLatin1String("The updating of routes is not supported by this service provider."), this);
 }
 
 /*!
diff --git a/src/location/maps/qgeosearchmanagerengine.cpp b/src/location/maps/qgeosearchmanagerengine.cpp
index 5a6a8a47..fedf83d8 100644
--- a/src/location/maps/qgeosearchmanagerengine.cpp
+++ b/src/location/maps/qgeosearchmanagerengine.cpp
@@ -196,7 +196,7 @@ QGeoSearchReply* QGeoSearchManagerEngine::geocode(const QGeoAddress &address,
     Q_UNUSED(address)
     Q_UNUSED(bounds)
     return new QGeoSearchReply(QGeoSearchReply::UnsupportedOptionError,
-                               "Geocoding is not supported by this service provider.", this);
+                               QLatin1String("Geocoding is not supported by this service provider."), this);
 }
 
 /*!
@@ -241,7 +241,7 @@ QGeoSearchReply* QGeoSearchManagerEngine::reverseGeocode(const QGeoCoordinate &c
     Q_UNUSED(coordinate)
     Q_UNUSED(bounds)
     return new QGeoSearchReply(QGeoSearchReply::UnsupportedOptionError,
-                               "Reverse geocoding is not supported by this service provider.", this);
+                               QLatin1String("Reverse geocoding is not supported by this service provider."), this);
 }
 
 /*!
@@ -312,7 +312,7 @@ QGeoSearchReply* QGeoSearchManagerEngine::search(const QString &searchString,
     Q_UNUSED(bounds)
 
     return new QGeoSearchReply(QGeoSearchReply::UnsupportedOptionError,
-                               "Searching is not supported by this service provider.", this);
+                               QLatin1String("Searching is not supported by this service provider."), this);
 }
 
 /*!
diff --git a/src/location/maps/qgeosearchreply.cpp b/src/location/maps/qgeosearchreply.cpp
index 42fc0d11..1dbf78ca 100644
--- a/src/location/maps/qgeosearchreply.cpp
+++ b/src/location/maps/qgeosearchreply.cpp
@@ -322,7 +322,7 @@ void QGeoSearchReply::setOffset(int offset)
 
 QGeoSearchReplyPrivate::QGeoSearchReplyPrivate()
     : error(QGeoSearchReply::NoError),
-      errorString(""),
+      errorString(QLatin1String("")),
       isFinished(false),
       viewport(0),
       limit(-1),
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp
index bb9f3c9f..fd175c22 100644
--- a/src/location/maps/qgeoserviceprovider.cpp
+++ b/src/location/maps/qgeoserviceprovider.cpp
@@ -182,7 +182,7 @@ QGeoSearchManager* QGeoServiceProvider::searchManager() const
             d_ptr->searchManager = new QGeoSearchManager(engine);
         } else {
             d_ptr->searchError = QGeoServiceProvider::NotSupportedError;
-            d_ptr->searchErrorString = "The service provider does not support searchManager().";
+            d_ptr->searchErrorString = QLatin1String("The service provider does not support searchManager().");
         }
 
         if (d_ptr->searchError != QGeoServiceProvider::NoError) {
@@ -229,7 +229,7 @@ QGeoMappingManager* QGeoServiceProvider::mappingManager() const
             d_ptr->mappingManager = new QGeoMappingManager(engine);
         } else {
             d_ptr->mappingError = QGeoServiceProvider::NotSupportedError;
-            d_ptr->mappingErrorString = "The service provider does not support mappingManager().";
+            d_ptr->mappingErrorString = QLatin1String("The service provider does not support mappingManager().");
         }
 
         if (d_ptr->mappingError != QGeoServiceProvider::NoError) {
@@ -276,7 +276,7 @@ QGeoRoutingManager* QGeoServiceProvider::routingManager() const
             d_ptr->routingManager = new QGeoRoutingManager(engine);
         } else {
             d_ptr->routingError = QGeoServiceProvider::NotSupportedError;
-            d_ptr->routingErrorString = "The service provider does not support routingManager().";
+            d_ptr->routingErrorString = QLatin1String("The service provider does not support routingManager().");
         }
 
         if (d_ptr->routingError != QGeoServiceProvider::NoError) {
@@ -340,7 +340,7 @@ void QGeoServiceProviderPrivate::loadPlugin(const QString &providerName, const Q
 
     if (!QGeoServiceProviderPrivate::plugins().keys().contains(providerName)) {
         error = QGeoServiceProvider::NotSupportedError;
-        errorString = QString("The geoservices provider %1 is not supported.").arg(providerName);
+        errorString = QString(QLatin1String("The geoservices provider %1 is not supported.")).arg(providerName);
         factory = 0;
         return;
     }
@@ -348,7 +348,7 @@ void QGeoServiceProviderPrivate::loadPlugin(const QString &providerName, const Q
     factory = 0;
 
     error = QGeoServiceProvider::NoError;
-    errorString = "";
+    errorString = QLatin1String("");
 
     QList<QGeoServiceProviderFactory*> candidates = QGeoServiceProviderPrivate::plugins().values(providerName);
 
diff --git a/src/location/maps/tiled/qgeotiledmapdata.cpp b/src/location/maps/tiled/qgeotiledmapdata.cpp
index c2eb4159..207242f1 100644
--- a/src/location/maps/tiled/qgeotiledmapdata.cpp
+++ b/src/location/maps/tiled/qgeotiledmapdata.cpp
@@ -1001,8 +1001,8 @@ QGeoTiledMapDataPrivate::QGeoTiledMapDataPrivate(QGeoTiledMapData *parent, QGeoM
     : QGeoMapDataPrivate(parent, engine),
       oe(new QGeoMapObjectEngine(parent, this)),
       zoomFactor(0),
-      spherical("+proj=latlon +ellps=sphere"),
-      wgs84("+proj=latlon +ellps=WGS84") {}
+      spherical(QLatin1String("+proj=latlon +ellps=sphere")),
+      wgs84(QLatin1String("+proj=latlon +ellps=WGS84")) {}
 
 QGeoTiledMapDataPrivate::~QGeoTiledMapDataPrivate()
 {
diff --git a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp
index 510413d8..6b19d571 100644
--- a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp
+++ b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp
@@ -56,9 +56,9 @@ QT_BEGIN_NAMESPACE
 
 QGeoTiledMapObjectInfo::QGeoTiledMapObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject)
     : QGeoMapObjectInfo(mapData, mapObject),
-      graphicsItem(0),
       inited(false),
-      updateAfterInit(false)
+      updateAfterInit(false),
+      graphicsItem(0)
 {
     tiledMapData = mapData;
     tiledMapDataPrivate = static_cast<QGeoTiledMapDataPrivate*>(mapData->d_ptr);
diff --git a/src/location/maps/tiled/qgeotiledmapreply.cpp b/src/location/maps/tiled/qgeotiledmapreply.cpp
index fc145a98..622db385 100644
--- a/src/location/maps/tiled/qgeotiledmapreply.cpp
+++ b/src/location/maps/tiled/qgeotiledmapreply.cpp
@@ -311,7 +311,7 @@ void QGeoTiledMapReply::abort()
 
 QGeoTiledMapReplyPrivate::QGeoTiledMapReplyPrivate(const QGeoTiledMapRequest &request)
     : error(QGeoTiledMapReply::NoError),
-      errorString(""),
+      errorString(QLatin1String("")),
       isFinished(false),
       isCached(false),
       request(request) {}
diff --git a/src/location/projwrapper_p.h b/src/location/projwrapper_p.h
index 5bbae41e..e0a7040a 100644
--- a/src/location/projwrapper_p.h
+++ b/src/location/projwrapper_p.h
@@ -69,7 +69,7 @@ class ProjCoordinateSystemPrivate;
 class ProjCoordinateSystem
 {
 public:
-    ProjCoordinateSystem(const QString &projection = QString("+proj=latlon +ellps=WGS84"), bool latLon=true);
+    ProjCoordinateSystem(const QString &projection = QString::fromLatin1("+proj=latlon +ellps=WGS84"), bool latLon=true);
     ProjCoordinateSystem(const ProjCoordinateSystem &other);
     ~ProjCoordinateSystem();
 
diff --git a/src/location/qgeocoordinate.cpp b/src/location/qgeocoordinate.cpp
index 2fd0f8e0..fcf9a39d 100644
--- a/src/location/qgeocoordinate.cpp
+++ b/src/location/qgeocoordinate.cpp
@@ -521,11 +521,11 @@ QString QGeoCoordinate::toString(CoordinateFormat format) const
         case DegreesMinutesWithHemisphere: {
             double latMin = (absLat - int(absLat)) * 60;
             double lngMin = (absLng - int(absLng)) * 60;
-            latStr = QString("%1%2 %3'")
+            latStr = QString::fromLatin1("%1%2 %3'")
                      .arg(QString::number(int(absLat)))
                      .arg(symbol)
                      .arg(QString::number(latMin, 'f', 3));
-            longStr = QString("%1%2 %3'")
+            longStr = QString::fromLatin1("%1%2 %3'")
                       .arg(QString::number(int(absLng)))
                       .arg(symbol)
                       .arg(QString::number(lngMin, 'f', 3));
@@ -538,12 +538,12 @@ QString QGeoCoordinate::toString(CoordinateFormat format) const
             double latSec = (latMin - int(latMin)) * 60;
             double lngSec = (lngMin - int(lngMin)) * 60;
 
-            latStr = QString("%1%2 %3' %4\"")
+            latStr = QString::fromLatin1("%1%2 %3' %4\"")
                      .arg(QString::number(int(absLat)))
                      .arg(symbol)
                      .arg(QString::number(int(latMin)))
                      .arg(QString::number(latSec, 'f', 1));
-            longStr = QString("%1%2 %3' %4\"")
+            longStr = QString::fromLatin1("%1%2 %3' %4\"")
                       .arg(QString::number(int(absLng)))
                       .arg(symbol)
                       .arg(QString::number(int(lngMin)))
@@ -558,29 +558,29 @@ QString QGeoCoordinate::toString(CoordinateFormat format) const
         case DegreesMinutes:
         case DegreesMinutesSeconds: {
             if (d->lat < 0)
-                latStr.insert(0, "-");
+                latStr.insert(0, QLatin1String("-"));
             if (d->lng < 0)
-                longStr.insert(0, "-");
+                longStr.insert(0, QLatin1String("-"));
             break;
         }
         case DegreesWithHemisphere:
         case DegreesMinutesWithHemisphere:
         case DegreesMinutesSecondsWithHemisphere: {
             if (d->lat < 0)
-                latStr.append(" S");
+                latStr.append(QString::fromLatin1(" S"));
             else if (d->lat > 0)
-                latStr.append(" N");
+                latStr.append(QString::fromLatin1(" N"));
             if (d->lng < 0)
-                longStr.append(" W");
+                longStr.append(QString::fromLatin1(" W"));
             else if (d->lng > 0)
-                longStr.append(" E");
+                longStr.append(QString::fromLatin1(" E"));
             break;
         }
     }
 
     if (qIsNaN(d->alt))
-        return QString("%1, %2").arg(latStr, longStr);
-    return QString("%1, %2, %3m").arg(latStr, longStr, QString::number(d->alt));
+        return QString::fromLatin1("%1, %2").arg(latStr, longStr);
+    return QString::fromLatin1("%1, %2, %3m").arg(latStr, longStr, QString::number(d->alt));
 }
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/location/qgeopositioninfosource.cpp b/src/location/qgeopositioninfosource.cpp
index 4e1219b1..45c2aff0 100644
--- a/src/location/qgeopositioninfosource.cpp
+++ b/src/location/qgeopositioninfosource.cpp
@@ -172,9 +172,9 @@ void QGeoPositionInfoSourcePrivate::loadDynamicPlugins(QHash<QString, QGeoPositi
     QString blockName;
 
     QSettings settings(QSettings::SystemScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSat"));
-    QVariant value = settings.value("position.plugin.operator.whitelist");
+    QVariant value = settings.value(QLatin1String("position.plugin.operator.whitelist"));
     if (value.isValid()) {
-        QStringList parts = value.toString().split(",");
+        QStringList parts = value.toString().split(QLatin1String(","));
         if (parts.size() == 4) {
             QFile file(parts.at(1));
             file.open(QIODevice::ReadOnly);
@@ -374,9 +374,9 @@ QGeoPositionInfoSource::PositioningMethods QGeoPositionInfoSource::preferredPosi
 QGeoPositionInfoSource *QGeoPositionInfoSource::createDefaultSource(QObject *parent)
 {
     QSettings pluginSettings(QSettings::SystemScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSat"));
-    QVariant value = pluginSettings.value("position.plugin.operator.whitelist");
+    QVariant value = pluginSettings.value(QLatin1String("position.plugin.operator.whitelist"));
     if (value.isValid()) {
-        QStringList parts = value.toString().split(",");
+        QStringList parts = value.toString().split(QLatin1String(","));
         if (parts.size() == 4) {
             QGeoPositionInfoSource *source = createSource(parts.at(0), parent);
             if (source)
@@ -403,7 +403,7 @@ QGeoPositionInfoSource *QGeoPositionInfoSource::createDefaultSource(QObject *par
 #elif defined(Q_WS_MEEGO)
     // Use Maemo6 backend if its available, otherwise use Geoclue backend
     QSettings maemo6Settings(QSettings::UserScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSatMaemo6"));
-    if (!maemo6Settings.value("maemo6positioningavailable").isValid()) {
+    if (!maemo6Settings.value(QLatin1String("maemo6positioningavailable")).isValid()) {
         QGeoPositionInfoSourceMaemo* maemo6Source = new QGeoPositionInfoSourceMaemo(parent);
         int status = maemo6Source->init();
         if (status == -1) {
diff --git a/src/location/qgeosatelliteinfosource.cpp b/src/location/qgeosatelliteinfosource.cpp
index c14805f3..716f04be 100644
--- a/src/location/qgeosatelliteinfosource.cpp
+++ b/src/location/qgeosatelliteinfosource.cpp
@@ -113,9 +113,9 @@ void QGeoSatelliteInfoSourcePrivate::loadDynamicPlugins(QHash<QString, QGeoPosit
     QString blockName;
 
     QSettings settings(QSettings::SystemScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSat"));
-    QVariant value = settings.value("position.plugin.operator.whitelist");
+    QVariant value = settings.value(QLatin1String("position.plugin.operator.whitelist"));
     if (value.isValid()) {
-        QStringList parts = value.toString().split(",");
+        QStringList parts = value.toString().split(QLatin1String(","));
         if (parts.size() == 4) {
             QFile file(parts.at(1));
             file.open(QIODevice::ReadOnly);
@@ -263,9 +263,9 @@ QGeoSatelliteInfoSource::QGeoSatelliteInfoSource(QObject *parent)
 QGeoSatelliteInfoSource *QGeoSatelliteInfoSource::createDefaultSource(QObject *parent)
 {
     QSettings pluginSettings(QSettings::SystemScope, QLatin1String("Nokia"), QLatin1String("QtLocationPosAndSat"));
-    QVariant value = pluginSettings.value("position.plugin.operator.whitelist");
+    QVariant value = pluginSettings.value(QLatin1String("position.plugin.operator.whitelist"));
     if (value.isValid()) {
-        QStringList parts = value.toString().split(",");
+        QStringList parts = value.toString().split(QLatin1String(","));
         if (parts.size() == 4) {
             QGeoSatelliteInfoSource *source = createSource(parts.at(0), parent);
             if (source)
diff --git a/src/location/qlocationutils.cpp b/src/location/qlocationutils.cpp
index c13781d4..c210ed59 100644
--- a/src/location/qlocationutils.cpp
+++ b/src/location/qlocationutils.cpp
@@ -133,7 +133,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(parts[9], "ddMMyy");
+        date = QDate::fromString(parts[9], QLatin1String("ddMMyy"));
         if (date.isValid())
             date = date.addYears(100);     // otherwise starts from 1900
         else
@@ -305,9 +305,9 @@ bool QLocationUtils::getNmeaTime(const QByteArray &bytes, QTime *time)
     QTime tempTime;
 
     if (dotIndex < 0) {
-        tempTime = QTime::fromString(bytes, "hhmmss");
+        tempTime = QTime::fromString(bytes, QLatin1String("hhmmss"));
     } else {
-        tempTime = QTime::fromString(bytes.mid(0, dotIndex), "hhmmss");
+        tempTime = QTime::fromString(bytes.mid(0, dotIndex), QLatin1String("hhmmss"));
         bool hasMsecs = false;
         int midLen = qMin(3, bytes.size() - dotIndex - 1);
         int msecs = bytes.mid(dotIndex + 1, midLen).toUInt(&hasMsecs);