From 53a555053376bbad0a21649464370772447475c5 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 22 Mar 2012 15:32:13 +0100 Subject: qshake[2]recognizer: Fix MSVC compiler warnings. Warnings about conversion from qreal to bool, which is unintended. Change-Id: Iab668747d5d7cdeda57f934b90991e7b00914eac Reviewed-by: Lorn Potter --- .../sensorgestures/qtsensors/qshake2recognizer.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/plugins/sensorgestures/qtsensors') diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp index c7686c8a..738d720b 100644 --- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp @@ -115,10 +115,15 @@ void QShake2SensorGestureRecognizer::accelChanged(QAccelerometerReading *reading currentData.y = y; currentData.z = z; - if ( (qAbs(currentData.x - prevData.x) - || qAbs(currentData.y - prevData.y) - || qAbs(currentData.z - prevData.z)) < 1) + if (qAbs(prevData.x - currentData.x) < 1 + && qAbs(prevData.y - currentData.y) < 1 + && qAbs(prevData.z - currentData.z) < 1) { + + prevData.x = currentData.x; + prevData.y = currentData.y; + prevData.z = currentData.z; return; + } if (!shaking && checkForShake(prevData, currentData, THRESHOLD) && shakeCount >= NUMBER_SHAKES) { @@ -150,8 +155,8 @@ void QShake2SensorGestureRecognizer::accelChanged(QAccelerometerReading *reading if (shakeCount == 0 && shakeDirection == QShake2SensorGestureRecognizer::ShakeUndefined) { - const int xdiff = currentData.x - prevData.x; - const int ydiff = currentData.y - prevData.y; + const int xdiff = prevData.x - currentData.x; + const int ydiff = prevData.x - currentData.y; const int max = qMax(qAbs(ydiff), qAbs(xdiff)); -- cgit v1.2.3