(ScrollView) Inlined one line Getters/Setters

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

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 365aeaa..13d4913 100644 (file)
--- 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
@@ -1,19 +1,21 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h>
 
@@ -21,13 +23,10 @@ using namespace Dali;
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 ScrollViewEffect::ScrollViewEffect()
 : mScrollViewImpl(NULL)
 {
@@ -39,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);
 
@@ -48,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);
 
@@ -60,7 +59,7 @@ Toolkit::ScrollView ScrollViewEffect::GetScrollView()
 {
   DALI_ASSERT_ALWAYS(mScrollViewImpl);
 
-  return DownCast<Toolkit::ScrollView>( mScrollViewImpl->Self() );
+  return DownCast<Toolkit::ScrollView>(mScrollViewImpl->Self());
 }
 
 } // namespace Internal