-#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.
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.
};
-} // namespace Internal
-
} // namespace Dali
-#endif //__DALI_INTERNAL_OWNER_CONTAINER_H__
+#endif //__DALI_OWNER_CONTAINER_H__
$(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
// 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>
// 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>
#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>
*/
// 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
{
// 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
{
*/
#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
*/
#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>
* 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>
*/
// 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>
*/
// 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>
*/
// 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
// 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>
// 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>
// 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
{
*/
#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
#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>
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
*
#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>
#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>
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 )
{
*/
// 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
{
// 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
{
*/
// 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