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

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

diff --git a/dali/public-api/events/gesture-detector.cpp b/dali/public-api/events/gesture-detector.cpp
index 63826ca..63b3fd1 100644 (file)
--- a/dali/public-api/events/gesture-detector.cpp
+++ b/dali/public-api/events/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) 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.
+ * 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/gesture-detector.h>
@@ -22,23 +23,26 @@
 
 namespace Dali
 {
-
 GestureDetector::GestureDetector(Internal::GestureDetector* internal)
 : Handle(internal)
 {
 }
 
-GestureDetector::GestureDetector()
-{
-}
+GestureDetector::GestureDetector() = default;
 
-GestureDetector GestureDetector::DownCast( BaseHandle handle )
+GestureDetector GestureDetector::DownCast(BaseHandle handle)
 {
-  return GestureDetector( dynamic_cast<Dali::Internal::GestureDetector*>(handle.GetObjectPtr()) );
+  return GestureDetector(dynamic_cast<Dali::Internal::GestureDetector*>(handle.GetObjectPtr()));
 }
 
-GestureDetector::~GestureDetector()
+GestureDetector::~GestureDetector() = default;
+
+GestureDetector::GestureDetector(const GestureDetector& handle) = default;
+
+GestureDetector& GestureDetector::operator=(const GestureDetector& rhs)
 {
+  BaseHandle::operator=(rhs);
+  return *this;
 }
 
 void GestureDetector::Attach(Actor actor)
@@ -56,9 +60,14 @@ void GestureDetector::DetachAll()
   GetImplementation(*this).DetachAll();
 }
 
-std::vector<Actor> GestureDetector::GetAttachedActors() const
+size_t GestureDetector::GetAttachedActorCount() const
+{
+  return GetImplementation(*this).GetAttachedActorCount();
+}
+
+Actor GestureDetector::GetAttachedActor(size_t index) const
 {
-  return GetImplementation(*this).GetAttachedActors();
+  return GetImplementation(*this).GetAttachedActor(index);
 }
 
 } // namespace Dali