X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fbuttons%2Fpush-button.cpp;h=ff2cd4c0c926e546b70d966fdc588c9f38b03cb0;hb=e74563220e35ea81a5b932186221623eed0fc62e;hp=80f8b16db0f73b7e5256bdf29faec129a50dad58;hpb=d748f6c99a59e045b8a8d267012372f996cbc3fd;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 80f8b16..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.
@@ -21,43 +21,33 @@
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
-#include <dali/public-api/images/resource-image.h>
-
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/buttons/push-button-impl.h>
 
 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::operator=(const PushButton& pushButton) = default;
+
+PushButton& PushButton::operator=(PushButton&& rhs) = default;
 
-PushButton::PushButton( Dali::Internal::CustomActor* internal )
-: Button( internal )
+PushButton::PushButton(Dali::Internal::CustomActor* internal)
+: Button(internal)
 {
   VerifyCustomActorPointer<Internal::PushButton>(internal);
 }
@@ -71,59 +61,11 @@ PushButton PushButton::New()
   return Internal::PushButton::New();
 }
 
-PushButton PushButton::DownCast( BaseHandle handle )
+PushButton PushButton::DownCast(BaseHandle handle)
 {
   return Control::DownCast<PushButton, Internal::PushButton>(handle);
 }
 
-// Deprecated API
-
-void PushButton::SetButtonImage( Actor image )
-{
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetButtonImage() is deprecated and will be removed from next release. Use Button.SetProperty UNSELECTED_STATE_IMAGE or Styling file instead.\n" );
-
-  // Passing Image as Actor not supported
-}
-
-void PushButton::SetBackgroundImage( Actor image )
-{
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetBackgroundImage() is deprecated and will be removed from next release.\n" );
-
-  // Passing Image as Actor not supported}
-}
-
-void PushButton::SetSelectedImage( Actor image )
-{
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetSelectedImage() is deprecated and will be removed from next release. Use Button.SetProperty SELECTED_STATE_IMAGE or Styling file instead.\n" );
-
-  // Passing Image as Actor not supported}
-}
-
-void PushButton::SetSelectedBackgroundImage( Actor image )
-{
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetSelectedBackgroundImage() is deprecated and will be removed from next release.\n" );
-
-  // Passing Image as Actor not supported}
-}
-
-void PushButton::SetDisabledBackgroundImage( Actor image )
-{
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetDisabledBackgroundImage() is deprecated and will be removed from next release.\n" );
-  // Passing Image as Actor not supported}
-}
-
-void PushButton::SetDisabledImage( Actor image )
-{
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetDisabledImage() is deprecated and will be removed from next release. Use Button.SetProperty DISABLED_STATE_IMAGE or Styling file instead.\n" );
-  // Passing Image as Actor not supported
-}
-
-void PushButton::SetDisabledSelectedImage( Actor image )
-{
-  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetDisabledSelectedImage() is deprecated and will be removed from next release.\n" );
-  // Passing Image as Actor not supported
-}
-
 } // namespace Toolkit
 
 } // namespace Dali