1 files changed, 14 insertions, 16 deletions
diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.h b/src/plugins/sensorgestures/shake/qshakerecognizer.h
index 4292c664..dfba26b3 100644
--- a/src/plugins/sensorgestures/shake/qshakerecognizer.h
+++ b/src/plugins/sensorgestures/shake/qshakerecognizer.h
@@ -51,6 +51,12 @@
 
 #include <qsensorgesturerecognizer.h>
 
+ struct AccelData {
+    qreal x;
+    qreal y;
+    qreal z;
+};
+
 class QShakeSensorGestureRecognizer : public QSensorGestureRecognizer
 {
     Q_OBJECT
@@ -67,32 +73,24 @@ public:
     bool stop();
     bool isActive();
 
-    int thresholdTime() const;
-    void setThresholdTime(int msec);
-
 Q_SIGNALS:
     void shake();
 
 private slots:
     void accelChanged();
-    void timeout();
 private:
     QAccelerometer *accel;
+    bool active;
+    int accelRange;
 
-    qreal pXaxis;
-    qreal nXaxis;
-
-    qreal pYaxis;
-    qreal nYaxis;
+    AccelData prevData;
+    AccelData currentData;
 
-    qreal pZaxis;
-    qreal nZaxis;
+    bool checkForShake(AccelData prevSensorData, AccelData currentSensorData, qreal threshold);
+    bool shaking;
+    int shakeCount;
+    int threshold;
 
-    bool detectingState;
-    QTimer *timer;
-    int timerTimeout;
-    bool active;
-    int accelRange;
 };
 
 #endif // QSHAKERECOGNIZER_H