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_2.3.28] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
buttons
/
button.cpp
diff --git
a/dali-toolkit/public-api/controls/buttons/button.cpp
b/dali-toolkit/public-api/controls/buttons/button.cpp
index
02adab4
..
63c9b7d
100644
(file)
--- a/
dali-toolkit/public-api/controls/buttons/button.cpp
+++ b/
dali-toolkit/public-api/controls/buttons/button.cpp
@@
-29,57
+29,56
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
Button::Button()
Button::Button()
-{}
+{
+}
-Button::Button(
const Button& button
) = default;
+Button::Button(
const Button& button
) = default;
-Button::Button(
Button&& rhs )
= default;
+Button::Button(
Button&& rhs) noexcept
= default;
-Button& Button::operator=(
const Button& button
) = default;
+Button& Button::operator=(
const Button& button
) = default;
-Button& Button::operator=(
Button&& rhs )
= default;
+Button& Button::operator=(
Button&& rhs) noexcept
= default;
Button::~Button()
{
}
Button::~Button()
{
}
-Button Button::DownCast(
BaseHandle handle
)
+Button Button::DownCast(
BaseHandle handle
)
{
return Control::DownCast<Button, Internal::Button>(handle);
}
Button::ButtonSignalType& Button::PressedSignal()
{
{
return Control::DownCast<Button, Internal::Button>(handle);
}
Button::ButtonSignalType& Button::PressedSignal()
{
- return Dali::Toolkit::GetImplementation(
*this
).PressedSignal();
+ return Dali::Toolkit::GetImplementation(
*this
).PressedSignal();
}
Button::ButtonSignalType& Button::ReleasedSignal()
{
}
Button::ButtonSignalType& Button::ReleasedSignal()
{
- return Dali::Toolkit::GetImplementation(
*this
).ReleasedSignal();
+ return Dali::Toolkit::GetImplementation(
*this
).ReleasedSignal();
}
Button::ButtonSignalType& Button::ClickedSignal()
{
}
Button::ButtonSignalType& Button::ClickedSignal()
{
- return Dali::Toolkit::GetImplementation(
*this
).ClickedSignal();
+ return Dali::Toolkit::GetImplementation(
*this
).ClickedSignal();
}
Button::ButtonSignalType& Button::StateChangedSignal()
{
}
Button::ButtonSignalType& Button::StateChangedSignal()
{
- return Dali::Toolkit::GetImplementation(
*this
).StateChangedSignal();
+ return Dali::Toolkit::GetImplementation(
*this
).StateChangedSignal();
}
}
-Button::Button(
Internal::Button& implementation
)
-: Control(
implementation
)
+Button::Button(
Internal::Button& implementation
)
+: Control(
implementation
)
{
}
{
}
-Button::Button(
Dali::Internal::CustomActor* internal
)
-: Control(
internal
)
+Button::Button(
Dali::Internal::CustomActor* internal
)
+: Control(
internal
)
{
VerifyCustomActorPointer<Internal::Button>(internal);
}
{
VerifyCustomActorPointer<Internal::Button>(internal);
}