From: Kimmo Hoikka Date: Fri, 17 Oct 2014 09:19:33 +0000 (+0100) Subject: include map- and set-wrappers directly internally as they're not part of dali-core... X-Git-Tag: dali_1.0.15~6 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=db084b8c3010e7c26c67fc547fcdf08a9a20e995 include map- and set-wrappers directly internally as they're not part of dali-core.h anymore Change-Id: I92bbc1c238f6472929a0fd63aa8c4b1f5d66982d --- diff --git a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp index 7aca7ff..3baf1de 100644 --- a/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp +++ b/base/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp @@ -20,14 +20,16 @@ // EXTERNAL INCLUDES #include +#include +#include // INTERNAL INCLUDES -#include #include #include #include -using namespace std; +using std::string; +using std::set; using namespace Dali; namespace // unnamed namespace @@ -719,18 +721,16 @@ void ItemView::InsertItems( const ItemContainer& newItems, float durationSeconds mAddingItems = true; // Insert from lowest id to highest - set sortedItems; + std::set sortedItems; for( ConstItemIter iter = newItems.begin(); newItems.end() != iter; ++iter ) { sortedItems.insert( *iter ); } - for( set::iterator iter = sortedItems.begin(); sortedItems.end() != iter; ++iter ) + for( std::set::iterator iter = sortedItems.begin(); sortedItems.end() != iter; ++iter ) { Self().Add( iter->second ); - cout << "inserting item: " << iter->first << endl; - ItemPoolIter foundIter = mItemPool.find( iter->first ); if( mItemPool.end() != foundIter ) { @@ -898,7 +898,7 @@ void ItemView::RemoveActorsOutsideRange( ItemRange range ) void ItemView::AddActorsWithinRange( ItemRange range, float durationSeconds ) { - range.end = min(mItemFactory.GetNumberOfItems(), range.end); + range.end = std::min(mItemFactory.GetNumberOfItems(), range.end); // The order of addition depends on the scroll direction. if (mRefreshOrderHint) @@ -1099,7 +1099,7 @@ float ItemView::ClampFirstItemPosition(float targetPosition, const Vector3& targ { Actor self = Self(); float minLayoutPosition = layout.GetMinimumLayoutPosition(mItemFactory.GetNumberOfItems(), targetSize); - float clamppedPosition = min(0.0f, max(minLayoutPosition, targetPosition)); + float clamppedPosition = std::min(0.0f, std::max(minLayoutPosition, targetPosition)); mScrollOvershoot = targetPosition - clamppedPosition; self.SetProperty(mPropertyMinimumLayoutPosition, minLayoutPosition); @@ -1146,7 +1146,7 @@ void ItemView::OnPan(PanGesture gesture) RemoveAnimation(mScrollAnimation); - float flickAnimationDuration = Clamp( mActiveLayout->GetItemFlickAnimationDuration() * max(1.0f, fabsf(firstItemScrollPosition - GetCurrentLayoutPosition(0))) + float flickAnimationDuration = Clamp( mActiveLayout->GetItemFlickAnimationDuration() * std::max(1.0f, fabsf(firstItemScrollPosition - GetCurrentLayoutPosition(0))) , DEFAULT_MINIMUM_SWIPE_DURATION, DEFAULT_MAXIMUM_SWIPE_DURATION); mScrollAnimation = Animation::New(flickAnimationDuration); @@ -1570,7 +1570,7 @@ float ItemView::CalculateScrollOvershoot() float positionDelta = GetCurrentLayoutPosition(0) + scrollDistance; float minLayoutPosition = mActiveLayout->GetMinimumLayoutPosition(mItemFactory.GetNumberOfItems(), Self().GetCurrentSize()); self.SetProperty(mPropertyMinimumLayoutPosition, minLayoutPosition); - float clamppedPosition = min(0.0f, max(minLayoutPosition, positionDelta)); + float clamppedPosition = std::min(0.0f, std::max(minLayoutPosition, positionDelta)); overshoot = positionDelta - clamppedPosition; } diff --git a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h index a536a51..43959fd 100644 --- a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h +++ b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.h @@ -18,9 +18,11 @@ * */ -// INTERNAL INCLUDES +// EXTERNAL INCLUDES #include +#include +// INTERNAL INCLUDES #include #include #include diff --git a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h index c64d490..e56df59 100644 --- a/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h +++ b/base/dali-toolkit/internal/focus-manager/focus-manager-impl.h @@ -20,9 +20,10 @@ // EXTERNAL INCLUDES #include +#include +#include // INTERNAL INCLUDES -#include #include namespace Dali diff --git a/base/dali-toolkit/public-api/builder/builder.h b/base/dali-toolkit/public-api/builder/builder.h index b0db57e..e9c684c 100644 --- a/base/dali-toolkit/public-api/builder/builder.h +++ b/base/dali-toolkit/public-api/builder/builder.h @@ -18,8 +18,9 @@ * */ -// INTERNAL INCLUDES +// EXTERNAL INCLUDES #include +#include namespace Dali DALI_IMPORT_API { diff --git a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h index 2eebaa0..4bef6dd 100644 --- a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h +++ b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.h @@ -18,8 +18,11 @@ * */ -// INTERNAL INCLUDES +// EXTERNAL INCLUDES #include +#include + +// INTERNAL INCLUDES #include #include diff --git a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h index 2e3f856..d438a64 100644 --- a/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h +++ b/optional/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h @@ -18,8 +18,11 @@ * */ -// INTERNAL INCLUDES +// EXTERNAL INCLUDES #include +#include + +// INTERNAL INCLUDES #include #include #include diff --git a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h index 8f03f8c..db2ea12 100644 --- a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h +++ b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h @@ -18,7 +18,9 @@ * */ +// EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES #include diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.h b/optional/dali-toolkit/internal/controls/view/view-impl.h index 3531149..447bbaf 100644 --- a/optional/dali-toolkit/internal/controls/view/view-impl.h +++ b/optional/dali-toolkit/internal/controls/view/view-impl.h @@ -20,6 +20,7 @@ // EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES #include