[dali_2.3.21] 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 70377b3..63c9b7d 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/button.cpp
+++ b/dali-toolkit/public-api/controls/buttons/button.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 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,7 +21,6 @@
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/object/property-map.h>
-#include <dali/public-api/images/resource-image.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/buttons/button-impl.h>
@@ -30,63 +29,56 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 Button::Button()
-{}
-
-Button::Button( const Button& button )
-: Control( button )
 {
 }
 
-Button& Button::operator=( const Button& button )
-{
-  if( &button != this )
-  {
-    Control::operator=( button );
-  }
-  return *this;
-}
+Button::Button(const Button& button) = default;
+
+Button::Button(Button&& rhs) noexcept = default;
+
+Button& Button::operator=(const Button& button) = default;
+
+Button& Button::operator=(Button&& rhs) noexcept = default;
 
 Button::~Button()
 {
 }
 
-Button Button::DownCast( BaseHandle handle )
+Button Button::DownCast(BaseHandle handle)
 {
   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()
 {
-  return Dali::Toolkit::GetImplementation( *this ).ReleasedSignal();
+  return Dali::Toolkit::GetImplementation(*this).ReleasedSignal();
 }
 
 Button::ButtonSignalType& Button::ClickedSignal()
 {
-  return Dali::Toolkit::GetImplementation( *this ).ClickedSignal();
+  return Dali::Toolkit::GetImplementation(*this).ClickedSignal();
 }
 
 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);
 }