Merge branch 'devel/master' into sandbox/dkdk/tizen

[platform/core/uifw/dali-adaptor.git] / dali / public-api / adaptor-framework / widget.cpp

diff --git a/dali/public-api/adaptor-framework/widget.cpp b/dali/public-api/adaptor-framework/widget.cpp
index d3c8426..590c524 100644 (file)
--- a/dali/public-api/adaptor-framework/widget.cpp
+++ b/dali/public-api/adaptor-framework/widget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 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.
@@ -19,11 +19,10 @@
 #include <dali/public-api/adaptor-framework/widget.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/system/common/widget-impl.h>
+#include <dali/public-api/adaptor-framework/widget-impl.h>
 
 namespace Dali
 {
-
 Widget Widget::New()
 {
   Internal::Adaptor::WidgetPtr internal = Internal::Adaptor::Widget::New();
@@ -38,19 +37,13 @@ Widget::Widget()
 {
 }
 
-Widget::Widget(const Widget& widget)
-: BaseHandle(widget)
-{
-}
+Widget::Widget(const Widget& copy) = default;
 
-Widget& Widget::operator=(const Widget& widget)
-{
-  if( *this != widget )
-  {
-    BaseHandle::operator=( widget );
-  }
-  return *this;
-}
+Widget& Widget::operator=(const Widget& rhs) = default;
+
+Widget::Widget(Widget&& rhs) = default;
+
+Widget& Widget::operator=(Widget&& rhs) = default;
 
 Widget::Widget(Internal::Adaptor::Widget* widget)
 : BaseHandle(widget)