X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-carousel-effect-impl.cpp;h=fd352cb71654ead35bd784cf574c618eea3916e0;hb=refs%2Fheads%2Ftizen_3.0.2015.q1_common;hp=87e9a581a378fec8225863bf519da1926b3e4e9b;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp index 87e9a58..fd352cb 100644 --- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp +++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp @@ -63,7 +63,7 @@ Property::Index SafeRegisterProperty( Handle& handle, const std::string& name, P * move the Actor's edge visually away from the neighboring actor, as they rotate * around their default anchor point. */ -class ScrollCarouselEffectInfo : public Dali::RefObject +class ScrollCarouselEffectInfo { public: @@ -212,8 +212,6 @@ public: Vector2 mVisibilityThreshold; ///< Threshold for when to to switch off visibility of Actor (for performance) }; -typedef IntrusivePtr ScrollCarouselEffectInfoPtr; - /** * Helper: Applies the 3D scroll carousel constraints to the child actor * @@ -223,7 +221,7 @@ typedef IntrusivePtr ScrollCarouselEffectInfoPtr; */ void ApplyScrollCarouselConstraints(Toolkit::ScrollView scrollView, Actor child, - ScrollCarouselEffectInfoPtr info) + ScrollCarouselEffectInfo& info) { // Apply constraints to this actor // Constraint constraint; @@ -284,7 +282,7 @@ ScrollViewCarouselEffect::~ScrollViewCarouselEffect() void ScrollViewCarouselEffect::ApplyToActor(Actor child, const Vector2& angleSwing) { - ScrollCarouselEffectInfoPtr info(new ScrollCarouselEffectInfo(angleSwing)); + ScrollCarouselEffectInfo info( angleSwing ); ApplyScrollCarouselConstraints( GetScrollView(), child, info ); }