diff options
author | Lorn Potter <lorn.potter@nokia.com> | 2012-02-15 12:44:00 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-15 04:15:01 +0100 |
commit | c75ae5a33d3ee16181bf503db33ef7919fb40124 (patch) | |
tree | 8277771f2087d99d7909671a97148a06a760f7c1 /src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp | |
parent | c2efee09b6e54676250ae43a4c63e41e1ad7a6ab (diff) |
use qAbs instead.
Change-Id: Ibcc49c56d558563737d2d94a87425e65d0689c1e
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp')
-rw-r--r-- | src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp index cd77582f..80b19d88 100644 --- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp @@ -110,9 +110,9 @@ void QShake2SensorGestureRecognizer::accelChanged() currentData.y = y; currentData.z = z; - if ( (abs(currentData.x - prevData.x) - || abs(currentData.y - prevData.y) - || abs(currentData.z - prevData.z)) < 1) + if ( (qAbs(currentData.x - prevData.x) + || qAbs(currentData.y - prevData.y) + || qAbs(currentData.z - prevData.z)) < 1) return; if (!shaking && checkForShake(prevData, currentData, THRESHOLD) && @@ -148,15 +148,15 @@ void QShake2SensorGestureRecognizer::accelChanged() int xdiff = currentData.x - prevData.x; int ydiff = currentData.y - prevData.y; - int max = qMax(abs(ydiff), abs(xdiff)); + int max = qMax(qAbs(ydiff), qAbs(xdiff)); - if (max == abs(xdiff)) { + if (max == qAbs(xdiff)) { if (isNegative(xdiff)) shakeDirection = QShake2SensorGestureRecognizer::ShakeLeft; else shakeDirection = QShake2SensorGestureRecognizer::ShakeRight; - } else if (max == abs(ydiff)) { + } else if (max == qAbs(ydiff)) { if (isNegative(ydiff)) shakeDirection = QShake2SensorGestureRecognizer::ShakeDown; else |