Revert "[Tizen] Not execute the remove callback"

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

diff --git a/dali/internal/event/events/actor-gesture-data.cpp b/dali/internal/event/events/actor-gesture-data.cpp
index 1967bac..fc532a7 100644 (file)
--- a/dali/internal/event/events/actor-gesture-data.cpp
+++ b/dali/internal/event/events/actor-gesture-data.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -20,17 +20,15 @@
 
 namespace Dali
 {
-
 namespace Internal
 {
-
 ActorGestureData::ActorGestureData()
-: gesturesRequired( Gesture::Type( 0 ) ),
-  panDetectors( nullptr ),
-  pinchDetectors( nullptr ),
-  longPressDetectors( nullptr ),
-  tapDetectors( nullptr ),
-  rotationDetectors( nullptr )
+: gesturesRequired(GestureType::Value(0)),
+  panDetectors(nullptr),
+  pinchDetectors(nullptr),
+  longPressDetectors(nullptr),
+  tapDetectors(nullptr),
+  rotationDetectors(nullptr)
 {
 }
 
@@ -43,81 +41,80 @@ ActorGestureData::~ActorGestureData()
   delete rotationDetectors;
 }
 
-void ActorGestureData::AddGestureDetector( GestureDetector& detector )
+void ActorGestureData::AddGestureDetector(GestureDetector& detector)
 {
-  const Gesture::Type type( detector.GetType() );
+  const GestureType::Value type(detector.GetType());
 
-  GestureDetectorContainer*& containerPtr( GetContainerPtr( type ) );
-  if ( NULL == containerPtr )
+  GestureDetectorContainer*& containerPtr(GetContainerPtr(type));
+  if(nullptr == containerPtr)
   {
     containerPtr = new GestureDetectorContainer;
   }
-  containerPtr->push_back( &detector );
+  containerPtr->push_back(&detector);
 
-  gesturesRequired = Gesture::Type( gesturesRequired | type );
+  gesturesRequired = GestureType::Value(gesturesRequired | type);
 }
 
-void ActorGestureData::RemoveGestureDetector( GestureDetector& detector )
+void ActorGestureData::RemoveGestureDetector(GestureDetector& detector)
 {
-  const Gesture::Type type( detector.GetType() );
+  const GestureType::Value type(detector.GetType());
 
-  GestureDetectorContainer*& containerPtr( GetContainerPtr( type ) );
-  DALI_ASSERT_DEBUG( containerPtr && "Container had not been created" );
+  GestureDetectorContainer*& containerPtr(GetContainerPtr(type));
+  DALI_ASSERT_DEBUG(containerPtr && "Container had not been created");
 
-  GestureDetectorContainer& container( *containerPtr );
-  GestureDetectorContainer::iterator match( std::remove( container.begin(), container.end(), &detector ) );
-  DALI_ASSERT_DEBUG( match != container.end() && "Actor does not have the detector" );
-  container.erase( match, container.end() );
+  GestureDetectorContainer&          container(*containerPtr);
+  GestureDetectorContainer::iterator match(std::remove(container.begin(), container.end(), &detector));
+  DALI_ASSERT_DEBUG(match != container.end() && "Actor does not have the detector");
+  container.erase(match, container.end());
 
-  if ( container.empty() )
+  if(container.empty())
   {
-    gesturesRequired = Gesture::Type( gesturesRequired & ~type );
+    gesturesRequired = GestureType::Value(gesturesRequired & ~type);
     delete containerPtr;
-    containerPtr = NULL;
+    containerPtr = nullptr;
   }
 }
 
-GestureDetectorContainer& ActorGestureData::GetGestureDetectorContainer( Gesture::Type type )
+GestureDetectorContainer& ActorGestureData::GetGestureDetectorContainer(GestureType::Value type)
 {
-  return *GetContainerPtr( type );
+  return *GetContainerPtr(type);
 }
 
-GestureDetectorContainer*& ActorGestureData::GetContainerPtr( Gesture::Type type )
+GestureDetectorContainer*& ActorGestureData::GetContainerPtr(GestureType::Value type)
 {
-  switch ( type )
+  switch(type)
   {
-    case Gesture::Pan:
+    case GestureType::PAN:
     {
       return panDetectors;
     }
 
-    case Gesture::Pinch:
+    case GestureType::PINCH:
     {
       return pinchDetectors;
     }
 
-    case Gesture::LongPress:
+    case GestureType::LONG_PRESS:
     {
       return longPressDetectors;
     }
 
-    case Gesture::Tap:
+    case GestureType::TAP:
     {
       return tapDetectors;
     }
 
-    case Gesture::Rotation:
+    case GestureType::ROTATION:
     {
       return rotationDetectors;
     }
   }
 
-  DALI_ASSERT_DEBUG( ! "Invalid Type" );
-  static GestureDetectorContainer* invalidType( NULL );
+  DALI_ASSERT_DEBUG(!"Invalid Type");
+  static GestureDetectorContainer* invalidType(nullptr);
   return invalidType;
 }
 
 } // namespace Internal
 
 } // namespace Dali
-