DALi signals refactor to remove V2 naming

[platform/core/uifw/dali-core.git] / dali / public-api / modeling / model-data.h

diff --git a/dali/public-api/modeling/model-data.h b/dali/public-api/modeling/model-data.h
index d853a26..a45dc71 100644 (file)
--- a/dali/public-api/modeling/model-data.h
+++ b/dali/public-api/modeling/model-data.h
@@ -26,7 +26,7 @@
 #include <dali/public-api/modeling/model-animation-map.h>
 #include <dali/public-api/object/base-handle.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 class Entity;
@@ -45,7 +45,7 @@ class ModelData;
  * This is usually generated by an external model loader (and is also
  * used internally with the default model loader).
  */
-class ModelData : public BaseHandle
+class DALI_IMPORT_API ModelData : public BaseHandle
 {
 public:
 
@@ -74,16 +74,26 @@ public:
   static ModelData DownCast( BaseHandle handle );
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
    *
-   * Dali::Object derived classes typically do not contain member data.
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ModelData();
+  ~ModelData();
 
   /**
-   * @copydoc Dali::BaseHandle::operator=
+   * @brief This copy constructor is required for (smart) pointer semantics.
+   *
+   * @param [in] handle A reference to the copied handle
    */
-  using BaseHandle::operator=;
+  ModelData(const ModelData& 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
+   */
+  ModelData& operator=(const ModelData& rhs);
 
   /**
    * @brief Returns the name of the model.
@@ -166,24 +176,6 @@ public:
    ModelAnimationMapContainer& GetAnimationMapContainer();
 
   /**
-   * @brief Get an animation map from the model data.
-   *
-   * @deprecated Use ModelActorFactory to generate animations
-   * @param[in] index The index of the animation map.
-   * @return a pointer to model animation map.
-   */
-  const ModelAnimationMap* GetAnimationMap (unsigned int index) const;
-
-  /**
-   * @brief Get the animation for the given name.
-   *
-   * @deprecated Use ModelActorFactory to generate animations
-   * @param[in] name The name of an animation map to search for.
-   * @return a pointer to model animation map.
-   */
-  const ModelAnimationMap* GetAnimationMap (const std::string& name) const;
-
-  /**
    * @brief Find the index for the given animation name.
    *
    * @param[in] name The name of the animation map to search for.