Cleaning up the property framework; removal of duplicate methods and incorrect assers

[platform/core/uifw/dali-core.git] / dali / internal / event / actors / actor-impl.h

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index 83b649f..74ad86e 100644 (file)
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -1188,9 +1188,9 @@ public: // Default property extensions from ProxyObject
   virtual void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue);
 
   /**
-   * @copydoc Dali::Internal::ProxyObject::SetCustomProperty()
+   * @copydoc Dali::Internal::ProxyObject::SetSceneGraphProperty()
    */
-  virtual void SetCustomProperty( Property::Index index, const CustomProperty& entry, const Property::Value& value );
+  virtual void SetSceneGraphProperty( Property::Index index, const CustomProperty& entry, const Property::Value& value );
 
   /**
    * @copydoc Dali::Internal::ProxyObject::GetDefaultProperty()
@@ -1198,9 +1198,9 @@ public: // Default property extensions from ProxyObject
   virtual Property::Value GetDefaultProperty( Property::Index index ) const;
 
   /**
-   * @copydoc Dali::Internal::ProxyObject::InstallSceneObjectProperty()
+   * @copydoc Dali::Internal::ProxyObject::GetPropertyOwner()
    */
-  virtual void InstallSceneObjectProperty( SceneGraph::PropertyBase& newProperty, const std::string& name, unsigned int index );
+  virtual const SceneGraph::PropertyOwner* GetPropertyOwner() const;
 
   /**
    * @copydoc Dali::Internal::ProxyObject::GetSceneObject()
@@ -1298,14 +1298,6 @@ private:
 
   /**
    * For use in derived classes.
-   * This is called after a non animatable custom property is set.
-   * @param [in] index The index of the property.
-   * @param [in] propertyValue The value of the property.
-   */
-  virtual void OnPropertySet( Property::Index index, Property::Value propertyValue ) {}
-
-  /**
-   * For use in derived classes.
    * This is only called if mDerivedRequiresTouch is true, and the touch-signal was not consumed.
    * @param[in] event The touch event.
    * @return True if the event should be consumed.