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

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

diff --git a/dali/public-api/events/pinch-gesture-detector.cpp b/dali/public-api/events/pinch-gesture-detector.cpp
index 1f8f1d6..f2244f6 100644 (file)
--- a/dali/public-api/events/pinch-gesture-detector.cpp
+++ b/dali/public-api/events/pinch-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/pinch-gesture-detector.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/event/events/pinch-gesture-detector-impl.h>
+#include <dali/internal/event/events/pinch-gesture/pinch-gesture-detector-impl.h>
 
 namespace Dali
 {
-
-const char* const PinchGestureDetector::SIGNAL_PINCH_DETECTED = "pinch-detected";
-
 PinchGestureDetector::PinchGestureDetector(Internal::PinchGestureDetector* internal)
 : GestureDetector(internal)
 {
 }
 
-PinchGestureDetector::PinchGestureDetector()
-{
-}
+PinchGestureDetector::PinchGestureDetector() = default;
 
 PinchGestureDetector PinchGestureDetector::New()
 {
@@ -42,16 +37,22 @@ PinchGestureDetector PinchGestureDetector::New()
   return PinchGestureDetector(internal.Get());
 }
 
-PinchGestureDetector PinchGestureDetector::DownCast( BaseHandle handle )
+PinchGestureDetector PinchGestureDetector::DownCast(BaseHandle handle)
 {
-  return PinchGestureDetector( dynamic_cast<Dali::Internal::PinchGestureDetector*>(handle.GetObjectPtr()) );
+  return PinchGestureDetector(dynamic_cast<Dali::Internal::PinchGestureDetector*>(handle.GetObjectPtr()));
 }
 
-PinchGestureDetector::~PinchGestureDetector()
+PinchGestureDetector::~PinchGestureDetector() = default;
+
+PinchGestureDetector::PinchGestureDetector(const PinchGestureDetector& handle) = default;
+
+PinchGestureDetector& PinchGestureDetector::operator=(const PinchGestureDetector& rhs)
 {
+  BaseHandle::operator=(rhs);
+  return *this;
 }
 
-PinchGestureDetector::DetectedSignalV2& PinchGestureDetector::DetectedSignal()
+PinchGestureDetector::DetectedSignalType& PinchGestureDetector::DetectedSignal()
 {
   return GetImplementation(*this).DetectedSignal();
 }