[dali_2.3.42] Merge branch 'devel/master'

[platform/core/uifw/dali-adaptor.git] / dali / devel-api / adaptor-framework / color-controller.cpp

diff --git a/dali/devel-api/adaptor-framework/color-controller.cpp b/dali/devel-api/adaptor-framework/color-controller.cpp
index ee1f7df..82518e6 100644 (file)
--- a/dali/devel-api/adaptor-framework/color-controller.cpp
+++ b/dali/devel-api/adaptor-framework/color-controller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -23,21 +23,17 @@
 
 namespace Dali
 {
-
 ColorController::ColorController()
 {
 }
 
-ColorController::ColorController(const ColorController& controller)
-: BaseHandle(controller)
-{
-}
+ColorController::ColorController(const ColorController& controller) = default;
 
-ColorController& ColorController::operator=(const ColorController& rhs)
-{
-  BaseHandle::operator=(rhs);
-  return *this;
-}
+ColorController& ColorController::operator=(const ColorController& rhs) = default;
+
+ColorController::ColorController(ColorController&& controller) = default;
+
+ColorController& ColorController::operator=(ColorController&& rhs) = default;
 
 ColorController ColorController::Get()
 {
@@ -48,14 +44,14 @@ ColorController::~ColorController()
 {
 }
 
-bool ColorController::RetrieveColor( const std::string& colorCode, Vector4& colorValue )
+bool ColorController::RetrieveColor(const std::string& colorCode, Vector4& colorValue)
 {
-  return GetImplementation(*this).RetrieveColor( colorCode, colorValue );
+  return GetImplementation(*this).RetrieveColor(colorCode, colorValue);
 }
 
-bool ColorController::RetrieveColor( const std::string& colorCode , Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor)
+bool ColorController::RetrieveColor(const std::string& colorCode, Vector4& textColor, Vector4& textOutlineColor, Vector4& textShadowColor)
 {
-  return GetImplementation(*this).RetrieveColor( colorCode, textColor, textOutlineColor, textShadowColor );
+  return GetImplementation(*this).RetrieveColor(colorCode, textColor, textOutlineColor, textShadowColor);
 }
 
 ColorController::ColorController(Internal::Adaptor::ColorController* internal)
@@ -63,4 +59,4 @@ ColorController::ColorController(Internal::Adaptor::ColorController* internal)
 {
 }
 
-}
+} // namespace Dali