From 98b0c47a996d12828edbda14a61b841a273d3439 Mon Sep 17 00:00:00 2001 From: Subhransu Mohanty Date: Thu, 27 Aug 2020 10:28:01 +0900 Subject: [PATCH] Update interface to sync with dali-core change. Change-Id: Ie70a029eabadebaffb7de7587d58328868b35b95 --- automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp | 2 +- dali-toolkit/internal/controls/text-controls/text-label-impl.cpp | 2 +- dali-toolkit/internal/controls/text-controls/text-label-impl.h | 2 +- dali-toolkit/public-api/controls/control-impl.cpp | 2 +- dali-toolkit/public-api/controls/control-impl.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp index 5390b5c..e60505d 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp @@ -127,7 +127,7 @@ struct TestCustomControl : public Toolkit::Internal::ControlWrapper { Control::OnChildRemove(child); } - virtual void OnPropertySet( Property::Index index, Property::Value propertyValue ) + virtual void OnPropertySet( Property::Index index, const Property::Value& propertyValue ) { Control::OnPropertySet(index, propertyValue); } diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp index 48718b3..d40cd76 100755 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp @@ -927,7 +927,7 @@ float TextLabel::GetHeightForWidth( float width ) return mController->GetHeightForWidth( width ) + padding.top + padding.bottom; } -void TextLabel::OnPropertySet( Property::Index index, Property::Value propertyValue ) +void TextLabel::OnPropertySet( Property::Index index, const Property::Value& propertyValue ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextLabel::OnPropertySet index[%d]\n", index ); diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.h b/dali-toolkit/internal/controls/text-controls/text-label-impl.h index 85e94ab..17bf6e5 100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.h @@ -103,7 +103,7 @@ private: // From Control /** * @copydoc Control::OnPropertySet() */ - virtual void OnPropertySet( Property::Index index, Property::Value propertyValue ) override ; + void OnPropertySet( Property::Index index, const Property::Value& propertyValue ) override ; // From ControlInterface diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 506b833..f1e8918 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -596,7 +596,7 @@ void Control::OnChildRemove(Actor& child) { } -void Control::OnPropertySet( Property::Index index, Property::Value propertyValue ) +void Control::OnPropertySet( Property::Index index, const Property::Value& propertyValue ) { // If the clipping mode has been set, we may need to create a renderer. // Only do this if we are already on-stage as the OnSceneConnection will handle the off-stage clipping controls. diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index 237c462..9b80f69 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -324,7 +324,7 @@ protected: // From CustomActorImpl * @copydoc CustomActorImpl::OnPropertySet() * @note If overridden, then an up-call to Control::OnChildRemove MUST be made at the end. */ - virtual void OnPropertySet( Property::Index index, Property::Value propertyValue ) override; + void OnPropertySet( Property::Index index, const Property::Value& propertyValue ) override; /** * @copydoc CustomActorImpl::OnSizeSet() -- 2.7.4