X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-effect-impl.cpp;h=13d49133efc56c9c59cb93e0cf3cbc45fd37aae2;hp=fa4d89c648af4605f331b74bbdc13ce930b40e02;hb=f2039d47f9bed8104575da80a2ecf0bb6e37ff8d;hpb=306d2f61a1b64179e801fa8a0bb2bd7b4e9dd682 diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp index fa4d89c..13d4913 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.cpp @@ -15,6 +15,7 @@ * */ +// INTERNAL INCLUDES #include #include @@ -22,13 +23,10 @@ using namespace Dali; namespace Dali { - namespace Toolkit { - namespace Internal { - ScrollViewEffect::ScrollViewEffect() : mScrollViewImpl(NULL) { @@ -40,7 +38,7 @@ ScrollViewEffect::~ScrollViewEffect() void ScrollViewEffect::Attach(Toolkit::ScrollView& scrollView) { - DALI_ASSERT_ALWAYS( (!mScrollViewImpl) && "Already attached to a ScrollView" ); + DALI_ASSERT_ALWAYS((!mScrollViewImpl) && "Already attached to a ScrollView"); mScrollViewImpl = &GetImpl(scrollView); @@ -49,8 +47,8 @@ void ScrollViewEffect::Attach(Toolkit::ScrollView& scrollView) void ScrollViewEffect::Detach(Toolkit::ScrollView& scrollView) { - DALI_ASSERT_ALWAYS( (mScrollViewImpl) && "Already detached from ScrollView" ); - DALI_ASSERT_ALWAYS( (&GetImpl(scrollView) == mScrollViewImpl) && "Effect attached to a different ScrollView"); + DALI_ASSERT_ALWAYS((mScrollViewImpl) && "Already detached from ScrollView"); + DALI_ASSERT_ALWAYS((&GetImpl(scrollView) == mScrollViewImpl) && "Effect attached to a different ScrollView"); OnDetach(scrollView); @@ -61,7 +59,7 @@ Toolkit::ScrollView ScrollViewEffect::GetScrollView() { DALI_ASSERT_ALWAYS(mScrollViewImpl); - return DownCast( mScrollViewImpl->Self() ); + return DownCast(mScrollViewImpl->Self()); } } // namespace Internal