From: Nick Holland Date: Tue, 12 May 2015 17:24:26 +0000 (+0100) Subject: Remove use of ActorContainer X-Git-Tag: accepted/tizen/common/20150529.134100~39 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=37d51e563d75f5f88f4db7d662eb85ce3df9ad55 Remove use of ActorContainer Also removed some unnecessary includes of from public-api files Change-Id: I226fc94568e73231ad52e7db52b12328688e8881 --- diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp index 1b6f1c6..1c8d494 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp @@ -96,7 +96,8 @@ static bool gOnScrollUpdateCalled; ///< Whether the OnScrol static bool gOnScrollCompleteCalled; ///< Whether the OnScrollComplete signal was invoked. static Vector3 gConstraintResult; ///< Result from constraint. -static ActorContainer gPages; ///< Keeps track of all the pages for applying effects. +static std::vector< Actor > gPages; ///< Keeps track of all the pages for applying effects. +typedef std::vector< Actor >::iterator ActorIter; static void ResetScrollCallbackResults() { diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp index 43ff434..7632f79 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp @@ -641,7 +641,7 @@ void PushButton::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type d void PushButton::ConfigureSizeNegotiation() { - ActorContainer images; + std::vector< Actor > images; images.reserve( 7 ); images.push_back( GetButtonImage() ); @@ -679,7 +679,7 @@ void PushButton::ConfigureSizeNegotiation() } } -void PushButton::ConfigureSizeNegotiationDimension( Dimension::Type dimension, const ActorContainer& images, Actor& label ) +void PushButton::ConfigureSizeNegotiationDimension( Dimension::Type dimension, const std::vector< Actor >& images, Actor& label ) { ResizePolicy::Type imageResizePolicy = ResizePolicy::FILL_TO_PARENT; ResizePolicy::Type labelResizePolicy = ResizePolicy::FILL_TO_PARENT; @@ -714,7 +714,7 @@ void PushButton::ConfigureSizeNegotiationDimension( Dimension::Type dimension, c label.SetResizePolicy( labelResizePolicy, dimension ); } - for( ActorConstIter it = images.begin(), itEnd = images.end(); it != itEnd; ++it ) + for( std::vector< Actor >::const_iterator it = images.begin(), itEnd = images.end(); it != itEnd; ++it ) { Actor actor = *it; if( actor ) diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.h b/dali-toolkit/internal/controls/buttons/push-button-impl.h index 7a23474..6aa58e1 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.h @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include #include // INTERNAL INCLUDES @@ -189,7 +189,7 @@ private: * @param[in] images The list of images to configure * @param[in] label The text label to configure */ - void ConfigureSizeNegotiationDimension( Dimension::Type dimension, const ActorContainer& images, Actor& label ); + void ConfigureSizeNegotiationDimension( Dimension::Type dimension, const std::vector< Actor >& images, Actor& label ); // slots diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp index 4ba3a03..188e185 100755 --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -646,7 +646,7 @@ void Popup::OnRelayout( const Vector2& size, RelayoutContainer& container ) mBackgroundImage.SetVisible( !( mButtons.empty() && mPopupLayout.GetChildCount() == 0 ) ); // Relayout All buttons - if ( !mButtons.empty() ) + if( !mButtons.empty() ) { // All buttons should be the same size and fill the button area. The button spacing needs to be accounted for as well. Vector2 buttonSize( ( ( size.width - mPopupStyle->buttonSpacing * ( mButtons.size() + 1 ) ) / mButtons.size() ), @@ -654,7 +654,7 @@ void Popup::OnRelayout( const Vector2& size, RelayoutContainer& container ) Vector3 buttonPosition( mPopupStyle->buttonSpacing, 0.0f, 0.0f ); - for ( ActorIter iter = mButtons.begin(), endIter = mButtons.end(); + for( std::vector< Actor >::iterator iter = mButtons.begin(), endIter = mButtons.end(); iter != endIter; ++iter, buttonPosition.x += mPopupStyle->buttonSpacing + buttonSize.width ) { @@ -832,7 +832,7 @@ Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::C else { // Rebuild the focus chain because button or content can be added or removed dynamically - ActorContainer focusableActors; + std::vector< Actor > focusableActors; if( mContent && mContent.IsKeyboardFocusable() ) { focusableActors.push_back(mContent); @@ -846,7 +846,7 @@ Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::C } } - for ( ActorContainer::iterator iter = focusableActors.begin(), end = focusableActors.end(); iter != end; ++iter ) + for( std::vector< Actor >::iterator iter = focusableActors.begin(), end = focusableActors.end(); iter != end; ++iter ) { if ( currentFocusedActor == *iter ) { diff --git a/dali-toolkit/internal/controls/popup/popup-impl.h b/dali-toolkit/internal/controls/popup/popup-impl.h index 9c67474..2d36e68 100755 --- a/dali-toolkit/internal/controls/popup/popup-impl.h +++ b/dali-toolkit/internal/controls/popup/popup-impl.h @@ -321,7 +321,7 @@ private: Actor mBottomBg; ///< bottom button bar background. ImageActor is replaced with Actor due to hidden image. Actor mTailImage; ///< Stores the tail image - ActorContainer mButtons; ///< Keeps track of the buttons added to this popup. + std::vector< Actor > mButtons; ///< Keeps track of the buttons added to this popup. Toolkit::Popup::PopupState mState; ///< Popup current state. Animation mAnimation; ///< The animation instance managing state changing. bool mAlterAddedChild; ///< Flag used to control whether children are reparented or not. diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h index 7c41d1f..5dffafd 100644 --- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h +++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h @@ -556,7 +556,7 @@ private: ItemPool mItemPool; - ItemLayoutContainer mLayouts; + std::vector< ItemLayoutPtr > mLayouts; ///< Container of Dali::Toolkit::ItemLayout objects ItemLayout* mActiveLayout; Vector3 mActiveLayoutTargetSize; diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h index f4d211b..51e5d59 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h @@ -90,6 +90,11 @@ public: static const unsigned int SCROLL_ANIMATION_FLAGS = AnimatingInternalX | AnimatingInternalY; static const unsigned int SNAP_ANIMATION_FLAGS = SnappingInternalX | SnappingInternalY; +private: + + typedef std::vector ScrollViewEffectContainer; ///< Container of Dali::Toolkit::ScrollViewEffect + typedef ScrollViewEffectContainer::iterator ScrollViewEffectIter; ///< Iterator for Dali::Toolkit::ScrollViewEffectContainer + public: /** diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h index 0fafab0..d1efb7d 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h +++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h @@ -303,7 +303,7 @@ protected: unsigned int mNumRows; unsigned int mNumColumns; Size mViewAreaSize; - ActorContainer mBoxes; + std::vector< Actor > mBoxes; std::vector< ImageActor > mTiles[2]; int mRotateIndex; Size mTileSize; diff --git a/dali-toolkit/public-api/controls/bloom-view/bloom-view.h b/dali-toolkit/public-api/controls/bloom-view/bloom-view.h index 51c3ab1..0d37cea 100644 --- a/dali-toolkit/public-api/controls/bloom-view/bloom-view.h +++ b/dali-toolkit/public-api/controls/bloom-view/bloom-view.h @@ -165,7 +165,6 @@ public: * @param [in] child The child. * @post The child will be referenced by its parent. This means that the child will be kept alive, * even if the handle passed into this method is reset or destroyed. - * @post This may invalidate ActorContainer iterators. */ void Add(Actor child); @@ -175,7 +174,6 @@ public: * @pre This Actor (the parent) has been initialized. * @pre The child actor is not the same as the parent actor. * @param [in] child The child. - * @post This may invalidate ActorContainer iterators. */ void Remove(Actor child); diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index 35e679f..1cbf04f 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -20,7 +20,6 @@ // EXTERNAL INCLUDES #include -#include #include #include #include diff --git a/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h b/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h index ed3f117..e6a32b8 100644 --- a/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h +++ b/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h @@ -181,7 +181,6 @@ public: * @param [in] child The child. * @post The child will be referenced by its parent. This means that the child will be kept alive, * even if the handle passed into this method is reset or destroyed. - * @post This may invalidate ActorContainer iterators. */ void Add(Actor child); @@ -191,7 +190,6 @@ public: * @pre This Actor (the parent) has been initialized. * @pre The child actor is not the same as the parent actor. * @param [in] child The child. - * @post This may invalidate ActorContainer iterators. */ void Remove(Actor child); diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h index 169ad2b..6b829ce 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h @@ -21,7 +21,6 @@ // EXTERNAL INCLUDES #include #include -#include // INTERNAL INCLUDES #include @@ -37,11 +36,6 @@ class ItemLayout; typedef IntrusivePtr ItemLayoutPtr; ///< Pointer to a Dali::Toolkit::ItemLayout object -typedef std::vector ItemLayoutContainer; ///< Container of Dali::Toolkit::ItemLayout objects -typedef ItemLayoutContainer::iterator ItemLayoutIter; ///< Iterator for Dali::Toolkit::ItemLayoutContainer -typedef ItemLayoutContainer::const_iterator ItemLayoutConstIter; ///< Const Iterator for Dali::Toolkit::ItemLayoutContainer - - /** * @brief A support class for managing ranges of items. */ diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h index 3b2fb13..1295861 100644 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h @@ -19,7 +19,6 @@ */ // EXTERNAL INCLUDES -#include #include namespace Dali @@ -42,10 +41,6 @@ class ScrollViewWobbleEffect; class ScrollView; class ScrollViewEffect; -typedef std::vector ScrollViewEffectContainer; ///< Container of Dali::Toolkit::ScrollViewEffect%s -typedef ScrollViewEffectContainer::iterator ScrollViewEffectIter; ///< Iterator for Dali::Toolkit::ScrollViewEffectContainer -typedef ScrollViewEffectContainer::const_iterator ScrollViewEffectConstIter; ///< Const Iterator for Dali::Toolkit::ScrollViewEffectContainer - /** * @brief ScrollView Effect base class, used to apply custom effects to a * ScrollView instance. diff --git a/dali-toolkit/public-api/controls/shadow-view/shadow-view.h b/dali-toolkit/public-api/controls/shadow-view/shadow-view.h index f9142fe..63bb089 100644 --- a/dali-toolkit/public-api/controls/shadow-view/shadow-view.h +++ b/dali-toolkit/public-api/controls/shadow-view/shadow-view.h @@ -165,7 +165,6 @@ public: * @param [in] child The child. * @post The child will be referenced by its parent. This means that the child will be kept alive, * even if the handle passed into this method is reset or destroyed. - * @post This may invalidate ActorContainer iterators. */ void Add(Actor child); @@ -175,7 +174,6 @@ public: * @pre This Actor (the parent) has been initialized. * @pre The child actor is not the same as the parent actor. * @param [in] child The child. - * @post This may invalidate ActorContainer iterators. */ void Remove(Actor child);