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
Formatting API
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
buttons
/
radio-button.cpp
diff --git
a/dali-toolkit/public-api/controls/buttons/radio-button.cpp
b/dali-toolkit/public-api/controls/buttons/radio-button.cpp
index
b43523d
..
6030031
100644
(file)
--- a/
dali-toolkit/public-api/controls/buttons/radio-button.cpp
+++ b/
dali-toolkit/public-api/controls/buttons/radio-button.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-25,38
+25,30
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
RadioButton::RadioButton()
RadioButton::RadioButton()
-
: Button()
+: Button()
{
}
{
}
-RadioButton::RadioButton(
Internal::RadioButton& implementation
)
-
: Button( implementation
)
+RadioButton::RadioButton(
Internal::RadioButton& implementation
)
+
: Button(implementation
)
{
}
{
}
-RadioButton::RadioButton( const RadioButton& radioButton )
- : Button( radioButton )
-{
-}
+RadioButton::RadioButton(const RadioButton& radioButton) = default;
-RadioButton& RadioButton::operator=( const RadioButton& radioButton )
-{
- if( &radioButton != this )
- {
- Button::operator=( radioButton );
- }
- return *this;
-}
+RadioButton::RadioButton(RadioButton&& rhs) = default;
+
+RadioButton& RadioButton::operator=(const RadioButton& radioButton) = default;
-RadioButton::RadioButton( Dali::Internal::CustomActor* internal )
- : Button( internal )
+RadioButton& RadioButton::operator=(RadioButton&& rhs) = default;
+
+RadioButton::RadioButton(Dali::Internal::CustomActor* internal)
+: Button(internal)
{
{
- VerifyCustomActorPointer<Internal::RadioButton>(
internal
);
+ VerifyCustomActorPointer<Internal::RadioButton>(
internal
);
}
RadioButton::~RadioButton()
}
RadioButton::~RadioButton()
@@
-68,23
+60,16
@@
RadioButton RadioButton::New()
return Internal::RadioButton::New();
}
return Internal::RadioButton::New();
}
-RadioButton RadioButton::New( const std::string& label )
-{
- RadioButton radioButton = Internal::RadioButton::New();
- radioButton.SetLabel( label );
- return radioButton;
-}
-
-RadioButton RadioButton::New( Actor label )
+RadioButton RadioButton::New(const std::string& label)
{
RadioButton radioButton = Internal::RadioButton::New();
{
RadioButton radioButton = Internal::RadioButton::New();
- radioButton.Set
Label( label
);
+ radioButton.Set
Property(Toolkit::Button::Property::LABEL, label
);
return radioButton;
}
return radioButton;
}
-RadioButton RadioButton::DownCast(
BaseHandle handle
)
+RadioButton RadioButton::DownCast(
BaseHandle handle
)
{
{
- return Control::DownCast<RadioButton, Internal::RadioButton>(
handle
);
+ return Control::DownCast<RadioButton, Internal::RadioButton>(
handle
);
}
} // namespace Toolkit
}
} // namespace Toolkit