Merge branch 'vibrationrecovery' into harmattan

[ghostsoverboard] / ship.h

diff --git a/ship.h b/ship.h
index 77cd334..ffdbfb7 100644 (file)
--- a/ship.h
+++ b/ship.h
@@ -24,6 +24,7 @@
 #define SHIP_H
 
 #include "orientationcontrolledgraphicspixmapobject.h"
+#include <QFeedbackHapticsEffect>
 
 class Ship : public OrientationControlledGraphicsPixmapObject
 {
@@ -32,6 +33,8 @@ class Ship : public OrientationControlledGraphicsPixmapObject
 public:
     explicit Ship(QList<QPixmap> pixmapList, QGraphicsItem *parent = 0);
 
+    virtual ~Ship();
+
 signals:
 
     /*! Emitted when a ghost is hit */
@@ -48,7 +51,9 @@ public slots:
 
     void setVibrationActivate(bool on);
 
-protected:
+    void allowVibration();
+
+    void disallowVibration();
 
 protected:
     bool handleCollisions();
@@ -61,6 +66,10 @@ protected:
 
     bool vibrationActive_;
 
+    bool vibrationAllowed_;
+
+    QFeedbackHapticsEffect * pVibrationEffect_;
+
 
 };