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

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

diff --git a/dali/internal/event/events/tap-gesture/tap-gesture-processor.cpp b/dali/internal/event/events/tap-gesture/tap-gesture-processor.cpp
index cf74b6f..7b3fce6 100644 (file)
--- a/dali/internal/event/events/tap-gesture/tap-gesture-processor.cpp
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-processor.cpp
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -31,6 +31,7 @@
 #include <dali/internal/event/render-tasks/render-task-impl.h>
 #include <dali/internal/event/common/scene-impl.h>
 #include <dali/internal/event/events/tap-gesture/tap-gesture-recognizer.h>
+#include <dali/internal/event/events/tap-gesture/tap-gesture-impl.h>
 #include <dali/internal/event/events/gesture-requests.h>
 #include <dali/internal/event/events/tap-gesture/tap-gesture-event.h>
 
@@ -56,44 +57,42 @@ void EmitTapSignal(
   const TapGestureEvent& tapEvent,
   Vector2 localPoint)
 {
-  TapGesture tap;
-  tap.time = tapEvent.time;
-  tap.numberOfTaps = tapEvent.numberOfTaps;
-  tap.numberOfTouches = tapEvent.numberOfTouches;
-  tap.screenPoint = tapEvent.point;
-  tap.localPoint = localPoint;
+  Internal::TapGesturePtr tap( new Internal::TapGesture(tapEvent.state) );
+  tap->SetTime( tapEvent.time );
+  tap->SetNumberOfTaps(tapEvent.numberOfTaps);
+  tap->SetNumberOfTouches(tapEvent.numberOfTouches);
+  tap->SetScreenPoint(tapEvent.point);
+  tap->SetLocalPoint(localPoint);
 
   Dali::Actor actorHandle( actor );
   const GestureDetectorContainer::const_iterator endIter = gestureDetectors.end();
   for ( GestureDetectorContainer::const_iterator iter = gestureDetectors.begin(); iter != endIter; ++iter )
   {
-    static_cast< TapGestureDetector* >( *iter )->EmitTapGestureSignal( actorHandle, tap );
+    static_cast< TapGestureDetector* >( *iter )->EmitTapGestureSignal( actorHandle, Dali::TapGesture( tap.Get() ) );
   }
 }
 
 } // unnamed namespace
 
 TapGestureProcessor::TapGestureProcessor()
-: GestureProcessor( Gesture::Tap ),
+: GestureProcessor( GestureType::TAP ),
   mTapGestureDetectors(),
   mMinTapsRequired( 1 ),
   mMaxTapsRequired( 1 ),
   mMinTouchesRequired( 1 ),
   mMaxTouchesRequired( 1 ),
-  mCurrentTapEvent( NULL ),
+  mCurrentTapEvent( nullptr ),
   mPossibleProcessed( false )
 {
 }
 
-TapGestureProcessor::~TapGestureProcessor()
-{
-}
+TapGestureProcessor::~TapGestureProcessor() = default;
 
 void TapGestureProcessor::Process( Scene& scene, const TapGestureEvent& tapEvent )
 {
   switch ( tapEvent.state )
   {
-    case Gesture::Possible:
+    case GestureState::POSSIBLE:
     {
       // Do a hit test and if an actor has been hit then save to see if tap event is still valid on a tap( same actor being hit )
       HitTestAlgorithm::Results hitTestResults;
@@ -112,7 +111,7 @@ void TapGestureProcessor::Process( Scene& scene, const TapGestureEvent& tapEvent
       break;
     }
 
-    case Gesture::Started:
+    case GestureState::STARTED:
     {
       // Ensure that we're processing a hit on the current actor and that we've already processed a touch down
       HitTestAlgorithm::Results hitTestResults;
@@ -124,32 +123,32 @@ void TapGestureProcessor::Process( Scene& scene, const TapGestureEvent& tapEvent
           mCurrentTapEvent = &tapEvent;
           ProcessAndEmit( hitTestResults );
         }
-        mCurrentTapEvent = NULL;
+        mCurrentTapEvent = nullptr;
         mPossibleProcessed = false;
       }
       break;
     }
 
-    case Gesture::Cancelled:
+    case GestureState::CANCELLED:
     {
       mPossibleProcessed = false;
       ResetActor();
       break;
     }
 
-    case Gesture::Continuing:
+    case GestureState::CONTINUING:
     {
-      DALI_ABORT( "Incorrect state received from Integration layer: Continuing\n" );
+      DALI_ABORT( "Incorrect state received from Integration layer: CONTINUING\n" );
       break;
     }
-    case Gesture::Finished:
+    case GestureState::FINISHED:
     {
-      DALI_ABORT( "Incorrect state received from Integration layer: Finished\n" );
+      DALI_ABORT( "Incorrect state received from Integration layer: FINISHED\n" );
       break;
     }
-    case Gesture::Clear:
+    case GestureState::CLEAR:
     {
-      DALI_ABORT( "Incorrect state received from Integration layer: Clear\n" );
+      DALI_ABORT( "Incorrect state received from Integration layer: CLEAR\n" );
       break;
     }
   }