X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-page-carousel-effect-impl.cpp;h=93d41df64e283eb93155b5ddb83252ab1c429a9a;hb=refs%2Fheads%2Ftizen_3.0.2015.q1_common;hp=47406abb777cf2c5b9766f1a392213440f821cfc;hpb=a881757839b7abb008873a68c67e17b3ba39669b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp index 47406ab..93d41df 100644 --- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp +++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-carousel-effect-impl.cpp @@ -53,7 +53,7 @@ using namespace ScrollViewHelperFunctions; * When at middle of the screen the position is not altered. * When one screen away from middle the position is rotated as per expected in a 3D carousel. */ -class ScrollPageCarouselEffectInfo : public Dali::RefObject +class ScrollPageCarouselEffectInfo { public: @@ -174,8 +174,6 @@ public: const Vector2 mPositionToPageSizeRatio; ///< The page will move its position according to this ratio. }; -typedef IntrusivePtr ScrollPageCarouselEffectInfoPtr; - /** * Helper: Applies the 3D scroll cube constraints to the child actor * @@ -185,7 +183,7 @@ typedef IntrusivePtr ScrollPageCarouselEffectInfoP */ void ApplyScrollCubeConstraints(Toolkit::ScrollView scrollView, Actor child, - ScrollPageCarouselEffectInfoPtr info) + ScrollPageCarouselEffectInfo& info) { // Apply constraints to this actor // Constraint constraint; @@ -227,7 +225,7 @@ ScrollViewPageCarouselEffect::~ScrollViewPageCarouselEffect() void ScrollViewPageCarouselEffect::ApplyToPage( Actor page, const Vector2& positionToPageSizeRatio ) { - ScrollPageCarouselEffectInfoPtr info(new ScrollPageCarouselEffectInfo( positionToPageSizeRatio ) ); + ScrollPageCarouselEffectInfo info( positionToPageSizeRatio ); ApplyScrollCubeConstraints( GetScrollView(), page, info ); }