Rename setCamera to setCameraData in qgeocameratiles

Keeps the same function name across all classes.

Change-Id: I3f8b723ce513e50ea93a3fd1af99c7d2ba79a11d
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

5 files changed, 11 insertions, 11 deletions

diff --git a/src/location/maps/qgeocameratiles.cpp b/src/location/maps/qgeocameratiles.cpp
index 33c140ee..4a97220d 100644
--- a/src/location/maps/qgeocameratiles.cpp
+++ b/src/location/maps/qgeocameratiles.cpp
@@ -178,7 +178,7 @@ QSet<QGeoTileSpec> QGeoCameraTiles::prefetchTiles(PrefetchStle style)
     return d_ptr->m_tiles;
 }
 
-void QGeoCameraTiles::setCamera(const QGeoCameraData &camera)
+void QGeoCameraTiles::setCameraData(const QGeoCameraData &camera)
 {
     if (d_ptr->m_camera == camera)
         return;
@@ -248,7 +248,7 @@ void QGeoCameraTiles::setMaximumZoomLevel(int maxZoom)
     d_ptr->m_maxZoom = maxZoom;
 }
 
-QSet<QGeoTileSpec> QGeoCameraTiles::visibleTiles()
+const QSet<QGeoTileSpec>& QGeoCameraTiles::visibleTiles()
 {
     if (d_ptr->m_dirtyGeometry) {
         d_ptr->m_tiles.clear();
diff --git a/src/location/maps/qgeocameratiles_p.h b/src/location/maps/qgeocameratiles_p.h
index e3260283..e133f8e6 100644
--- a/src/location/maps/qgeocameratiles_p.h
+++ b/src/location/maps/qgeocameratiles_p.h
@@ -65,7 +65,7 @@ public:
 
     enum PrefetchStle { PrefetchNeighbourLayer, PrefetchTwoNeighbourLayers};
 
-    void setCamera(const QGeoCameraData &camera);
+    void setCameraData(const QGeoCameraData &camera);
     void setScreenSize(const QSize &size);
     void setTileSize(int tileSize);
     void setMaximumZoomLevel(int maxZoom);
@@ -76,7 +76,7 @@ public:
     void setMapType(const QGeoMapType &mapType);
     void setMapVersion(int mapVersion);
 
-    QSet<QGeoTileSpec> visibleTiles();
+    const QSet<QGeoTileSpec>& visibleTiles();
     QSet<QGeoTileSpec> prefetchTiles(PrefetchStle style);
 
 protected:
diff --git a/src/location/maps/qgeotiledmap.cpp b/src/location/maps/qgeotiledmap.cpp
index 60e27d8e..4e635c4b 100644
--- a/src/location/maps/qgeotiledmap.cpp
+++ b/src/location/maps/qgeotiledmap.cpp
@@ -202,7 +202,7 @@ void QGeoTiledMapPrivate::changeCameraData(const QGeoCameraData &oldCameraData)
         cam.setZoomLevel(izl);
     }
 
-    m_cameraTiles->setCamera(cam);
+    m_cameraTiles->setCameraData(cam);
 
     m_mapScene->setCameraData(cam);
     m_mapScene->setVisibleTiles(m_cameraTiles->visibleTiles());
diff --git a/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp b/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp
index 17639c06..b4f3a797 100644
--- a/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp
+++ b/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp
@@ -122,7 +122,7 @@ private slots:
         QGeoCameraTiles ct;
         ct.setMaximumZoomLevel(8);
         ct.setTileSize(16);
-        ct.setCamera(camera);
+        ct.setCameraData(camera);
         ct.setScreenSize(QSize(32, 32));
         ct.setMapType(QGeoMapType(QGeoMapType::StreetMap, "street map", "street map", false, false, 1));
 
@@ -171,7 +171,7 @@ private slots:
         QGeoCameraTiles ct;
         ct.setMaximumZoomLevel(8);
         ct.setTileSize(16);
-        ct.setCamera(camera);
+        ct.setCameraData(camera);
         ct.setScreenSize(QSize(32, 32));
         ct.setPluginString("pluginA");
 
@@ -230,7 +230,7 @@ private slots:
         QGeoCameraTiles ct;
         ct.setMaximumZoomLevel(8);
         ct.setTileSize(16);
-        ct.setCamera(camera);
+        ct.setCameraData(camera);
         ct.setScreenSize(QSize(std::ceil(width), std::ceil(height)));
 
         QSet<QGeoTileSpec> tiles;
diff --git a/tests/auto/qgeomapscene/tst_qgeomapscene.cpp b/tests/auto/qgeomapscene/tst_qgeomapscene.cpp
index e76e2d2a..ac12d986 100644
--- a/tests/auto/qgeomapscene/tst_qgeomapscene.cpp
+++ b/tests/auto/qgeomapscene/tst_qgeomapscene.cpp
@@ -284,7 +284,7 @@ class tst_QGeoMapScene : public QObject
             QGeoCameraTiles ct;
             ct.setMaximumZoomLevel(8);
             ct.setTileSize(16);
-            ct.setCamera(camera);
+            ct.setCameraData(camera);
             ct.setScreenSize(QSize(16,16));
 
             QGeoMapScene mapScene;
@@ -326,7 +326,7 @@ class tst_QGeoMapScene : public QObject
             QGeoCameraTiles ct;
             ct.setMaximumZoomLevel(8);
             ct.setTileSize(tileSize);
-            ct.setCamera(camera);
+            ct.setCameraData(camera);
             ct.setScreenSize(QSize(screenWidth,screenHeight));
 
             QGeoMapScene mapGeometry;
@@ -366,7 +366,7 @@ class tst_QGeoMapScene : public QObject
             QGeoCameraTiles ct;
             ct.setMaximumZoomLevel(8);
             ct.setTileSize(tileSize);
-            ct.setCamera(camera);
+            ct.setCameraData(camera);
             ct.setScreenSize(QSize(screenWidth,screenHeight));
 
             QGeoMapScene mapGeometry;