X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fbuttons%2Fpush-button.cpp;h=ff2cd4c0c926e546b70d966fdc588c9f38b03cb0;hb=a88db82a75443d573185aea2938f1f0be141ca64;hp=90fcefdcfc3300f03e2b9bb695cd750e983faa25;hpb=6084b902e588a8ed1b8ec0dd7aacae8775006ef6;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/buttons/push-button.cpp b/dali-toolkit/public-api/controls/buttons/push-button.cpp index 90fcefd..ff2cd4c 100644 --- a/dali-toolkit/public-api/controls/buttons/push-button.cpp +++ b/dali-toolkit/public-api/controls/buttons/push-button.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -16,45 +16,38 @@ */ // CLASS HEADER - #include -// INTERNAL INCLUDES +// EXTERNAL INCLUDES +#include +// INTERNAL INCLUDES #include namespace Dali { - namespace Toolkit { - PushButton::PushButton() : Button() { } -PushButton::PushButton( Internal::PushButton& implementation ) -: Button( implementation ) +PushButton::PushButton(Internal::PushButton& implementation) +: Button(implementation) { } -PushButton::PushButton( const PushButton& pushButton ) -: Button( pushButton ) -{ -} +PushButton::PushButton(const PushButton& pushButton) = default; -PushButton& PushButton::operator=( const PushButton& pushButton ) -{ - if( &pushButton != this ) - { - Button::operator=( pushButton ); - } - return *this; -} +PushButton::PushButton(PushButton&& rhs) = default; -PushButton::PushButton( Dali::Internal::CustomActor* internal ) -: Button( internal ) +PushButton& PushButton::operator=(const PushButton& pushButton) = default; + +PushButton& PushButton::operator=(PushButton&& rhs) = default; + +PushButton::PushButton(Dali::Internal::CustomActor* internal) +: Button(internal) { VerifyCustomActorPointer(internal); } @@ -68,48 +61,11 @@ PushButton PushButton::New() return Internal::PushButton::New(); } -PushButton PushButton::DownCast( BaseHandle handle ) +PushButton PushButton::DownCast(BaseHandle handle) { return Control::DownCast(handle); } -// Deprecated API - -void PushButton::SetButtonImage( Actor image ) -{ - Dali::Toolkit::GetImplementation( *this ).SetButtonImage( image ); -} - -void PushButton::SetBackgroundImage( Actor image ) -{ - Dali::Toolkit::GetImplementation( *this ).SetBackgroundImage( image ); -} - -void PushButton::SetSelectedImage( Actor image ) -{ - Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( image ); -} - -void PushButton::SetSelectedBackgroundImage( Actor image ) -{ - Dali::Toolkit::GetImplementation( *this ).SetSelectedBackgroundImage( image ); -} - -void PushButton::SetDisabledBackgroundImage( Actor image ) -{ - Dali::Toolkit::GetImplementation( *this ).SetDisabledBackgroundImage( image ); -} - -void PushButton::SetDisabledImage( Actor image ) -{ - Dali::Toolkit::GetImplementation( *this ).SetDisabledImage( image ); -} - -void PushButton::SetDisabledSelectedImage( Actor image ) -{ - Dali::Toolkit::GetImplementation( *this ).SetDisabledSelectedImage( image ); -} - } // namespace Toolkit } // namespace Dali