From 417054f50c257f6da0cf0f08a00c909b75aa03e0 Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@nokia.com>
Date: Wed, 28 Mar 2012 16:02:02 +1000
Subject: make whip easier and remove unused variables

Change-Id: Id8b161f0de1a96a9a92a7fcbc11c9fd9c9fefe00
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
---
 src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp      | 5 -----
 src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h        | 1 -
 .../sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp        | 5 +++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp
index ea3be725..b2858b3b 100644
--- a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp
+++ b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp
@@ -144,10 +144,6 @@ void QSlamSensorGestureRecognizer::accelChanged(QAccelerometerReading *reading)
         restingList.removeLast();
     restingList.insert(0, resting);
 
-    if (xList.count() > 15)
-        xList.removeLast();
-    xList.insert(0, x);
-
     if (orientationReading == 0)
         return;
 
@@ -191,7 +187,6 @@ bool QSlamSensorGestureRecognizer::hasBeenResting()
 
 void QSlamSensorGestureRecognizer::checkForSlam()
 {
-
     if (!hasBeenResting()) {
         detecting = false;
         return;
diff --git a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
index eb31c818..ede338fa 100644
--- a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h
@@ -91,7 +91,6 @@ private:
     qreal roll;
     QList<qreal> restingList;
     bool resting;
-    QList<qreal> xList;
 
     bool hasBeenResting();
 };
diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp
index 8300f8ea..f087dce6 100644
--- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp
+++ b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp
@@ -204,9 +204,10 @@ void QWhipSensorGestureRecognizer::checkForWhip()
     }
     averageZ /= zList.count();
 
-    if (qAbs(averageZ) < 6.0)
+    if (qAbs(averageZ) < 5.0)
         return;
-    for (int i = 0; i < whipMap.count() - 1; i++) {
+
+    for (int i = 0; i < whipMap.count() - 2; i++) {
         if (!whipMap.at(i)) {
             whipOk = true;
         } else {
-- 
cgit v1.2.3