Making DALi public API typesafe using guaranteed types; uint8_t, uint32_t

[platform/core/uifw/dali-core.git] / dali / public-api / events / pan-gesture-detector.cpp

diff --git a/dali/public-api/events/pan-gesture-detector.cpp b/dali/public-api/events/pan-gesture-detector.cpp
index c7c3c01..860e6a8 100644 (file)
--- a/dali/public-api/events/pan-gesture-detector.cpp
+++ b/dali/public-api/events/pan-gesture-detector.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
 #include <dali/public-api/events/pan-gesture-detector.h>
@@ -23,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 );
@@ -58,22 +57,33 @@ PanGestureDetector::~PanGestureDetector()
 {
 }
 
-void PanGestureDetector::SetMinimumTouchesRequired(unsigned int minimum)
+PanGestureDetector::PanGestureDetector(const PanGestureDetector& handle)
+: GestureDetector(handle)
+{
+}
+
+PanGestureDetector& PanGestureDetector::operator=(const PanGestureDetector& rhs)
+{
+  BaseHandle::operator=(rhs);
+  return *this;
+}
+
+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();
 }
@@ -88,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()
@@ -108,7 +123,7 @@ void PanGestureDetector::RemoveDirection( Radian direction )
   GetImplementation(*this).RemoveDirection( direction );
 }
 
-PanGestureDetector::DetectedSignalV2& PanGestureDetector::DetectedSignal()
+PanGestureDetector::DetectedSignalType& PanGestureDetector::DetectedSignal()
 {
   return GetImplementation(*this).DetectedSignal();
 }