Merge Handle & Constrainable

[platform/core/uifw/dali-core.git] / dali / public-api / geometry / animatable-mesh.h

diff --git a/dali/public-api/geometry/animatable-mesh.h b/dali/public-api/geometry/animatable-mesh.h
index 6c3394a..9f49dbe 100644 (file)
--- a/dali/public-api/geometry/animatable-mesh.h
+++ b/dali/public-api/geometry/animatable-mesh.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
-#include <dali/public-api/object/constrainable.h>
+#include <dali/public-api/object/handle.h>
 #include <dali/public-api/geometry/animatable-vertex.h>
 #include <dali/public-api/modeling/material.h>
 
@@ -40,7 +40,7 @@ class AnimatableMesh;
  * It is recommended that the vertices of the mesh remain in the bounds -0.5 - 0.5, which
  * will match the actor size boundaries. The origin of the mesh matches the actor's position.
  */
-class DALI_IMPORT_API AnimatableMesh : public Constrainable
+class DALI_IMPORT_API AnimatableMesh : public Handle
 {
 public:
   /**
@@ -123,16 +123,6 @@ public:
   AnimatableMesh& operator=(const AnimatableMesh& 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
-   */
-  AnimatableMesh& operator=(BaseHandle::NullType* rhs);
-
-  /**
    * @brief Get the number of vertices with which this mesh was created.
    *
    * @return number of vertices in this mesh