Merge "use modern construct '= default' for special functions." into devel/master

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

diff --git a/dali/public-api/events/tap-gesture-detector.cpp b/dali/public-api/events/tap-gesture-detector.cpp
index fe7507e..fa9376d 100644 (file)
--- a/dali/public-api/events/tap-gesture-detector.cpp
+++ b/dali/public-api/events/tap-gesture-detector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 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.
@@ -19,21 +19,16 @@
 #include <dali/public-api/events/tap-gesture-detector.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/events/tap-gesture-detector-impl.h>
+#include <dali/internal/event/events/tap-gesture/tap-gesture-detector-impl.h>
 
 namespace Dali
 {
-
-const char* const TapGestureDetector::SIGNAL_TAP_DETECTED = "tap-detected";
-
 TapGestureDetector::TapGestureDetector(Internal::TapGestureDetector* internal)
 : GestureDetector(internal)
 {
 }
 
-TapGestureDetector::TapGestureDetector()
-{
-}
+TapGestureDetector::TapGestureDetector() = default;
 
 TapGestureDetector TapGestureDetector::New()
 {
@@ -42,26 +37,21 @@ TapGestureDetector TapGestureDetector::New()
   return TapGestureDetector(internal.Get());
 }
 
-TapGestureDetector TapGestureDetector::New(unsigned int tapsRequired, unsigned int touchesRequired)
+TapGestureDetector TapGestureDetector::New(uint32_t tapsRequired)
 {
-  Internal::TapGestureDetectorPtr internal = Internal::TapGestureDetector::New(tapsRequired, touchesRequired);
+  Internal::TapGestureDetectorPtr internal = Internal::TapGestureDetector::New(tapsRequired);
 
   return TapGestureDetector(internal.Get());
 }
 
-TapGestureDetector TapGestureDetector::DownCast( BaseHandle handle )
+TapGestureDetector TapGestureDetector::DownCast(BaseHandle handle)
 {
-  return TapGestureDetector( dynamic_cast<Dali::Internal::TapGestureDetector*>(handle.GetObjectPtr()) );
+  return TapGestureDetector(dynamic_cast<Dali::Internal::TapGestureDetector*>(handle.GetObjectPtr()));
 }
 
-TapGestureDetector::~TapGestureDetector()
-{
-}
+TapGestureDetector::~TapGestureDetector() = default;
 
-TapGestureDetector::TapGestureDetector(const TapGestureDetector& handle)
-: GestureDetector(handle)
-{
-}
+TapGestureDetector::TapGestureDetector(const TapGestureDetector& handle) = default;
 
 TapGestureDetector& TapGestureDetector::operator=(const TapGestureDetector& rhs)
 {
@@ -69,24 +59,24 @@ TapGestureDetector& TapGestureDetector::operator=(const TapGestureDetector& rhs)
   return *this;
 }
 
-void TapGestureDetector::SetTapsRequired(unsigned int taps)
+void TapGestureDetector::SetMinimumTapsRequired(uint32_t taps)
 {
-  GetImplementation(*this).SetTapsRequired(taps);
+  GetImplementation(*this).SetMinimumTapsRequired(taps);
 }
 
-void TapGestureDetector::SetTouchesRequired(unsigned int touches)
+void TapGestureDetector::SetMaximumTapsRequired(uint32_t taps)
 {
-  GetImplementation(*this).SetTouchesRequired(touches);
+  GetImplementation(*this).SetMaximumTapsRequired(taps);
 }
 
-unsigned int TapGestureDetector::GetTapsRequired() const
+uint32_t TapGestureDetector::GetMinimumTapsRequired() const
 {
-  return GetImplementation(*this).GetTapsRequired();
+  return GetImplementation(*this).GetMinimumTapsRequired();
 }
 
-unsigned int TapGestureDetector::GetTouchesRequired() const
+uint32_t TapGestureDetector::GetMaximumTapsRequired() const
 {
-  return GetImplementation(*this).GetTouchesRequired();
+  return GetImplementation(*this).GetMaximumTapsRequired();
 }
 
 TapGestureDetector::DetectedSignalType& TapGestureDetector::DetectedSignal()