diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp index 8175c94..d647b67 100644 --- a/demo/dali-table-view.cpp +++ b/demo/dali-table-view.cpp @@ -348,7 +348,7 @@ void DaliTableView::Initialize( Application& application ) void DaliTableView::ApplyCubeEffectToActors() { - for( ActorIter pageIter = mPages.begin(); pageIter != mPages.end(); ++pageIter ) + for( std::vector< Actor >::iterator pageIter = mPages.begin(); pageIter != mPages.end(); ++pageIter ) { Actor page = *pageIter; diff --git a/demo/dali-table-view.h b/demo/dali-table-view.h index 05640ef..b19ac5d 100644 --- a/demo/dali-table-view.h +++ b/demo/dali-table-view.h @@ -410,9 +410,9 @@ private: Dali::Toolkit::Popup mVersionPopup; ///< Displays DALi library version information Dali::Vector3 mButtonsPageRelativeSize; ///< Size of a buttons page relative to the stage size - Dali::ActorContainer mPages; ///< List of pages. - Dali::ActorContainer mTableViewImages; ///< Offscreen render of tableview - Dali::ActorContainer mBackgroundActors; ///< List of background actors used in the effect + std::vector< Dali::Actor > mPages; ///< List of pages. + std::vector< Dali::Actor > mTableViewImages; ///< Offscreen render of tableview + std::vector< Dali::Actor > mBackgroundActors; ///< List of background actors used in the effect AnimationList mBackgroundAnimations; ///< List of background bubble animations ExampleList mExampleList; ///< List of examples. ExampleMap mExampleMap; ///< Map LUT for examples. diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp index da7a64b..a745b7d 100644 --- a/examples/scroll-view/scroll-view-example.cpp +++ b/examples/scroll-view/scroll-view-example.cpp @@ -275,7 +275,7 @@ private: // apply new Effect to ScrollView ApplyEffectToScrollView(); - for(ActorIter pageIter = mPages.begin(); pageIter != mPages.end(); ++pageIter) + for( std::vector< Actor >::iterator pageIter = mPages.begin(); pageIter != mPages.end(); ++pageIter) { Actor page = *pageIter; ApplyEffectToPage( page ); @@ -666,7 +666,7 @@ private: ScrollView mScrollView; ///< ScrollView UI Component bool mScrolling; ///< ScrollView scrolling state (true = scrolling, false = stationary) ScrollViewEffect mScrollViewEffect; ///< ScrollView Effect instance. - ActorContainer mPages; ///< Keeps track of all the pages for applying effects. + std::vector< Actor > mPages; ///< Keeps track of all the pages for applying effects. /** * Enumeration of different effects this scrollview can operate under.