Remove handle::operator=(NULL) as it is duplicating handle.Reset() functionality...

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / scrollable / scroll-view / scroll-view-slide-effect-impl.h

diff --git a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h
index 9342092..778db0e 100644 (file)
--- a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h
+++ b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-slide-effect-impl.h
@@ -18,14 +18,17 @@
  *
  */
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/animation/alpha-functions.h>
 #include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/object/ref-object.h>
+
+// INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-slide-effect.h>
+#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 
 namespace Dali
 {
@@ -40,8 +43,6 @@ class ScrollView;
 namespace Internal
 {
 
-class ScrollViewEffect;
-
 class ScrollSlideInfo;
 
 typedef IntrusivePtr<ScrollSlideInfo> ScrollSlideInfoPtr;
@@ -185,9 +186,9 @@ private:
 
   ScrollSlideInfoPtr mScrollSlideInfo;                  ///< Info structure to keep track of common properties amongst many constraints.
   ActiveConstraint mInfoUpdateConstraint;               ///< Constraint applied to scroll-view to update Info structure.
-  Animation mAnimation;                                 ///< Animation Timer to drive the twist effect constraint.
+  Animation mAnimation;                                 ///< Animation Timer to drive the slide effect constraint.
   Animation mAnimationSnap;                             ///< Animation Snap (this animates from from 1.0 to 0.0 when contents snap)
-  Property::Index mPropertyTime;                        ///< Time property used by twist effect constraint to calculate timePassed.
+  Property::Index mPropertyTime;                        ///< Time property used by slide effect constraint to calculate timePassed.
   Property::Index mPropertyReference;                   ///< Reference point in scroll-contents, this point has no delay.
                                                         ///< The further out from this point, the further the delay.
   Property::Index mPropertyActive;                      ///< Property indicates the progress of the scrolling from 1.0f (scrolling) to 0.0f (fully snapped)