X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fitem-view%2Fgrid-layout.cpp;h=435cbf3eae3ad8210759a1ec78803d2a0dc93932;hb=cfe61a5ac2e18dbabb7eec04d16bd39722b44672;hp=d362f05a485dc47cc349646fbc15710167be9adb;hpb=fb0d31619217589b3da2a9bea27a4adad9d7380a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp
index d362f05..435cbf3 100755
--- a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp
+++ b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 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>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -596,7 +596,7 @@ void GridLayout::ApplyConstraints( Actor& actor, const int itemId, const Vector3
 
     // Color constraint
     constraint = Constraint::New< Vector4 >( actor, Actor::Property::COLOR, &GridColorConstraint );
-    constraint.SetRemoveAction( Dali::Constraint::Discard );
+    constraint.SetRemoveAction( Dali::Constraint::DISCARD );
     constraint.Apply();
 
     // Visibility constraint
@@ -617,7 +617,7 @@ void GridLayout::ApplyConstraints( Actor& actor, const int itemId, const Vector3
     }
     constraint.AddSource( ParentSource( Toolkit::ItemView::Property::LAYOUT_POSITION ) );
     constraint.AddSource( ParentSource( Actor::Property::SIZE ) );
-    constraint.SetRemoveAction( Dali::Constraint::Discard );
+    constraint.SetRemoveAction( Dali::Constraint::DISCARD );
     constraint.Apply();
   }
 }