Merge "Remove the replacing surface code" into devel/master

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

diff --git a/dali/public-api/adaptor-framework/widget.h b/dali/public-api/adaptor-framework/widget.h
index c22245e..0201651 100644 (file)
--- a/dali/public-api/adaptor-framework/widget.h
+++ b/dali/public-api/adaptor-framework/widget.h
@@ -2,7 +2,7 @@
 #define DALI_WIDGET_H
 
 /*
- * 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.
@@ -21,25 +21,24 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/base-handle.h>
 
+// INTERNAL INCLUDES
+#include <dali/public-api/dali-adaptor-common.h>
+
 namespace Dali
 {
-
-  /**
+/**
  * @addtogroup dali_adaptor_framework
  * @{
  */
 
 namespace Internal
 {
-
 namespace Adaptor
 {
 class Widget;
 }
 
-}
-
-class Window;
+} // namespace Internal
 
 /**
  * @brief Widget class is the base class for custom widget.
@@ -48,10 +47,9 @@ class Window;
  *
  * @SINCE_1_3_5
  */
-class DALI_IMPORT_API Widget : public BaseHandle
+class DALI_ADAPTOR_API Widget : public BaseHandle
 {
 public:
-
   /**
    * @brief Enumeration class for termination type of widget instance.
    * @SINCE_1_3_5
@@ -63,7 +61,6 @@ public:
   };
 
 public:
-
   /**
    * @brief This is the constructor for Widget.
    * @SINCE_1_3_5
@@ -82,7 +79,7 @@ public:
    * @SINCE_1_3_5
    * @param[in] widget Handle to an object
    */
-  Widget( const Widget& widget );
+  Widget(const Widget& widget);
 
   /**
    * @brief Assignment operator.
@@ -90,7 +87,24 @@ public:
    * @param[in] widget Handle to an object
    * @return A reference to this
    */
-  Widget& operator=( const Widget& widget );
+  Widget& operator=(const Widget& widget);
+
+  /**
+   * @brief Move constructor.
+   *
+   * @SINCE_1_9.24
+   * @param[in] rhs A reference to the moved handle
+   */
+  Widget(Widget&& rhs);
+
+  /**
+   * @brief Move assignment operator.
+   *
+   * @SINCE_1_9.24
+   * @param[in] rhs A reference to the moved handle
+   * @return A reference to this handle
+   */
+  Widget& operator=(Widget&& rhs);
 
   /**
    * @brief Destructor