From 263556ceda91a66073361b5917b9fe5b2c79f84e Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Mon, 1 Jun 2015 11:21:00 +0200 Subject: Rename setCamera to setCameraData in qgeocameratiles Keeps the same function name across all classes. Change-Id: I3f8b723ce513e50ea93a3fd1af99c7d2ba79a11d Reviewed-by: Alex Blasche --- tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp | 6 +++--- tests/auto/qgeomapscene/tst_qgeomapscene.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'tests') 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 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; -- cgit v1.2.3