aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickspringanimation.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-02-13 12:02:19 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-02-19 10:49:03 +0000
commit373ce8878321aa561b55131bada78ad4a2ce8427 (patch)
tree0b64429ea79163f1f13b4073bbe60040047d0540 /src/quick/util/qquickspringanimation.cpp
parent6f264b755501fd322d1e357187b42120210a7ba3 (diff)
Cleanup math function includes and usage
Use std::math on floats and doubles, and qMath on qreals, and only include the math headers actually needed. Change-Id: I1d511d7b1bac0050eaa947c7baee760b736858bf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick/util/qquickspringanimation.cpp')
-rw-r--r--src/quick/util/qquickspringanimation.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/quick/util/qquickspringanimation.cpp b/src/quick/util/qquickspringanimation.cpp
index f4c888b943..f2eee6a802 100644
--- a/src/quick/util/qquickspringanimation.cpp
+++ b/src/quick/util/qquickspringanimation.cpp
@@ -41,8 +41,7 @@
#include <private/qobject_p.h>
-#include <limits.h>
-#include <math.h>
+#include <cmath>
#define DELAY_STOP_TIMER_INTERVAL 32
@@ -282,11 +281,11 @@ void QSpringAnimation::updateCurrentTime(int time)
if (diff > 0) {
currentValue += moveBy;
if (haveModulus)
- currentValue = fmod(currentValue, modulus);
+ currentValue = std::fmod(currentValue, modulus);
} else {
currentValue -= moveBy;
if (haveModulus && currentValue < 0.0)
- currentValue = fmod(currentValue, modulus) + modulus;
+ currentValue = std::fmod(currentValue, modulus) + modulus;
}
if (lastTime - startTime >= dura) {
currentValue = to;