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=32c43d4aaa38a4bf34a36948743c1b5ec8155c80;hp=804deb359e3e5d4e0c4ee187d7714745784a2135;hb=630cf6828aba9a347d6ca52bc59b3ec4b60d21f8;hpb=fd1a47af0ac56d63622dcef32fade5c3b90957d0 diff --git a/dali-toolkit/internal/builder/builder-signals.cpp b/dali-toolkit/internal/builder/builder-signals.cpp index 804deb3..32c43d4 100644 --- a/dali-toolkit/internal/builder/builder-signals.cpp +++ b/dali-toolkit/internal/builder/builder-signals.cpp @@ -54,7 +54,7 @@ struct ChildActorAction std::string actorName; std::string actionName; std::string childName; - PropertyValueContainer parameters; + Property::Map parameters; void operator()(void) { @@ -115,7 +115,7 @@ struct GenericAction { std::string actorName; std::string actionName; - PropertyValueContainer parameters; + Property::Map parameters; void operator()(void) { @@ -376,25 +376,17 @@ Property::Value GetPropertyValue(const TreeNode &child) * Gets Parmeter list from child * params is be cleared before insertion */ -void GetParameters(const TreeNode& child, PropertyValueContainer& params) +void GetParameters(const TreeNode& child, Property::Map& params) { if( OptionalChild c = IsChild(child, "parameters") ) { const TreeNode& node = *c; - if(0 == node.Size()) - { - GetPropertyValue(node); - } - else - { - params.clear(); - params.reserve(node.Size()); + params.Clear(); - for(TreeNode::ConstIterator iter(node.CBegin()); iter != node.CEnd(); ++iter) - { - params.push_back( GetPropertyValue( (*iter).second ) ); - } + for(TreeNode::ConstIterator iter(node.CBegin()); iter != node.CEnd(); ++iter) + { + params[ (*iter).first ] = GetPropertyValue( (*iter).second ); } } }