From 4269f2c69885950e7386cd7b7b52325d595a52e7 Mon Sep 17 00:00:00 2001
From: Chu Hoang <c.hoang@samsung.com>
Date: Fri, 9 Oct 2015 12:04:48 +0100
Subject: [PATCH] Moved OwnerContainer from internal to devel-api.

Change-Id: I9d47ec9e11e2f44d884a758e79f402711018ed3e
---
 dali/{internal => devel-api}/common/owner-container.h       | 13 ++++---------
 dali/devel-api/file.list                                    |  1 +
 dali/internal/event/animation/animator-connector-base.h     |  2 +-
 dali/internal/event/common/notification-manager.cpp         |  2 +-
 dali/internal/event/common/object-impl.h                    |  2 +-
 dali/internal/render/common/render-instruction-container.h  |  2 +-
 dali/internal/render/common/render-list.h                   |  2 +-
 .../internal/render/data-providers/geometry-data-provider.h |  2 +-
 dali/internal/render/renderers/render-geometry.h            |  2 +-
 .../render/renderers/render-renderer-property-buffer.h      |  2 +-
 dali/internal/render/shaders/program-controller.h           |  2 +-
 dali/internal/update/animation/scene-graph-animator.h       |  2 +-
 .../update/animation/scene-graph-constraint-declarations.h  |  2 +-
 dali/internal/update/common/discard-queue.h                 |  2 +-
 dali/internal/update/common/property-owner.h                |  2 +-
 .../update/common/scene-graph-property-notification.h       |  2 +-
 dali/internal/update/common/uniform-map.h                   |  3 +--
 dali/internal/update/manager/object-owner-container.h       |  8 ++++----
 dali/internal/update/manager/update-manager.cpp             |  4 ++--
 .../update/node-attachments/node-attachment-declarations.h  |  2 +-
 dali/internal/update/nodes/node-declarations.h              |  2 +-
 .../update/render-tasks/scene-graph-render-task-list.h      |  2 +-
 22 files changed, 29 insertions(+), 34 deletions(-)
 rename dali/{internal => devel-api}/common/owner-container.h (94%)

