Update interface to sync with dali-core change.

Change-Id: Ie70a029eabadebaffb7de7587d58328868b35b95

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 (file)
--- 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);
   }
   {
     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);
   }
   {
     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 (executable)
--- 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;
 }
 
   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 );
 
 {
   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 (file)
--- 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()
    */
   /**
    * @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
 
 
   // 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 (file)
--- 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.
 {
   // 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 (file)
--- 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.
    */
    * @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()
 
   /**
    * @copydoc CustomActorImpl::OnSizeSet()