X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-signals.cpp;h=c17738588e2ad24f65831ed20f0355e83afa7cd5;hp=55809bdc9bb81eeeda2883ef605a8a8010a7330c;hb=5e937a6322849b76d49d5b3f41cb5d91c94acd3e;hpb=6efdc8474741c1c9f548308b71266996fd98d775 diff --git a/dali-toolkit/internal/builder/builder-signals.cpp b/dali-toolkit/internal/builder/builder-signals.cpp old mode 100644 new mode 100755 index 55809bd..c177385 --- a/dali-toolkit/internal/builder/builder-signals.cpp +++ b/dali-toolkit/internal/builder/builder-signals.cpp @@ -35,7 +35,7 @@ namespace Toolkit namespace Internal { extern Animation CreateAnimation( const TreeNode& child, Dali::Toolkit::Internal::Builder* const builder ); -extern bool DeterminePropertyFromNode( const TreeNode& node, Property::Value& value ); +extern void DeterminePropertyFromNode( const TreeNode& node, Property::Value& value ); } } } @@ -636,7 +636,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 ); @@ -711,7 +711,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");