Changes after Stage moved to Devel API

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / builder / builder-signals.cpp

diff --git a/dali-toolkit/internal/builder/builder-signals.cpp b/dali-toolkit/internal/builder/builder-signals.cpp
index b3372f2..d38e1d4 100644 (file)
--- a/dali-toolkit/internal/builder/builder-signals.cpp
+++ b/dali-toolkit/internal/builder/builder-signals.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 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.
@@ -20,6 +20,7 @@
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/type-info.h>
 #include <dali/public-api/object/property-notification.h>
+#include <dali/devel-api/common/stage.h>
 
 #include <dali/integration-api/debug.h>
 #include <limits>
@@ -35,7 +36,7 @@ namespace Toolkit
 namespace Internal
 {
 extern Animation CreateAnimation( const TreeNode& child, Dali::Toolkit::Internal::Builder* const builder  );
-extern bool SetPropertyFromNode( const TreeNode& node, Property::Value& value );
+extern void DeterminePropertyFromNode( const TreeNode& node, Property::Value& value );
 }
 }
 }
@@ -342,7 +343,7 @@ Property::Value GetPropertyValue(const TreeNode &child)
   if(0 == nChildren)
   {
     // cast away unused return for static analyzers
-    static_cast<void>( Dali::Toolkit::Internal::SetPropertyFromNode( child, ret ) );
+    static_cast<void>( Dali::Toolkit::Internal::DeterminePropertyFromNode( child, ret ) );
   }
   else if(1 == nChildren)
   {
@@ -459,7 +460,7 @@ struct SignalConnector<PropertyNotification>
 template <typename T>
 void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor, Dali::Toolkit::Internal::Builder* const builder, SignalConnector<T>& connector)
 {
-  OptionalString childActorName(IsString( IsChild(&child, "child-actor")) );
+  OptionalString childActorName(IsString( IsChild(&child, "childActor")) );
   OptionalString actorName(IsString( IsChild(&child, "actor")) );
   OptionalString propertyName(IsString( IsChild(&child, "property")) );
   OptionalChild  valueChild( IsChild(&child, "value") );
@@ -484,10 +485,7 @@ void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor,
       action.actorName       = *actorName;
       action.propertyName    = *propertyName;
       // actor may not exist yet so we can't check the property type
-      if( !Dali::Toolkit::Internal::SetPropertyFromNode( *valueChild, action.value ) )
-      {
-        DALI_SCRIPT_WARNING("Cannot set property for set property action\n");
-      }
+      Dali::Toolkit::Internal::DeterminePropertyFromNode( *valueChild, action.value );
       connector.Connect( action );
     }
     else
@@ -639,7 +637,7 @@ void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor,
   {
     // no named actor; presume self
     GenericAction action;
-    action.actorName       = actor.GetName();
+    action.actorName       = actor.GetProperty< std::string >( Dali::Actor::Property::NAME );
     action.actionName      = *actionName;
     GetParameters(child, action.parameters);
     connector.Connect( action );
@@ -714,7 +712,7 @@ Actor SetupSignalAction(ConnectionTracker* tracker, const TreeNode &root, const
     {
       const TreeNode::KeyNodePair& key_child = *iter;
 
-      DALI_SCRIPT_INFO("  Creating Signal for: %s\n", actor.GetName().c_str());
+      DALI_SCRIPT_INFO("  Creating Signal for: %s\n", actor.GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str());
 
       OptionalString name( IsString( IsChild( key_child.second, "name")) );
       DALI_ASSERT_ALWAYS(name && "Signal must have a name");