X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fitem-view%2Fitem-view.cpp;h=69bea49807d8025c3161848d7e5b79ae8a9a2ee4;hb=HEAD;hp=1ee9b3df179e11a44d7616fd113471df1378e836;hpb=2071317d301e9d5af326a3a2efcd2996263fbead;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp
index 1ee9b3d..69bea49 100644
--- a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -15,16 +15,14 @@
  *
  */
 
-#include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
-#include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
 #include <dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
+#include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 ItemView::ItemView()
 {
 }
@@ -34,32 +32,26 @@ ItemView::ItemView(Internal::ItemView& implementation)
 {
 }
 
-ItemView::ItemView( Dali::Internal::CustomActor* internal )
+ItemView::ItemView(Dali::Internal::CustomActor* internal)
 : Scrollable(internal)
 {
   VerifyCustomActorPointer<Internal::ItemView>(internal);
 }
 
-ItemView::ItemView( const ItemView& itemView )
-: Scrollable(itemView)
-{
-}
+ItemView::ItemView(const ItemView& itemView) = default;
 
-ItemView& ItemView::operator=( const ItemView& itemView )
-{
-  if( &itemView != this )
-  {
-    Control::operator=( itemView );
-  }
-  return *this;
-}
+ItemView::ItemView(ItemView&& rhs) noexcept = default;
+
+ItemView& ItemView::operator=(const ItemView& itemView) = default;
+
+ItemView& ItemView::operator=(ItemView&& rhs) noexcept = default;
 
 ItemView ItemView::New(ItemFactory& factory)
 {
   return Internal::ItemView::New(factory);
 }
 
-ItemView ItemView::DownCast( BaseHandle handle )
+ItemView ItemView::DownCast(BaseHandle handle)
 {
   return Control::DownCast<ItemView, Internal::ItemView>(handle);
 }
@@ -128,14 +120,14 @@ float ItemView::GetMinimumSwipeDistance() const
   return GetImpl(*this).GetMinimumSwipeDistance();
 }
 
-void ItemView::SetMouseWheelScrollDistanceStep(float step)
+void ItemView::SetWheelScrollDistanceStep(float step)
 {
-  GetImpl(*this).SetMouseWheelScrollDistanceStep(step);
+  GetImpl(*this).SetWheelScrollDistanceStep(step);
 }
 
-float ItemView::GetMouseWheelScrollDistanceStep() const
+float ItemView::GetWheelScrollDistanceStep() const
 {
-  return GetImpl(*this).GetMouseWheelScrollDistanceStep();
+  return GetImpl(*this).GetWheelScrollDistanceStep();
 }
 
 void ItemView::SetAnchoring(bool enabled)
@@ -190,37 +182,37 @@ unsigned int ItemView::GetItemId(Actor actor) const
 
 void ItemView::InsertItem(Item newItem, float durationSeconds)
 {
-  GetImpl(*this).InsertItem( newItem, durationSeconds );
+  GetImpl(*this).InsertItem(newItem, durationSeconds);
 }
 
 void ItemView::InsertItems(const ItemContainer& newItems, float durationSeconds)
 {
-  GetImpl(*this).InsertItems( newItems, durationSeconds );
+  GetImpl(*this).InsertItems(newItems, durationSeconds);
 }
 
 void ItemView::RemoveItem(unsigned int itemId, float durationSeconds)
 {
-  GetImpl(*this).RemoveItem( itemId, durationSeconds );
+  GetImpl(*this).RemoveItem(itemId, durationSeconds);
 }
 
 void ItemView::RemoveItems(const ItemIdContainer& itemIds, float durationSeconds)
 {
-  GetImpl(*this).RemoveItems( itemIds, durationSeconds );
+  GetImpl(*this).RemoveItems(itemIds, durationSeconds);
 }
 
 void ItemView::ReplaceItem(Item replacementItem, float durationSeconds)
 {
-  GetImpl(*this).ReplaceItem( replacementItem, durationSeconds );
+  GetImpl(*this).ReplaceItem(replacementItem, durationSeconds);
 }
 
 void ItemView::ReplaceItems(const ItemContainer& replacementItems, float durationSeconds)
 {
-  GetImpl(*this).ReplaceItems( replacementItems, durationSeconds );
+  GetImpl(*this).ReplaceItems(replacementItems, durationSeconds);
 }
 
-void ItemView::SetItemsParentOrigin( const Vector3& parentOrigin )
+void ItemView::SetItemsParentOrigin(const Vector3& parentOrigin)
 {
-  GetImpl(*this).SetItemsParentOrigin( parentOrigin );
+  GetImpl(*this).SetItemsParentOrigin(parentOrigin);
 }
 
 Vector3 ItemView::GetItemsParentOrigin() const
@@ -228,7 +220,7 @@ Vector3 ItemView::GetItemsParentOrigin() const
   return GetImpl(*this).GetItemsParentOrigin();
 }
 
-void ItemView::SetItemsAnchorPoint( const Vector3& anchorPoint )
+void ItemView::SetItemsAnchorPoint(const Vector3& anchorPoint)
 {
   GetImpl(*this).SetItemsAnchorPoint(anchorPoint);
 }
@@ -243,6 +235,11 @@ void ItemView::GetItemsRange(ItemRange& range)
   GetImpl(*this).GetItemsRange(range);
 }
 
+ItemView::LayoutActivatedSignalType& ItemView::LayoutActivatedSignal()
+{
+  return GetImpl(*this).LayoutActivatedSignal();
+}
+
 } // namespace Toolkit
 
 } // namespace Dali