Merge "Changed 'virtual' function override declarations to 'override' in automated...

[platform/core/uifw/dali-adaptor.git] / dali / internal / accessibility / common / accessibility-gesture-detector.h

diff --git a/dali/internal/accessibility/common/accessibility-gesture-detector.h b/dali/internal/accessibility/common/accessibility-gesture-detector.h
index 616d76e..aa6bc54 100644 (file)
--- a/dali/internal/accessibility/common/accessibility-gesture-detector.h
+++ b/dali/internal/accessibility/common/accessibility-gesture-detector.h
@@ -24,7 +24,6 @@
 #include <dali/devel-api/adaptor-framework/accessibility-gesture-handler.h>
 #include <dali/devel-api/adaptor-framework/accessibility-gesture-event.h>
 #include <dali/integration-api/scene.h>
-#include <dali/public-api/events/touch-event.h>
 
 namespace Dali
 {
@@ -55,7 +54,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~AccessibilityGestureDetector();
+  ~AccessibilityGestureDetector() override;
 
   /**
    * Set the handler to handle accessibility gestures.
@@ -94,11 +93,11 @@ private:
    */
   enum State
   {
-    Clear,    ///< No gesture detected.
-    Possible, ///< The current touch event data suggests that a gesture is possible.
-    Started,  ///< A gesture has been detected.
-    Finished, ///< A previously started pan gesture has finished.
-    Failed,   ///< Current touch event data suggests a pan gesture is not possible.
+    CLEAR,    ///< No gesture detected.
+    POSSIBLE, ///< The current touch event data suggests that a gesture is possible.
+    STARTED,  ///< A gesture has been detected.
+    FINISHED, ///< A previously started pan gesture has finished.
+    FAILED,   ///< Current touch event data suggests a pan gesture is not possible.
   };
 
   State mState; ///< The current state of the detector.