Remove ActorContainer typedef

Also removed some unnecessary includes of <vector-wrapper.h> from
public-api files

Change-Id: I158193751290c01614f2a05211dd629bb5cf04fd

diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-Image-Culling.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-Image-Culling.cpp
index e911d39219379df2350e67480380043a65666f7a..e55d3e1aae9daa960640aa83b37db2c0ae7e04ef 100644 (file)
--- a/automated-tests/src/dali-internal/utc-Dali-Internal-Image-Culling.cpp
+++ b/automated-tests/src/dali-internal/utc-Dali-Internal-Image-Culling.cpp
@@ -423,7 +423,7 @@ void TestPlaneOfImages(TestApplication& application, float z)
 
   // Create a grid of 9 x 9 actors; only the central 3x3 are in viewport
 
 
   // Create a grid of 9 x 9 actors; only the central 3x3 are in viewport
 

-  ActorContainer actors;
+  std::vector< Actor > actors;

   for( int i = 0; i < NUM_ROWS*NUM_COLS; i++ )
   {
     GLuint textureId = TEXTURE_ID_OFFSET+i;
   for( int i = 0; i < NUM_ROWS*NUM_COLS; i++ )
   {
     GLuint textureId = TEXTURE_ID_OFFSET+i;

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index 9ca88450b71a24022cec87e1e8123fdfdb244eb3..faf17051f6bc0ba8378ff6da0ea99cb9b241139a 100644 (file)
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -57,7 +57,7 @@ class RenderTask;
 struct DynamicsData;
 
 typedef IntrusivePtr< Actor > ActorPtr;
 struct DynamicsData;
 
 typedef IntrusivePtr< Actor > ActorPtr;

-typedef Dali::ActorContainer ActorContainer; // Store handles to return via public-api
+typedef std::vector< Dali::Actor > ActorContainer; // Store handles to return via public-api

 typedef ActorContainer::iterator ActorIter;
 typedef ActorContainer::const_iterator ActorConstIter;
 
 typedef ActorContainer::iterator ActorIter;
 typedef ActorContainer::const_iterator ActorConstIter;
 

diff --git a/dali/internal/event/events/hit-test-algorithm-impl.cpp b/dali/internal/event/events/hit-test-algorithm-impl.cpp
index b3eb5ad5fe17f8d5d5d5fd9f13accdb29d3fcc01..e43d5fa3e5e85e0a29adb2c5cfbc7cdc395da436 100644 (file)
--- a/dali/internal/event/events/hit-test-algorithm-impl.cpp
+++ b/dali/internal/event/events/hit-test-algorithm-impl.cpp
@@ -207,12 +207,12 @@ HitActor HitTestWithinLayer( Actor& actor,
   if( actor.GetChildCount() > 0 )
   {
     childHit.distance = std::numeric_limits<float>::max();
   if( actor.GetChildCount() > 0 )
   {
     childHit.distance = std::numeric_limits<float>::max();

-    Dali::ActorContainer& children = actor.GetChildrenInternal();
+    ActorContainer& children = actor.GetChildrenInternal();

 
     // Hit test ALL children and calculate their distance.
     bool parentIsRenderable = actor.IsRenderable();
 
 
     // Hit test ALL children and calculate their distance.
     bool parentIsRenderable = actor.IsRenderable();
 

-    for (Dali::ActorIter iter = children.begin(), endIter = children.end(); iter != endIter; ++iter)
+    for( ActorIter iter = children.begin(), endIter = children.end(); iter != endIter; ++iter )

     {
       // Descend tree only if...
       if ( !iter->IsLayer() &&    // Child is NOT a layer, hit testing current layer only or Child is not a layer and we've inherited the stencil draw mode
     {
       // Descend tree only if...
       if ( !iter->IsLayer() &&    // Child is NOT a layer, hit testing current layer only or Child is not a layer and we've inherited the stencil draw mode

diff --git a/dali/internal/event/size-negotiation/relayout-controller-impl.cpp b/dali/internal/event/size-negotiation/relayout-controller-impl.cpp
index 6fa43f312c996f55b89d0d9ea24a3fb52d2a9272..91f0ad9e68d9be2154afd50d0f5258cb933827fa 100644 (file)
--- a/dali/internal/event/size-negotiation/relayout-controller-impl.cpp
+++ b/dali/internal/event/size-negotiation/relayout-controller-impl.cpp
@@ -144,8 +144,8 @@ void RelayoutController::RequestRelayout( Dali::Actor& actor, Dimension::Type di
     return;
   }
 
     return;
   }
 

-  Dali::ActorContainer potentialRedundantSubRoots;
-  Dali::ActorContainer topOfSubTreeStack;
+  std::vector< Dali::Actor > potentialRedundantSubRoots;
+  std::vector< Dali::Actor > topOfSubTreeStack;

 
   topOfSubTreeStack.push_back( actor );
 
 
   topOfSubTreeStack.push_back( actor );
 


@@ -176,7 +176,7 @@ void RelayoutController::RequestRelayout( Dali::Actor& actor, Dimension::Type di
   }
 
   // Remove any redundant sub-tree heads
   }
 
   // Remove any redundant sub-tree heads

-  for( ActorContainer::iterator it = potentialRedundantSubRoots.begin(), itEnd = potentialRedundantSubRoots.end(); it != itEnd; ++it )
+  for( std::vector< Dali::Actor >::iterator it = potentialRedundantSubRoots.begin(), itEnd = potentialRedundantSubRoots.end(); it != itEnd; ++it )

   {
     Dali::Actor subRoot = *it;
 
   {
     Dali::Actor subRoot = *it;
 


@@ -232,7 +232,7 @@ void RelayoutController::RequestRelayoutTree( Dali::Actor& actor )
   }
 }
 
   }
 }
 

-void RelayoutController::PropagateAll( Dali::Actor& actor, Dimension::Type dimension, Dali::ActorContainer& topOfSubTreeStack, Dali::ActorContainer& potentialRedundantSubRoots )
+void RelayoutController::PropagateAll( Dali::Actor& actor, Dimension::Type dimension, std::vector< Dali::Actor >& topOfSubTreeStack, std::vector< Dali::Actor >& potentialRedundantSubRoots )

 {
   // Only set dirty flag if doing relayout and not already marked as dirty
   Actor& actorImpl = GetImplementation( actor );
 {
   // Only set dirty flag if doing relayout and not already marked as dirty
   Actor& actorImpl = GetImplementation( actor );

diff --git a/dali/internal/event/size-negotiation/relayout-controller-impl.h b/dali/internal/event/size-negotiation/relayout-controller-impl.h
index 7c5b39cf1cd157a62ef49e023a19575b58c416f6..aa277c507e9634869c729a981e709a583612bb40 100644 (file)
--- a/dali/internal/event/size-negotiation/relayout-controller-impl.h
+++ b/dali/internal/event/size-negotiation/relayout-controller-impl.h
@@ -22,7 +22,6 @@
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/size-negotiation/relayout-container.h>
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/size-negotiation/relayout-container.h>

-

 #include <dali/internal/common/memory-pool-object-allocator.h>
 #include <dali/internal/event/size-negotiation/memory-pool-relayout-container.h>
 
 #include <dali/internal/common/memory-pool-object-allocator.h>
 #include <dali/internal/event/size-negotiation/memory-pool-relayout-container.h>
 


@@ -163,7 +162,7 @@ private:
    * @param[in] topOfSubTreeStack The top of the sub tree that this actor is in
    * @param[in] potentialRedundantSubRoots Actors collected as potentially already being included in relayout
    */
    * @param[in] topOfSubTreeStack The top of the sub tree that this actor is in
    * @param[in] potentialRedundantSubRoots Actors collected as potentially already being included in relayout
    */

-  void PropagateAll( Dali::Actor& actor, Dimension::Type dimension, Dali::ActorContainer& topOfSubTreeStack, Dali::ActorContainer& potentialRedundantSubRoots );
+  void PropagateAll( Dali::Actor& actor, Dimension::Type dimension, std::vector< Dali::Actor >& topOfSubTreeStack, std::vector< Dali::Actor >& potentialRedundantSubRoots );

 
   /**
    * Queue an actor on the relayout container
 
   /**
    * Queue an actor on the relayout container

diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h
index 918fd1d335aa02553e015461114205156fc3d466..2de01a876a9375430981f5fa3f56240d8035946e 100644 (file)
--- a/dali/public-api/actors/actor.h
+++ b/dali/public-api/actors/actor.h
@@ -22,7 +22,6 @@
 #include <string>
 
 // INTERNAL INCLUDES
 #include <string>
 
 // INTERNAL INCLUDES

-#include <dali/public-api/common/vector-wrapper.h>

 #include <dali/public-api/actors/actor-enumerations.h>
 #include <dali/public-api/actors/draw-mode.h>
 #include <dali/public-api/math/radian.h>
 #include <dali/public-api/actors/actor-enumerations.h>
 #include <dali/public-api/actors/draw-mode.h>
 #include <dali/public-api/math/radian.h>


@@ -50,13 +49,6 @@ struct Vector2;
 struct Vector3;
 struct Vector4;
 
 struct Vector3;
 struct Vector4;
 

-/**
- * @brief Actor container.
- */
-typedef std::vector<Actor> ActorContainer;
-typedef ActorContainer::iterator ActorIter; ///< Iterator for Dali::ActorContainer
-typedef ActorContainer::const_iterator ActorConstIter; ///< Const iterator for Dali::ActorContainer
-

 typedef Rect<float> Padding;      ///< Padding definition
 
 /**
 typedef Rect<float> Padding;      ///< Padding definition
 
 /**

diff --git a/dali/public-api/actors/custom-actor-impl.h b/dali/public-api/actors/custom-actor-impl.h
index 18803df0a0629a12694e10b00f873d42cb47883f..9f459a5359ee4cd75bee8100d6229a72afc9eeeb 100644 (file)
--- a/dali/public-api/actors/custom-actor-impl.h
+++ b/dali/public-api/actors/custom-actor-impl.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/public-api/common/vector-wrapper.h>

 #include <dali/public-api/object/property.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/actors/actor-enumerations.h>
 #include <dali/public-api/object/property.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/actors/actor-enumerations.h>

diff --git a/dali/public-api/events/hover-event.h b/dali/public-api/events/hover-event.h
index 42219af52ae368bf35d2e848fdf15a3cdba7a63d..fde089a00e20e0a160b1326cb8c61670be276292 100644 (file)
--- a/dali/public-api/events/hover-event.h
+++ b/dali/public-api/events/hover-event.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/public-api/common/vector-wrapper.h>

 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/events/touch-point.h>
 
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/events/touch-point.h>
 

diff --git a/dali/public-api/events/touch-event.h b/dali/public-api/events/touch-event.h
index d6b5465cf64696f6a1fba4e3ba4ae61566e2c0bf..e61c5ff1c0fbebd44310f536a83e8e7a13a0fb60 100644 (file)
--- a/dali/public-api/events/touch-event.h
+++ b/dali/public-api/events/touch-event.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/public-api/common/vector-wrapper.h>

 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/events/touch-point.h>
 
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/events/touch-point.h>
 

diff --git a/dali/public-api/images/buffer-image.h b/dali/public-api/images/buffer-image.h
index dbcd428349c97eafbe39a1b3b5f7ad8e44145982..51164b3c6f2b865eeede7eab19d6884267b3f508 100644 (file)
--- a/dali/public-api/images/buffer-image.h
+++ b/dali/public-api/images/buffer-image.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/public-api/common/vector-wrapper.h>

 #include <dali/public-api/images/image.h>
 #include <dali/public-api/images/pixel.h>
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/images/pixel.h>
 #include <dali/public-api/math/rect.h>

diff --git a/dali/public-api/images/nine-patch-image.h b/dali/public-api/images/nine-patch-image.h
index 16a00469fceb5bdcc3776e3faa7ac4b08de95f2b..caa2e5cbfd3ff62e7d679d8f3814deb67a7e429c 100644 (file)
--- a/dali/public-api/images/nine-patch-image.h
+++ b/dali/public-api/images/nine-patch-image.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/public-api/common/vector-wrapper.h>

 #include <dali/public-api/images/resource-image.h>
 #include <dali/public-api/images/buffer-image.h>
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/images/resource-image.h>
 #include <dali/public-api/images/buffer-image.h>
 #include <dali/public-api/math/rect.h>

diff --git a/dali/public-api/render-tasks/render-task-list.h b/dali/public-api/render-tasks/render-task-list.h
index 104dcc0c6d1acdd1b2d6bdd665792fde958b6cef..7e94f888206b1f717925d6b40d3cfaed40221e31 100644 (file)
--- a/dali/public-api/render-tasks/render-task-list.h
+++ b/dali/public-api/render-tasks/render-task-list.h
@@ -19,7 +19,6 @@
  */
 
 // INTERNAL INCLUDES
  */
 
 // INTERNAL INCLUDES

-#include <dali/public-api/common/vector-wrapper.h>

 #include <dali/public-api/object/base-handle.h>
 
 namespace Dali
 #include <dali/public-api/object/base-handle.h>
 
 namespace Dali