[dali_1.9.23] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / scrollable / item-view / item-layout.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
index a9f2769..04297dd 100755 (executable)
--- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -25,7 +25,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
-#include <dali-toolkit/devel-api/controls/scrollable/item-view/default-item-layout-property.h>
+#include <dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout-property.h>
 
 namespace Dali
 {
@@ -38,7 +38,6 @@ struct ItemLayout::Impl
   Vector3 mItemSize;                              ///< The size of an item in the layout
   ControlOrientation::Type mOrientation;          ///< the orientation of the layout.
   Property::Map mProperties;
-  bool mHasLayoutChanged;
 };
 
 ItemLayout::ItemLayout()
@@ -156,7 +155,6 @@ void ItemLayout::SetLayoutProperties(const Property::Map& properties)
       }
     }
   }
-  mImpl->mHasLayoutChanged = true;
   mImpl->mProperties = properties;
 }
 
@@ -165,16 +163,6 @@ Property::Map ItemLayout::GetLayoutProperties()
   return mImpl->mProperties;
 }
 
-bool ItemLayout::HasLayoutChanged()
-{
-  return mImpl->mHasLayoutChanged;
-}
-
-void ItemLayout::ResetLayoutChangedFlag()
-{
-  mImpl->mHasLayoutChanged = false;
-}
-
 } // namespace Toolkit
 
 } // namespace Dali