Use modern construct 'using' instead of typedef.

[platform/core/uifw/dali-core.git] / dali / internal / update / common / property-owner.h

diff --git a/dali/internal/update/common/property-owner.h b/dali/internal/update/common/property-owner.h
index fa7bf46..c4dd922 100644 (file)
--- a/dali/internal/update/common/property-owner.h
+++ b/dali/internal/update/common/property-owner.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_H
+#define DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@
  *
  */
 
-// EXTERNAL INCLUDES
-
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/devel-api/common/owner-container.h>
@@ -41,8 +39,8 @@ namespace SceneGraph
 
 class PropertyOwner;
 
-typedef OwnerContainer< PropertyBase* > OwnedPropertyContainer;
-typedef OwnedPropertyContainer::Iterator  OwnedPropertyIter;
+using OwnedPropertyContainer = OwnerContainer<PropertyBase*>;
+using OwnedPropertyIter      = OwnedPropertyContainer::Iterator;
 
 /**
  * An update-thread object which own properties.
@@ -142,7 +140,7 @@ public:
    * @post The PropertyOwner takes ownership of the property.
    * @param[in] property A pointer to a newly allocated property.
    */
-  void InstallCustomProperty(PropertyBase* property);
+  void InstallCustomProperty( OwnerPointer<PropertyBase>& property );
 
   /**
    * Retrieve the custom properties owned by the object.
@@ -163,11 +161,22 @@ public:
   }
 
   /**
-   * Reset animatable properties to the corresponding base values.
-   * @param[in] currentBufferIndex The buffer to reset.
-   * @post The ResetDefaultProperties method is called, during which derived classes can reset default properties.
+   * Mark an property owner with the updated flag.
+   * @param[in] updated The updated flag
+   */
+  virtual void SetUpdated(bool updated)
+  {
+    mUpdated = updated;
+  }
+
+  /**
+   * Retrieve if the property owner is updated due to the property is being animating.
+   * @return An updated flag
    */
-  void ResetToBaseValues( BufferIndex updateBufferIndex );
+  bool Updated() const
+  {
+    return mUpdated;
+  }
 
   // Constraints
 
@@ -175,7 +184,7 @@ public:
    * Apply a constraint.
    * @param[in] constraint The constraint to apply.
    */
-  void ApplyConstraint( ConstraintBase* constraint );
+  void ApplyConstraint( OwnerPointer<ConstraintBase>& constraint );
 
   /**
    * Begin removal of constraints.
@@ -192,7 +201,7 @@ public:
   /**
    * @copydoc UniformMap::Add
    */
-  virtual void AddUniformMapping( UniformPropertyMapping* map );
+  virtual void AddUniformMapping( OwnerPointer< UniformPropertyMapping >& map );
 
   /**
    * @copydoc UniformMap::Remove
@@ -230,22 +239,16 @@ private:
   // Undefined
   PropertyOwner& operator=(const PropertyOwner& rhs);
 
-  /**
-   * Called after ResetToBaseValues; derived classes should reset any default properties.
-   * @param[in] currentBufferIndex The buffer to reset.
-   */
-  virtual void ResetDefaultProperties( BufferIndex updateBufferIndex ) {}
-
 protected:
 
   OwnedPropertyContainer mCustomProperties; ///< Properties provided with InstallCustomProperty()
   UniformMap mUniformMaps; ///< Container of owned uniform maps
+  bool mUpdated;
 
 private:
-
-  typedef Dali::Vector<PropertyOwner::Observer*> ObserverContainer;
-  typedef ObserverContainer::Iterator ObserverIter;
-  typedef ObserverContainer::ConstIterator ConstObserverIter;
+  using ObserverContainer = Dali::Vector<PropertyOwner::Observer*>;
+  using ObserverIter      = ObserverContainer::Iterator;
+  using ConstObserverIter = ObserverContainer::ConstIterator;
 
   ObserverContainer mObservers; ///< Container of observer raw-pointers (not owned)
 
@@ -258,4 +261,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_PROPERTY_OWNER_H