Moved Core Rendering API from devel-api to public-api

[platform/core/uifw/dali-core.git] / dali / internal / event / common / object-impl.h

diff --git a/dali/internal/event/common/object-impl.h b/dali/internal/event/common/object-impl.h
index ddc5498..b7e6836 100644 (file)
--- a/dali/internal/event/common/object-impl.h
+++ b/dali/internal/event/common/object-impl.h
@@ -2,7 +2,7 @@
 #define __DALI_INTERNAL_OBJECT_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -28,7 +28,7 @@
 #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>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/event/common/event-thread-services.h>
 #include <dali/internal/event/common/property-input-impl.h>
 #include <dali/internal/event/common/property-metadata.h>
@@ -217,7 +217,7 @@ public:
   /**
    * @copydoc Dali::Handle::AddUniformMapping()
    */
-  void AddUniformMapping( Property::Index propertyIndex, const std::string& uniformName );
+  void AddUniformMapping( Property::Index propertyIndex, const std::string& uniformName ) const;
 
   /**
    * @copydoc Dali::Handle::RemoveUniformMapping( )
@@ -312,6 +312,15 @@ protected:
   void OnSceneObjectRemove();
 
   /**
+   * For overriding by derived classes to return the parent of this object.
+   */
+  virtual Object* GetParentObject() const
+  {
+    // By default the Object does not have a parent
+    return NULL;
+  };
+
+  /**
    * For use in derived classes.
    * This is called after a property is set.
    * @param [in] index The index of the property.
@@ -356,6 +365,11 @@ protected:
    */
   AnimatablePropertyMetadata* RegisterAnimatableProperty(Property::Index index) const;
 
+  /**
+   * Resolve the index and name of child properties if any.
+   */
+  void ResolveChildProperties();
+
 private: // Default property extensions for derived classes
 
   /**