Merge "Clean up the code to build successfully on macOS" into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / event / events / gesture-requests.h

diff --git a/dali/internal/event/events/gesture-requests.h b/dali/internal/event/events/gesture-requests.h
index a74f35a..aad5e37 100644 (file)
--- a/dali/internal/event/events/gesture-requests.h
+++ b/dali/internal/event/events/gesture-requests.h
@@ -38,7 +38,7 @@ struct GestureRequest
    * Default Constructor
    * @param[in]  typeRequired  The gesture type required
    */
-  GestureRequest( Gesture::Type typeRequired )
+  GestureRequest( GestureType::Value typeRequired )
   : type( typeRequired )
   {
   }
@@ -50,7 +50,7 @@ struct GestureRequest
 
   // Data Members
 
-  Gesture::Type type; ///< The type of gesture required.
+  GestureType::Value type; ///< The type of gesture required.
 };
 
 /**
@@ -64,7 +64,7 @@ struct PanGestureRequest : public GestureRequest
    * Default Constructor
    */
   PanGestureRequest()
-  : GestureRequest(Dali::Gesture::Pan),
+  : GestureRequest(GestureType::PAN),
     minTouches(1),
     maxTouches(1)
   {
@@ -73,9 +73,7 @@ struct PanGestureRequest : public GestureRequest
   /**
    * Virtual destructor
    */
-  virtual ~PanGestureRequest()
-  {
-  }
+  ~PanGestureRequest() override = default;
 
   // Data Members
 
@@ -94,7 +92,7 @@ struct TapGestureRequest : public GestureRequest
    * Default Constructor
    */
   TapGestureRequest()
-  : GestureRequest(Dali::Gesture::Tap),
+  : GestureRequest(GestureType::TAP),
     minTaps(1),
     maxTaps(1),
     minTouches(1),
@@ -105,9 +103,7 @@ struct TapGestureRequest : public GestureRequest
   /**
    * Virtual destructor
    */
-  virtual ~TapGestureRequest()
-  {
-  }
+  ~TapGestureRequest() override = default;
 
   // Data Members
 
@@ -128,7 +124,7 @@ struct LongPressGestureRequest : public GestureRequest
    * Default Constructor
    */
   LongPressGestureRequest()
-  : GestureRequest(Dali::Gesture::LongPress),
+  : GestureRequest(GestureType::LONG_PRESS),
     minTouches(1),
     maxTouches(1)
   {
@@ -137,9 +133,7 @@ struct LongPressGestureRequest : public GestureRequest
   /**
    * Virtual destructor
    */
-  virtual ~LongPressGestureRequest()
-  {
-  }
+  ~LongPressGestureRequest() override = default;
 
   // Data Members