X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fcommon%2Fobject-impl.h;h=9f34aed06befcac76a61426e9ae67407a65ca003;hb=8dcc28c84192bb52789a2ac82bab24975df7076b;hp=31331354d44370adf98d1a5d8bd58f28b2a43c20;hpb=66862960bc66e34880572cda416db7d14281756b;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/event/common/object-impl.h b/dali/internal/event/common/object-impl.h
index 3133135..9f34aed 100644
--- a/dali/internal/event/common/object-impl.h
+++ b/dali/internal/event/common/object-impl.h
@@ -19,13 +19,13 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/public-api/animation/active-constraint.h>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/object/handle.h>
 #include <dali/public-api/object/property.h>
+#include <dali/public-api/object/property-index-ranges.h>
 #include <dali/public-api/object/property-input.h>
 #include <dali/public-api/object/property-notification.h>
 #include <dali/internal/common/owner-container.h>
@@ -41,7 +41,7 @@ class PropertyNotification;
 
 namespace Internal
 {
-class Constraint;
+class ConstraintBase;
 class EventThreadServices;
 class Handle;
 class PropertyCondition;
@@ -55,9 +55,9 @@ class PropertyBase;
 class PropertyOwner;
 }
 
-typedef std::vector< Dali::ActiveConstraint >     ActiveConstraintContainer;
-typedef ActiveConstraintContainer::iterator       ActiveConstraintIter;
-typedef ActiveConstraintContainer::const_iterator ActiveConstraintConstIter;
+typedef std::vector< Dali::Constraint >     ConstraintContainer;
+typedef ConstraintContainer::iterator       ConstraintIter;
+typedef ConstraintContainer::const_iterator ConstraintConstIter;
 
 /**
  * A base class for objects which optionally provide properties.
@@ -214,23 +214,16 @@ public:
   // Constraints
 
   /**
-   * Apply a constraint to a Object.
+   * Apply a constraint to an Object.
    * @param[in] constraint The constraint to apply.
    */
-  Dali::ActiveConstraint ApplyConstraint( Constraint& constraint );
+  void ApplyConstraint( ConstraintBase& constraint );
 
   /**
-   * Apply a constraint to a Object.
-   * @param[in] constraint The constraint to apply.
-   * @param[in] weightObject An object with a "weight" float property.
-   */
-  Dali::ActiveConstraint ApplyConstraint( Constraint& constraint, Dali::Handle weightObject );
-
-  /**
-   * Remove one constraint from a Object.
-   * @param[in] activeConstraint The active constraint to remove.
+   * Remove one constraint from an Object.
+   * @param[in] constraint The constraint to remove.
    */
-  void RemoveConstraint( Dali::ActiveConstraint activeConstraint );
+  void RemoveConstraint( ConstraintBase& constraint );
 
   /**
    * Remove all constraints from a Object.
@@ -307,7 +300,7 @@ protected:
 
   /**
    * For use in derived classes.
-   * This is called after a non animatable custom property is set.
+   * This is called after a property is set.
    * @param [in] index The index of the property.
    * @param [in] propertyValue The value of the property.
    */
@@ -456,19 +449,6 @@ private:
   void DisablePropertyNotifications();
 
   /**
-   * Helper for ApplyConstraint overloads.
-   * @param[in] constraint The constraint to apply.
-   * @param[in] weightObject An object with a "weight" float property, or an empty handle.
-   * @return The new active-constraint which is owned by Object.
-   */
-  ActiveConstraintBase* DoApplyConstraint( Constraint& constraint, Dali::Handle weightObject );
-
-  /**
-   * Helper to remove active constraints
-   */
-  void RemoveConstraint( ActiveConstraint& constraint, bool isInScenegraph );
-
-  /**
    * Get the value of the property.
    * @param [in] entry An entry from the property lookup container.
    * @return The new value of the property.
@@ -522,7 +502,7 @@ private:
 
   Dali::Vector<Observer*> mObservers;
 
-  ActiveConstraintContainer* mConstraints;               ///< Container of owned active-constraints.
+  ConstraintContainer* mConstraints;               ///< Container of owned -constraints.
 
   typedef std::vector< Dali::PropertyNotification >     PropertyNotificationContainer;
   typedef PropertyNotificationContainer::iterator       PropertyNotificationContainerIter;