X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fevents%2Fpan-gesture-detector.cpp;h=860e6a80b3e62671c87599279c31ab229c57db8b;hb=646f736e77b085c86e982c0d1d4b895c2a431330;hp=dffbb99a84f86a53c717e3dc372aebdbc9ad370a;hpb=4db25a3da1c48b1c45b2d73a4aaf4945e7e40ca8;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/public-api/events/pan-gesture-detector.cpp b/dali/public-api/events/pan-gesture-detector.cpp
index dffbb99..860e6a8 100644
--- a/dali/public-api/events/pan-gesture-detector.cpp
+++ b/dali/public-api/events/pan-gesture-detector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -24,8 +24,6 @@
 namespace Dali
 {
 
-const char* const PanGestureDetector::SIGNAL_PAN_DETECTED = "pan-detected";
-
 const Radian PanGestureDetector::DIRECTION_LEFT( -Math::PI );
 const Radian PanGestureDetector::DIRECTION_RIGHT( 0.0f );
 const Radian PanGestureDetector::DIRECTION_UP( -0.5f * Math::PI );
@@ -70,22 +68,22 @@ PanGestureDetector& PanGestureDetector::operator=(const PanGestureDetector& rhs)
   return *this;
 }
 
-void PanGestureDetector::SetMinimumTouchesRequired(unsigned int minimum)
+void PanGestureDetector::SetMinimumTouchesRequired(uint32_t minimum)
 {
   GetImplementation(*this).SetMinimumTouchesRequired(minimum);
 }
 
-void PanGestureDetector::SetMaximumTouchesRequired(unsigned int maximum)
+void PanGestureDetector::SetMaximumTouchesRequired(uint32_t maximum)
 {
   GetImplementation(*this).SetMaximumTouchesRequired(maximum);
 }
 
-unsigned int PanGestureDetector::GetMinimumTouchesRequired() const
+uint32_t PanGestureDetector::GetMinimumTouchesRequired() const
 {
   return GetImplementation(*this).GetMinimumTouchesRequired();
 }
 
-unsigned int PanGestureDetector::GetMaximumTouchesRequired() const
+uint32_t PanGestureDetector::GetMaximumTouchesRequired() const
 {
   return GetImplementation(*this).GetMaximumTouchesRequired();
 }
@@ -100,9 +98,14 @@ void PanGestureDetector::AddDirection( Radian direction, Radian threshold )
   GetImplementation(*this).AddDirection( direction, threshold );
 }
 
-const PanGestureDetector::AngleContainer& PanGestureDetector::GetAngles() const
+size_t PanGestureDetector::GetAngleCount() const
+{
+  return GetImplementation(*this).GetAngleCount();
+}
+
+PanGestureDetector::AngleThresholdPair PanGestureDetector::GetAngle(size_t index) const
 {
-  return GetImplementation(*this).GetAngles();
+  return GetImplementation(*this).GetAngle(index);
 }
 
 void PanGestureDetector::ClearAngles()
@@ -120,7 +123,7 @@ void PanGestureDetector::RemoveDirection( Radian direction )
   GetImplementation(*this).RemoveDirection( direction );
 }
 
-PanGestureDetector::DetectedSignalV2& PanGestureDetector::DetectedSignal()
+PanGestureDetector::DetectedSignalType& PanGestureDetector::DetectedSignal()
 {
   return GetImplementation(*this).DetectedSignal();
 }