Fix compile warnings.

Use toLatin1/fromLatin instead of toAscii/fromAscii.
Add message format string to qCritical usages.

Change-Id: I95c863fae6997cc8f85e0a6d16fdebba607a3ce1
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>

3 files changed, 9 insertions, 11 deletions

diff --git a/src/location/maps/qgeotilecache.cpp b/src/location/maps/qgeotilecache.cpp
index 9f78a247..7dfbf4ce 100644
--- a/src/location/maps/qgeotilecache.cpp
+++ b/src/location/maps/qgeotilecache.cpp
@@ -150,9 +150,8 @@ void QGeoTileCache::loadTiles()
         QList<QGeoTileSpec> specs;
         QList<int> costs;
         while (!file.atEnd()) {
-            QByteArray line = file.readLine();
-            QString filename(line);
-            filename.remove('\n');
+            QByteArray line = file.readLine().trimmed();
+            QString filename = QString::fromLatin1(line.constData(), line.length());
             if (dir.exists(filename)){
                 files.removeOne(filename);
                 QGeoTileSpec spec = filenameToTileSpec(filename);
@@ -200,11 +199,10 @@ QGeoTileCache::~QGeoTileCache()
         diskCache_.serializeQueue(i, queue);
         int queueLength = queue.size();
         for (int j = 0; j<queueLength; j++) {
-            QString nameLine = queue[j]->filename + "\n";
             // we just want the filename here, not the full path
-            QStringList parts = nameLine.split('/');
-            QString name = parts.at(parts.length()-1);
-            file.write(name.toAscii());
+            int index = queue[j]->filename.lastIndexOf(QLatin1Char('/'));
+            QByteArray filename = queue[j]->filename.mid(index + 1).toLatin1() + '\n';
+            file.write(filename);
         }
         file.close();
     }
diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.cpp b/src/plugins/geoservices/nokia/qgeouriprovider.cpp
index a3c25838..4b9fe7d0 100644
--- a/src/plugins/geoservices/nokia/qgeouriprovider.cpp
+++ b/src/plugins/geoservices/nokia/qgeouriprovider.cpp
@@ -90,7 +90,7 @@ QGeoUriProvider::QGeoUriProvider(
 QString QGeoUriProvider::getCurrentHost() const
 {
     if (m_maxSubdomains) {
-        QString result(m_firstSubdomain.toAscii() + qrand() % m_maxSubdomains);
+        QString result(m_firstSubdomain.toLatin1() + qrand() % m_maxSubdomains);
         result += "." + m_currentHost;
         return result;
     }
@@ -102,7 +102,7 @@ void QGeoUriProvider::setCurrentHost(const QString &host)
     if (host.length() > 4 && host.at(1) == QChar('-') && host.at(3) == QChar('.')) {
         QString realHost = host.right(host.length() - 4);
         m_firstSubdomain = host.at(0);
-        m_maxSubdomains = host.at(2).toAscii() - host.at(0).toAscii() + 1;
+        m_maxSubdomains = host.at(2).toLatin1() - host.at(0).toLatin1() + 1;
         m_currentHost = realHost;
     } else {
         m_currentHost = host;
diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
index 90577854..b47900d9 100644
--- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
+++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
@@ -302,7 +302,7 @@ int QGeoPositionInfoSourceGeoclueMaster::configurePositionSource()
     if (!m_client) {
         qCritical ("QGeoPositionInfoSourceGeoclueMaster error creating GeoclueMasterClient.");
         if (error) {
-            qCritical (error->message);
+            qCritical ("Geoclue error: %s", error->message);
             g_error_free (error);
         }
         return -1;
@@ -316,7 +316,7 @@ int QGeoPositionInfoSourceGeoclueMaster::configurePositionSource()
                                                  &error)){
         qCritical ("QGeoPositionInfoSourceGeoclueMaster geoclue set_requirements failed.");
         if (error) {
-            qCritical (error->message);
+            qCritical ("Geoclue error: %s", error->message);
             g_error_free (error);
         }
         g_object_unref (m_client);