projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DALi Version 1.0.23
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
controls
/
buttons
/
push-button-impl.cpp
diff --git
a/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
b/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
index
8a28fcf
..
9f8452c
100644
(file)
--- a/
base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
+++ b/
base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
@@
-713,7
+713,7
@@
bool PushButton::AutoRepeatingSlot()
void PushButton::OnActivated()
{
// When the button is activated, it performs the click action
void PushButton::OnActivated()
{
// When the button is activated, it performs the click action
-
std::vector<Property::Value>
attributes;
+
PropertyValueContainer
attributes;
DoClickAction(attributes);
}
DoClickAction(attributes);
}
@@
-794,7
+794,7
@@
void PushButton::DoClickAction(const PropertyValueContainer& attributes)
}
}
}
}
-bool PushButton::DoAction(BaseObject* object, const std::string& actionName, const
std::vector<Property::Value>
& attributes)
+bool PushButton::DoAction(BaseObject* object, const std::string& actionName, const
PropertyValueContainer
& attributes)
{
bool ret = false;
{
bool ret = false;