diff --git a/dali/internal/common/owner-container.h b/dali/devel-api/common/owner-container.h
similarity index 94%
rename from dali/internal/common/owner-container.h
rename to dali/devel-api/common/owner-container.h
index 9131616..108d1a4 100644
--- a/dali/internal/common/owner-container.h
+++ b/dali/devel-api/common/owner-container.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_OWNER_CONTAINER_H__
-#define __DALI_INTERNAL_OWNER_CONTAINER_H__
+#ifndef __DALI_OWNER_CONTAINER_H__
+#define __DALI_OWNER_CONTAINER_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
@@ -25,9 +25,6 @@
 namespace Dali
 {
 
-namespace Internal
-{
-
 /**
  * OwnerContainer is a vector which own heap-allocated objects.
  * Unlike vector this will call delete on the stored pointers during destruction.
@@ -171,8 +168,6 @@ private:
 
 };
 
-} // namespace Internal
-
 } // namespace Dali
 
-#endif //__DALI_INTERNAL_OWNER_CONTAINER_H__
+#endif //__DALI_OWNER_CONTAINER_H__
diff --git a/dali/devel-api/file.list b/dali/devel-api/file.list
index fcd9d16..4c907e2 100644
--- a/dali/devel-api/file.list
+++ b/dali/devel-api/file.list
@@ -31,6 +31,7 @@ devel_api_core_common_header_files = \
   $(devel_api_src_dir)/common/map-wrapper.h \
   $(devel_api_src_dir)/common/conditional-wait.h \
   $(devel_api_src_dir)/common/mutex.h \
+  $(devel_api_src_dir)/common/owner-container.h \
   $(devel_api_src_dir)/common/ref-counted-dali-vector.h \
     $(devel_api_src_dir)/common/set-wrapper.h
 
diff --git a/dali/internal/event/animation/animator-connector-base.h b/dali/internal/event/animation/animator-connector-base.h
index 90ff6f5..9c49d14 100644
--- a/dali/internal/event/animation/animator-connector-base.h
+++ b/dali/internal/event/animation/animator-connector-base.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/common/owner-pointer.h>
-#include <dali/internal/common/owner-container.h>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/public-api/animation/alpha-function.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/common/dali-common.h>
diff --git a/dali/internal/event/common/notification-manager.cpp b/dali/internal/event/common/notification-manager.cpp
index 7be7722..0b113d1 100644
--- a/dali/internal/event/common/notification-manager.cpp
+++ b/dali/internal/event/common/notification-manager.cpp
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/devel-api/common/mutex.h>
-#include <dali/internal/common/owner-container.h>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/common/message.h>
 #include <dali/internal/event/common/property-notification-impl.h>
 #include <dali/internal/event/common/complete-notification-interface.h>
diff --git a/dali/internal/event/common/object-impl.h b/dali/internal/event/common/object-impl.h
index ddc5498..bcbce81 100644
--- a/dali/internal/event/common/object-impl.h
+++ b/dali/internal/event/common/object-impl.h
@@ -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>
diff --git a/dali/internal/render/common/render-instruction-container.h b/dali/internal/render/common/render-instruction-container.h
index 4fb4cb5..1bcff8b 100644
--- a/dali/internal/render/common/render-instruction-container.h
+++ b/dali/internal/render/common/render-instruction-container.h
@@ -19,8 +19,8 @@
  */
 
 // INTERNAL INCLUDES
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/common/buffer-index.h>
-#include <dali/internal/common/owner-container.h>
 
 namespace Dali
 {
diff --git a/dali/internal/render/common/render-list.h b/dali/internal/render/common/render-list.h
index 6572447..fef087d 100644
--- a/dali/internal/render/common/render-list.h
+++ b/dali/internal/render/common/render-list.h
@@ -20,8 +20,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/math/rect.h>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/render/common/render-item.h>
-#include <dali/internal/common/owner-container.h>
 
 namespace Dali
 {
diff --git a/dali/internal/render/data-providers/geometry-data-provider.h b/dali/internal/render/data-providers/geometry-data-provider.h
index 8b58b33..8d9487c 100644
--- a/dali/internal/render/data-providers/geometry-data-provider.h
+++ b/dali/internal/render/data-providers/geometry-data-provider.h
@@ -18,8 +18,8 @@
  */
 
 #include <dali/devel-api/rendering/geometry.h>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/common/buffer-index.h>
-#include <dali/internal/common/owner-container.h>
 #include <dali/internal/render/data-providers/property-buffer-data-provider.h>
 
 namespace Dali
diff --git a/dali/internal/render/renderers/render-geometry.h b/dali/internal/render/renderers/render-geometry.h
index 80aba88..cb15d40 100644
--- a/dali/internal/render/renderers/render-geometry.h
+++ b/dali/internal/render/renderers/render-geometry.h
@@ -18,9 +18,9 @@
  */
 
 #include <dali/public-api/common/dali-vector.h>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/integration-api/gl-defines.h>
 #include <dali/internal/common/buffer-index.h>
-#include <dali/internal/common/owner-container.h>
 #include <dali/internal/common/owner-pointer.h>
 #include <dali/internal/render/data-providers/render-data-provider.h>
 #include <dali/internal/render/renderers/render-renderer-property-buffer.h>
diff --git a/dali/internal/render/renderers/render-renderer-property-buffer.h b/dali/internal/render/renderers/render-renderer-property-buffer.h
index 009fafe..f779cd7 100644
--- a/dali/internal/render/renderers/render-renderer-property-buffer.h
+++ b/dali/internal/render/renderers/render-renderer-property-buffer.h
@@ -17,9 +17,9 @@
  * limitations under the License.
  */
 
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/integration-api/gl-abstraction.h>
 #include <dali/internal/common/buffer-index.h>
-#include <dali/internal/common/owner-container.h>
 #include <dali/internal/common/owner-pointer.h>
 #include <dali/internal/render/data-providers/property-buffer-data-provider.h>
 #include <dali/internal/render/gl-resources/gpu-buffer.h>
diff --git a/dali/internal/render/shaders/program-controller.h b/dali/internal/render/shaders/program-controller.h
index 3ceb2a9..ead14d6 100644
--- a/dali/internal/render/shaders/program-controller.h
+++ b/dali/internal/render/shaders/program-controller.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/internal/common/owner-container.h>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/render/shaders/program.h>
 #include <dali/internal/render/shaders/program-cache.h>
 
diff --git a/dali/internal/update/animation/scene-graph-animator.h b/dali/internal/update/animation/scene-graph-animator.h
index e153b86..02ccfc2 100644
--- a/dali/internal/update/animation/scene-graph-animator.h
+++ b/dali/internal/update/animation/scene-graph-animator.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/internal/common/owner-container.h>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/event/animation/key-frames-impl.h>
 #include <dali/internal/event/animation/path-impl.h>
 #include <dali/internal/update/nodes/node.h>
diff --git a/dali/internal/update/animation/scene-graph-constraint-declarations.h b/dali/internal/update/animation/scene-graph-constraint-declarations.h
index 60039db..e453a2d 100644
--- a/dali/internal/update/animation/scene-graph-constraint-declarations.h
+++ b/dali/internal/update/animation/scene-graph-constraint-declarations.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/internal/common/owner-container.h>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/update/nodes/node-declarations.h>
 
 namespace Dali
diff --git a/dali/internal/update/common/discard-queue.h b/dali/internal/update/common/discard-queue.h
index c501c5c..09c07b0 100644
--- a/dali/internal/update/common/discard-queue.h
+++ b/dali/internal/update/common/discard-queue.h
@@ -20,8 +20,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/ref-object.h>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/common/buffer-index.h>
-#include <dali/internal/common/owner-container.h>
 #include <dali/internal/update/nodes/node-declarations.h>
 #include <dali/internal/update/node-attachments/node-attachment-declarations.h>
 #include <dali/internal/update/common/scene-graph-property-buffer.h>
diff --git a/dali/internal/update/common/property-owner.h b/dali/internal/update/common/property-owner.h
index bc00f3c..3df069b 100644
--- a/dali/internal/update/common/property-owner.h
+++ b/dali/internal/update/common/property-owner.h
@@ -22,8 +22,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/common/message.h>
-#include <dali/internal/common/owner-container.h>
 #include <dali/internal/update/common/property-base.h>
 #include <dali/internal/update/common/scene-graph-buffers.h>
 #include <dali/internal/update/common/uniform-map.h>
diff --git a/dali/internal/update/common/scene-graph-property-notification.h b/dali/internal/update/common/scene-graph-property-notification.h
index 6681fbb..2a4bea6 100644
--- a/dali/internal/update/common/scene-graph-property-notification.h
+++ b/dali/internal/update/common/scene-graph-property-notification.h
@@ -20,9 +20,9 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/property-notification.h>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/event/common/property-notification-impl.h>
 #include <dali/internal/update/common/property-base.h>
-#include <dali/internal/common/owner-container.h>
 
 namespace Dali
 {
diff --git a/dali/internal/update/common/uniform-map.h b/dali/internal/update/common/uniform-map.h
index 1814bb7..f78ab3a 100644
--- a/dali/internal/update/common/uniform-map.h
+++ b/dali/internal/update/common/uniform-map.h
@@ -18,8 +18,7 @@
  */
 
 #include <dali/devel-api/common/hash.h>
-#include <dali/internal/common/owner-container.h>
-
+#include <dali/devel-api/common/owner-container.h>
 #include <string>
 
 namespace Dali
diff --git a/dali/internal/update/manager/object-owner-container.h b/dali/internal/update/manager/object-owner-container.h
index a1e5ba9..3f6e739 100644
--- a/dali/internal/update/manager/object-owner-container.h
+++ b/dali/internal/update/manager/object-owner-container.h
@@ -21,7 +21,7 @@
 #include <algorithm>
 
 // INTERNAL INCLUDES
-#include <dali/internal/common/owner-container.h>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/update/common/discard-queue.h>
 #include <dali/internal/update/controllers/scene-controller.h>
 
@@ -42,11 +42,11 @@ template< class Type >
 class ObjectOwnerContainer
 {
 public:
-  typedef typename Internal::OwnerContainer< Type* > ObjectContainer;
-  typedef typename Internal::OwnerContainer< Type* >::Iterator Iterator;
+  typedef typename Dali::OwnerContainer< Type* > ObjectContainer;
+  typedef typename Dali::OwnerContainer< Type* >::Iterator Iterator;
 
   /**
-   * @brief Constructor - createw a new object container
+   * @brief Constructor - create a new object container
    *
    * Object container own update side objects
    *
diff --git a/dali/internal/update/manager/update-manager.cpp b/dali/internal/update/manager/update-manager.cpp
index b74f4fd..7d64ce7 100644
--- a/dali/internal/update/manager/update-manager.cpp
+++ b/dali/internal/update/manager/update-manager.cpp
@@ -22,6 +22,7 @@
 #include <dali/public-api/common/stage.h>
 #include <dali/devel-api/common/set-wrapper.h>
 #include <dali/devel-api/common/mutex.h>
+#include <dali/devel-api/common/owner-container.h>
 
 #include <dali/integration-api/core.h>
 #include <dali/integration-api/render-controller.h>
@@ -29,7 +30,6 @@
 #include <dali/integration-api/debug.h>
 
 #include <dali/internal/common/core-impl.h>
-#include <dali/internal/common/owner-container.h>
 #include <dali/internal/common/message.h>
 
 #include <dali/internal/event/common/notification-manager.h>
@@ -937,7 +937,7 @@ void UpdateManager::ForwardCompiledShadersToEventThread()
 
 void UpdateManager::UpdateRenderers( BufferIndex bufferIndex )
 {
-  const Internal::OwnerContainer<Renderer*>& rendererContainer( mImpl->renderers.GetObjectContainer() );
+  const OwnerContainer<Renderer*>& rendererContainer( mImpl->renderers.GetObjectContainer() );
   unsigned int rendererCount( rendererContainer.Size() );
   for( unsigned int i(0); i<rendererCount; ++i )
   {
diff --git a/dali/internal/update/node-attachments/node-attachment-declarations.h b/dali/internal/update/node-attachments/node-attachment-declarations.h
index fcc66a9..bb4a524 100644
--- a/dali/internal/update/node-attachments/node-attachment-declarations.h
+++ b/dali/internal/update/node-attachments/node-attachment-declarations.h
@@ -19,8 +19,8 @@
  */
 
 // INTERNAL INCLUDES
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/common/owner-pointer.h>
-#include <dali/internal/common/owner-container.h>
 
 namespace Dali
 {
diff --git a/dali/internal/update/nodes/node-declarations.h b/dali/internal/update/nodes/node-declarations.h
index 458b5c8..853cb59 100644
--- a/dali/internal/update/nodes/node-declarations.h
+++ b/dali/internal/update/nodes/node-declarations.h
@@ -20,8 +20,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/common/owner-pointer.h>
-#include <dali/internal/common/owner-container.h>
 
 namespace Dali
 {
diff --git a/dali/internal/update/render-tasks/scene-graph-render-task-list.h b/dali/internal/update/render-tasks/scene-graph-render-task-list.h
index ad40d2d..8549034 100644
--- a/dali/internal/update/render-tasks/scene-graph-render-task-list.h
+++ b/dali/internal/update/render-tasks/scene-graph-render-task-list.h
@@ -19,8 +19,8 @@
  */
 
 // INTERNAL INCLUDES
+#include <dali/devel-api/common/owner-container.h>
 #include <dali/internal/common/message.h>
-#include <dali/internal/common/owner-container.h>
 #include <dali/internal/event/common/event-thread-services.h>
 
 namespace Dali
-- 
2.7.4