Peter M. Groen / dali-demo

Commit 1353cb1368fa44ab6d3c284ac697f1620892f7fa

Authored by Nick Holland
1 parent b783a0f7

Removed use of ActorContainer 

Change-Id: I185bf4da3387871dd264444d91328879c72cb319
Inline Side-by-side
Showing 3 changed files with 6 additions and 6 deletions
demo/dali-table-view.cpp
  View file @1353cb1
@@ -348,7 +348,7 @@ void DaliTableView::Initialize( Application& application ) @@ -348,7 +348,7 @@ void DaliTableView::Initialize( Application& application )
348 348
349 void DaliTableView::ApplyCubeEffectToActors() 349 void DaliTableView::ApplyCubeEffectToActors()
350 { 350 {
351 - for( ActorIter pageIter = mPages.begin(); pageIter != mPages.end(); ++pageIter ) 351 + for( std::vector< Actor >::iterator pageIter = mPages.begin(); pageIter != mPages.end(); ++pageIter )
352 { 352 {
353 Actor page = *pageIter; 353 Actor page = *pageIter;
354 354
demo/dali-table-view.h
  View file @1353cb1
@@ -410,9 +410,9 @@ private: @@ -410,9 +410,9 @@ private:
410 Dali::Toolkit::Popup mVersionPopup; ///< Displays DALi library version information 410 Dali::Toolkit::Popup mVersionPopup; ///< Displays DALi library version information
411 Dali::Vector3 mButtonsPageRelativeSize; ///< Size of a buttons page relative to the stage size 411 Dali::Vector3 mButtonsPageRelativeSize; ///< Size of a buttons page relative to the stage size
412 412
413 - Dali::ActorContainer mPages; ///< List of pages.  
414 - Dali::ActorContainer mTableViewImages; ///< Offscreen render of tableview  
415 - Dali::ActorContainer mBackgroundActors; ///< List of background actors used in the effect 413 + std::vector< Dali::Actor > mPages; ///< List of pages.
  414 + std::vector< Dali::Actor > mTableViewImages; ///< Offscreen render of tableview
  415 + std::vector< Dali::Actor > mBackgroundActors; ///< List of background actors used in the effect
416 AnimationList mBackgroundAnimations; ///< List of background bubble animations 416 AnimationList mBackgroundAnimations; ///< List of background bubble animations
417 ExampleList mExampleList; ///< List of examples. 417 ExampleList mExampleList; ///< List of examples.
418 ExampleMap mExampleMap; ///< Map LUT for examples. 418 ExampleMap mExampleMap; ///< Map LUT for examples.
examples/scroll-view/scroll-view-example.cpp
  View file @1353cb1
@@ -275,7 +275,7 @@ private: @@ -275,7 +275,7 @@ private:
275 // apply new Effect to ScrollView 275 // apply new Effect to ScrollView
276 ApplyEffectToScrollView(); 276 ApplyEffectToScrollView();
277 277
278 - for(ActorIter pageIter = mPages.begin(); pageIter != mPages.end(); ++pageIter) 278 + for( std::vector< Actor >::iterator pageIter = mPages.begin(); pageIter != mPages.end(); ++pageIter)
279 { 279 {
280 Actor page = *pageIter; 280 Actor page = *pageIter;
281 ApplyEffectToPage( page ); 281 ApplyEffectToPage( page );
@@ -666,7 +666,7 @@ private: @@ -666,7 +666,7 @@ private:
666 ScrollView mScrollView; ///< ScrollView UI Component 666 ScrollView mScrollView; ///< ScrollView UI Component
667 bool mScrolling; ///< ScrollView scrolling state (true = scrolling, false = stationary) 667 bool mScrolling; ///< ScrollView scrolling state (true = scrolling, false = stationary)
668 ScrollViewEffect mScrollViewEffect; ///< ScrollView Effect instance. 668 ScrollViewEffect mScrollViewEffect; ///< ScrollView Effect instance.
669 - ActorContainer mPages; ///< Keeps track of all the pages for applying effects. 669 + std::vector< Actor > mPages; ///< Keeps track of all the pages for applying effects.
670 670
671 /** 671 /**
672 * Enumeration of different effects this scrollview can operate under. 672 * Enumeration of different effects this scrollview can operate under.