Remove createTileCacheWithDir from QGeoTiledMappingManagerEngine

Recent change adds setter for TileCache, use new setter
in here plugin, remove obsolate create function.

Change-Id: I8f5ee726f6c14ea6fa2adf82a4713d5b37c6a78b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

3 files changed, 4 insertions, 12 deletions

diff --git a/src/location/maps/qgeotiledmappingmanagerengine.cpp b/src/location/maps/qgeotiledmappingmanagerengine.cpp
index 20121dfc..4e777ab2 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine.cpp
+++ b/src/location/maps/qgeotiledmappingmanagerengine.cpp
@@ -278,15 +278,8 @@ void QGeoTiledMappingManagerEngine::setCacheHint(QGeoTiledMappingManagerEngine::
 void QGeoTiledMappingManagerEngine::setTileCache(QAbstractGeoTileCache *cache)
 {
     Q_D(QGeoTiledMappingManagerEngine);
-    d->tileCache_ = cache;
-}
-
-QAbstractGeoTileCache *QGeoTiledMappingManagerEngine::createTileCacheWithDir(const QString &cacheDirectory)
-{
-    Q_D(QGeoTiledMappingManagerEngine);
     Q_ASSERT_X(!d->tileCache_, Q_FUNC_INFO, "This should be called only once");
-    d->tileCache_ = new QGeoFileTileCache(cacheDirectory);
-    return d->tileCache_;
+    d->tileCache_ = cache;
 }
 
 QAbstractGeoTileCache *QGeoTiledMappingManagerEngine::tileCache()
diff --git a/src/location/maps/qgeotiledmappingmanagerengine_p.h b/src/location/maps/qgeotiledmappingmanagerengine_p.h
index f3b42f3f..86c5b63c 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine_p.h
+++ b/src/location/maps/qgeotiledmappingmanagerengine_p.h
@@ -93,7 +93,7 @@ public:
                             const QSet<QGeoTileSpec> &tilesAdded,
                             const QSet<QGeoTileSpec> &tilesRemoved);
 
-    QAbstractGeoTileCache *tileCache(); // TODO: check this is still used
+    QAbstractGeoTileCache *tileCache();
     QSharedPointer<QGeoTileTexture> getTileTexture(const QGeoTileSpec &spec);
 
 
@@ -114,8 +114,6 @@ protected:
     void setCacheHint(QGeoTiledMappingManagerEngine::CacheAreas cacheHint);
     void setTileCache(QAbstractGeoTileCache *cache);
 
-    QAbstractGeoTileCache *createTileCacheWithDir(const QString &cacheDirectory);
-
 private:
     QGeoTiledMappingManagerEnginePrivate *d_ptr;
 
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
index cc7af6d0..0713ba10 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
@@ -108,7 +108,8 @@ QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia(
         m_cacheDirectory = QAbstractGeoTileCache::baseCacheDirectory() + QLatin1String("here");
     }
 
-    QAbstractGeoTileCache *tileCache = createTileCacheWithDir(m_cacheDirectory);
+    QAbstractGeoTileCache *tileCache = new QGeoFileTileCache(m_cacheDirectory);
+    setTileCache(tileCache);
 
     if (parameters.contains(QStringLiteral("here.mapping.cache.disk.size"))) {
       bool ok = false;