X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fbutton-impl.cpp;h=c0d52ca337cb689a47b9eea5bd08958c95362a36;hb=1c5674a11a51310ee689d6daf4e6b7d94dec607e;hp=1c31fe55d46bb12592d2ddad986de1fd6164da13;hpb=074b05f53f89491982b2d5380cab7f05b1932a76;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp index 1c31fe5..c0d52ca 100644 --- a/dali-toolkit/internal/controls/buttons/button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp @@ -905,7 +905,7 @@ Actor& Button::GetDisabledBackgroundImage() return mDisabledBackgroundContent; } -bool Button::DoAction( BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes ) + bool Button::DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes ) { bool ret = false; @@ -924,7 +924,7 @@ bool Button::DoAction( BaseObject* object, const std::string& actionName, const return ret; } -void Button::DoClickAction( const PropertyValueContainer& attributes ) + void Button::DoClickAction( const Property::Map& attributes ) { // Prevents the button signals from doing a recursive loop by sending an action // and re-emitting the signals. @@ -1210,7 +1210,7 @@ void Button::OnInitialize() void Button::OnActivated() { // When the button is activated, it performs the click action - PropertyValueContainer attributes; + Property::Map attributes; DoClickAction( attributes ); }