[dali_1.0.15] Merge branch 'tizen'

[platform/core/uifw/dali-core.git] / dali / public-api / object / type-registry.h

diff --git a/dali/public-api/object/type-registry.h b/dali/public-api/object/type-registry.h
index 1c5e2d0..e38db99 100644 (file)
--- a/dali/public-api/object/type-registry.h
+++ b/dali/public-api/object/type-registry.h
@@ -26,7 +26,7 @@
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/object/type-info.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Internal DALI_INTERNAL
@@ -88,7 +88,7 @@ class TypeRegistry;
  *   separated ie 'next-page'. This maintains consistency with the scripted interface.
  *
  */
-class TypeRegistry : public BaseHandle
+class DALI_IMPORT_API TypeRegistry : public BaseHandle
 {
 public:
   typedef std::vector<std::string> NameContainer; ///< Container of type names
@@ -111,9 +111,29 @@ public:
   ~TypeRegistry();
 
   /**
-   * @copydoc Dali::BaseHandle::operator=
+   * @brief This copy constructor is required for (smart) pointer semantics.
+   *
+   * @param [in] handle A reference to the copied handle
+   */
+  TypeRegistry(const TypeRegistry& handle);
+
+  /**
+   * @brief This assignment operator is required for (smart) pointer semantics.
+   *
+   * @param [in] rhs  A reference to the copied handle
+   * @return A reference to this
+   */
+  TypeRegistry& operator=(const TypeRegistry& rhs);
+
+  /**
+   * @brief This method is defined to allow assignment of the NULL value,
+   * and will throw an exception if passed any other value.
+   *
+   * Assigning to NULL is an alias for Reset().
+   * @param [in] rhs  A NULL pointer
+   * @return A reference to this handle
    */
-  using BaseHandle::operator=;
+  TypeRegistry& operator=(BaseHandle::NullType* rhs);
 
   /**
    * @brief Get TypeInfo for a registered type.
@@ -151,7 +171,7 @@ public: // Not intended for application developers
 /**
  * @brief Register a type from type info.
  */
-class TypeRegistration
+class DALI_IMPORT_API TypeRegistration
 {
 public:
   /**
@@ -202,7 +222,7 @@ private:
 /**
  * @brief Register a signal connector function to a registered type.
  */
-class SignalConnectorType
+class DALI_IMPORT_API SignalConnectorType
 {
 public:
   /**
@@ -218,7 +238,7 @@ public:
 /**
  * @brief Register an action function.
  */
-class TypeAction
+class DALI_IMPORT_API TypeAction
 {
 public:
   /**
@@ -234,7 +254,7 @@ public:
 /**
  * @brief Register a property for the given type.
  */
-class PropertyRegistration
+class DALI_IMPORT_API PropertyRegistration
 {
 public: