Merge branch 'devel/tizen' into tizen

[platform/core/uifw/dali-core.git] / dali / internal / event / events / gesture-processor.cpp

diff --git a/dali/internal/event/events/gesture-processor.cpp b/dali/internal/event/events/gesture-processor.cpp
index 773cadb..c294c54 100644 (file)
--- a/dali/internal/event/events/gesture-processor.cpp
+++ b/dali/internal/event/events/gesture-processor.cpp
@@ -41,11 +41,16 @@ namespace
  */
 struct GestureHitTestCheck : public HitTestAlgorithm::HitTestInterface
 {
-  GestureHitTestCheck( Gesture::Type type )
+  GestureHitTestCheck( DevelGesture::Type type )
   : mType( type )
   {
   }
 
+  GestureHitTestCheck( Gesture::Type type )
+  : GestureHitTestCheck( static_cast< DevelGesture::Type >( type ) )
+  {
+  }
+
   virtual bool IsActorHittable( Actor* actor )
   {
     return actor->IsGestureRequred( mType ) && // Does the Application or derived actor type require the gesture?
@@ -63,13 +68,13 @@ struct GestureHitTestCheck : public HitTestAlgorithm::HitTestInterface
     return layer->IsTouchConsumed();
   }
 
-  Gesture::Type mType;
+  DevelGesture::Type mType;
 };
 
 } // unnamed namespace
 
 
-GestureProcessor::GestureProcessor( Gesture::Type type )
+GestureProcessor::GestureProcessor( DevelGesture::Type type )
 : mGestureRecognizer(),
   mNeedsUpdate( false ),
   mType( type ),
@@ -78,6 +83,12 @@ GestureProcessor::GestureProcessor( Gesture::Type type )
 {
 }
 
+GestureProcessor::GestureProcessor( Gesture::Type type )
+: GestureProcessor( static_cast< DevelGesture::Type >( type ) )
+{
+}
+
+
 GestureProcessor::~GestureProcessor()
 {
   ResetActor();