summaryrefslogtreecommitdiffstats
path: root/src/location/maps/qgeomappingmanager.cpp
diff options
context:
space:
mode:
authorDavid Laing <david.laing@nokia.com>2012-02-02 16:44:01 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-02 10:01:18 +0100
commit1b1961a07139149f8f15a19f33e2ac760cad99db (patch)
tree0e917a8ea8df8ee85834b27a9378ec63b9039f8a /src/location/maps/qgeomappingmanager.cpp
parent3030dee1efb4c0c6888be3cc21c1b0ae1795a8e2 (diff)
Makes the map library use the file extension from the plugin.
We were previously just using "png" as a hard coded value. Change-Id: Iaa1a53947706b09f95a9d9e6e416e3e49388962a Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
Diffstat (limited to 'src/location/maps/qgeomappingmanager.cpp')
-rw-r--r--src/location/maps/qgeomappingmanager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/location/maps/qgeomappingmanager.cpp b/src/location/maps/qgeomappingmanager.cpp
index 1be31632..b562f3e3 100644
--- a/src/location/maps/qgeomappingmanager.cpp
+++ b/src/location/maps/qgeomappingmanager.cpp
@@ -106,9 +106,9 @@ QGeoMappingManager::QGeoMappingManager(QGeoMappingManagerEngine *engine, QObject
qRegisterMetaType<QGeoTileSpec>();
connect(d_ptr->engine,
- SIGNAL(tileFinished(QGeoTileSpec,QByteArray)),
+ SIGNAL(tileFinished(QGeoTileSpec,QByteArray,QString)),
this,
- SLOT(engineTileFinished(QGeoTileSpec,QByteArray)),
+ SLOT(engineTileFinished(QGeoTileSpec,QByteArray,QString)),
Qt::QueuedConnection);
connect(d_ptr->engine,
SIGNAL(tileError(QGeoTileSpec,QString)),
@@ -262,7 +262,7 @@ void QGeoMappingManager::updateTileRequests(QGeoMap *map,
Q_ARG(QSet<QGeoTileSpec>, cancelTiles));
}
-void QGeoMappingManager::engineTileFinished(const QGeoTileSpec &spec, const QByteArray &bytes)
+void QGeoMappingManager::engineTileFinished(const QGeoTileSpec &spec, const QByteArray &bytes, const QString &format)
{
QSet<QGeoTileCache*> caches;
@@ -290,7 +290,7 @@ void QGeoMappingManager::engineTileFinished(const QGeoTileSpec &spec, const QByt
cache_iter cache = caches.constBegin();
cache_iter cacheEnd = caches.constEnd();
for (; cache != cacheEnd; ++cache) {
- (*cache)->insert(spec, bytes, d_ptr->engine->cacheHint());
+ (*cache)->insert(spec, bytes, format, d_ptr->engine->cacheHint());
}
map = maps.constBegin();