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 0c27828..63b3fd1 100644 (file)
--- a/dali/public-api/events/gesture-detector.cpp
+++ b/dali/public-api/events/gesture-detector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 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.
@@ -23,29 +23,21 @@
 
 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)
-: Handle(handle)
-{
-}
+GestureDetector::GestureDetector(const GestureDetector& handle) = default;
 
 GestureDetector& GestureDetector::operator=(const GestureDetector& rhs)
 {
@@ -68,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