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

[platform/core/uifw/dali-core.git] / dali / public-api / actors / custom-actor-impl.cpp

diff --git a/dali/public-api/actors/custom-actor-impl.cpp b/dali/public-api/actors/custom-actor-impl.cpp
index f084c96..1ff533b 100644 (file)
--- a/dali/public-api/actors/custom-actor-impl.cpp
+++ b/dali/public-api/actors/custom-actor-impl.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.
@@ -19,31 +19,28 @@
 #include <dali/public-api/actors/custom-actor-impl.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
 #include <dali/internal/event/actors/custom-actor-internal.h>
+#include <dali/public-api/common/dali-common.h>
 
 namespace Dali
 {
-
-CustomActorImpl::~CustomActorImpl()
-{
-}
-
 CustomActor CustomActorImpl::Self() const
 {
   return CustomActor(mOwner);
 }
 
-void CustomActorImpl::OnPropertySet( Property::Index index, Property::Value propertyValue )
+void CustomActorImpl::OnPropertySet(Property::Index index, const Property::Value& propertyValue)
 {
 }
 
-CustomActorImpl::CustomActorImpl( ActorFlags flags )
-: mOwner(NULL),
-  mFlags( flags )
+CustomActorImpl::CustomActorImpl(ActorFlags flags)
+: mOwner(nullptr),
+  mFlags(flags)
 {
 }
 
+CustomActorImpl::~CustomActorImpl() = default;
+
 void CustomActorImpl::Initialize(Internal::CustomActor& owner)
 {
   DALI_ASSERT_DEBUG(mOwner == NULL); // should not already be owned
@@ -56,24 +53,9 @@ Internal::CustomActor* CustomActorImpl::GetOwner() const
   return mOwner;
 }
 
-bool CustomActorImpl::RequiresTouchEvents() const
-{
-  return ( mFlags & REQUIRES_TOUCH_EVENTS );
-}
-
-bool CustomActorImpl::RequiresHoverEvents() const
-{
-  return ( mFlags & REQUIRES_HOVER_EVENTS );
-}
-
-bool CustomActorImpl::RequiresMouseWheelEvents() const
-{
-  return ( mFlags & REQUIRES_MOUSE_WHEEL_EVENTS );
-}
-
 bool CustomActorImpl::IsRelayoutEnabled() const
 {
-  return ( mFlags & DISABLE_SIZE_NEGOTIATION ) == 0;
+  return (mFlags & DISABLE_SIZE_NEGOTIATION) == 0;
 }
 
 void CustomActorImpl::RelayoutRequest()
@@ -81,24 +63,24 @@ void CustomActorImpl::RelayoutRequest()
   mOwner->RelayoutRequest();
 }
 
-float CustomActorImpl::GetHeightForWidthBase( float width )
+float CustomActorImpl::GetHeightForWidthBase(float width)
 {
-  return mOwner->GetHeightForWidthBase( width );
+  return mOwner->GetHeightForWidthBase(width);
 }
 
-float CustomActorImpl::GetWidthForHeightBase( float height )
+float CustomActorImpl::GetWidthForHeightBase(float height)
 {
-  return mOwner->GetWidthForHeightBase( height );
+  return mOwner->GetWidthForHeightBase(height);
 }
 
-float CustomActorImpl::CalculateChildSizeBase( const Dali::Actor& child, Dimension::Type dimension )
+float CustomActorImpl::CalculateChildSizeBase(const Dali::Actor& child, Dimension::Type dimension)
 {
-  return mOwner->CalculateChildSizeBase( child, dimension );
+  return mOwner->CalculateChildSizeBase(child, dimension);
 }
 
-bool CustomActorImpl::RelayoutDependentOnChildrenBase( Dimension::Type dimension )
+bool CustomActorImpl::RelayoutDependentOnChildrenBase(Dimension::Type dimension)
 {
-  return mOwner->RelayoutDependentOnChildrenBase( dimension );
+  return mOwner->RelayoutDependentOnChildrenBase(dimension);
 }
 
 } // namespace Dali