summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2016-12-09 14:13:31 +0100
committerPaolo Angelelli <paolo.angelelli@qt.io>2016-12-09 13:19:09 +0000
commitd08213709959cd52f55b8a277e7485ae14e441c2 (patch)
tree7a24bcec93d2d30140bc51699ff494233863bdcf /tests
parent2906563af414810a71d704db7b4d5f7c882c3667 (diff)
downloadqtlocation-d08213709959cd52f55b8a277e7485ae14e441c2.tar.gz
Compile-fix: qAbs is less ambiguous than abs(double)
Furthermore, since the candidates for abs(), that g++ found, all took integral parameters, they would have involved truncation. Our qAbs() is suitably templated to cope with double naturally. Change-Id: I373a08657ed182c7d853104879b07fb7704cc418 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp b/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp
index b619b6ce..c304c905 100644
--- a/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp
+++ b/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp
@@ -92,7 +92,7 @@ class tst_QGeoTiledMapScene : public QObject
// bottom left
screenX = screenX2 = 0.0;
if (matchingMapEnds)
- screenX2 = abs(screenX - 1.0) * screenWidth;
+ screenX2 = qAbs(screenX - 1.0) * screenWidth;
screenY = 1.0 * screenHeight;
mercatorX = cameraCenterX - scaledHalfLengthX;
mercatorY = cameraCenterY + scaledHalfLengthY;
@@ -110,7 +110,7 @@ class tst_QGeoTiledMapScene : public QObject
// bottom right
screenX = screenX2 = 1.0 * screenWidth;
if (matchingMapEnds)
- screenX2 = abs(screenX - 1.0) * screenWidth;
+ screenX2 = qAbs(screenX - 1.0) * screenWidth;
screenY = 1.0 * screenHeight;
mercatorX = cameraCenterX + scaledHalfLengthX;
mercatorY = cameraCenterY + scaledHalfLengthY;
@@ -120,7 +120,7 @@ class tst_QGeoTiledMapScene : public QObject
// left
screenX = screenX2 = 0.0 * screenWidth;
if (matchingMapEnds)
- screenX2 = abs(screenX - 1.0) * screenWidth;
+ screenX2 = qAbs(screenX - 1.0) * screenWidth;
screenY = 0.5 * screenHeight;
mercatorX = cameraCenterX - scaledHalfLengthX;
mercatorY = cameraCenterY;
@@ -138,7 +138,7 @@ class tst_QGeoTiledMapScene : public QObject
// right
screenX = screenX2 = 1.0 * screenWidth;
if (matchingMapEnds)
- screenX2 = abs(screenX - 1.0) * screenWidth;
+ screenX2 = qAbs(screenX - 1.0) * screenWidth;
screenY = 0.5 * screenHeight;
mercatorX = cameraCenterX + scaledHalfLengthX;
mercatorY = cameraCenterY;
@@ -148,7 +148,7 @@ class tst_QGeoTiledMapScene : public QObject
// top left
screenX = screenX2 = 0.0;
if (matchingMapEnds)
- screenX2 = abs(screenX - 1.0) * screenWidth;
+ screenX2 = qAbs(screenX - 1.0) * screenWidth;
screenY = 0.0;
mercatorX = cameraCenterX - scaledHalfLengthX;
mercatorY = cameraCenterY - scaledHalfLengthY;
@@ -166,7 +166,7 @@ class tst_QGeoTiledMapScene : public QObject
// top right
screenX = screenX2 = 1.0 * screenWidth;
if (matchingMapEnds)
- screenX2 = abs(screenX - 1.0) * screenWidth;
+ screenX2 = qAbs(screenX - 1.0) * screenWidth;
screenY = 0.0;
mercatorX = cameraCenterX + scaledHalfLengthX;
mercatorY = cameraCenterY - scaledHalfLengthY;