Moved Gesture::State and -::Type to gesture-enumerations.h.

[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 a40e553..c01c3d5 100644 (file)
--- a/dali/internal/event/events/gesture-requests.h
+++ b/dali/internal/event/events/gesture-requests.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_GESTURE_REQUESTS_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,20 +38,19 @@ struct GestureRequest
    * Default Constructor
    * @param[in]  typeRequired  The gesture type required
    */
-  GestureRequest(Gesture::Type typeRequired) : type(typeRequired)
+  GestureRequest( GestureType::Value typeRequired )
+  : type( typeRequired )
   {
   }
 
   /**
    * Virtual destructor
    */
-  virtual ~GestureRequest()
-  {
-  }
+  virtual ~GestureRequest() = default;
 
   // Data Members
 
-  Gesture::Type type; ///< The type of gesture required.
+  GestureType::Value type; ///< The type of gesture required.
 };
 
 /**
@@ -65,7 +64,7 @@ struct PanGestureRequest : public GestureRequest
    * Default Constructor
    */
   PanGestureRequest()
-  : GestureRequest(Gesture::Pan),
+  : GestureRequest(GestureType::PAN),
     minTouches(1),
     maxTouches(1)
   {
@@ -85,29 +84,6 @@ struct PanGestureRequest : public GestureRequest
 };
 
 /**
- * This is used by Core when a pinch gesture is required.
- */
-struct PinchGestureRequest : public GestureRequest
-{
-  // Creation & Destruction
-
-  /**
-   * Default Constructor
-   */
-  PinchGestureRequest()
-  : GestureRequest(Gesture::Pinch)
-  {
-  }
-
-  /**
-   * Virtual destructor
-   */
-  virtual ~PinchGestureRequest()
-  {
-  }
-};
-
-/**
  * This is used by Core when a tap gesture is required.
  */
 struct TapGestureRequest : public GestureRequest
@@ -118,7 +94,7 @@ struct TapGestureRequest : public GestureRequest
    * Default Constructor
    */
   TapGestureRequest()
-  : GestureRequest(Gesture::Tap),
+  : GestureRequest(GestureType::TAP),
     minTaps(1),
     maxTaps(1),
     minTouches(1),
@@ -152,7 +128,7 @@ struct LongPressGestureRequest : public GestureRequest
    * Default Constructor
    */
   LongPressGestureRequest()
-  : GestureRequest(Gesture::LongPress),
+  : GestureRequest(GestureType::LONG_PRESS),
     minTouches(1),
     maxTouches(1)
   {