X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-impl.cpp;h=1bd65a8adeac87f3c250f6ca679b2d40384090d5;hp=82a502f9df2e733832739f310b695d44ef4c538b;hb=b0161740d01e7dab764177a807512faa104149e9;hpb=2ddfbb9e23a7c3fc30e604236c41e0ef6d2ed6a2

diff --git a/dali-toolkit/internal/builder/builder-impl.cpp b/dali-toolkit/internal/builder/builder-impl.cpp
index 82a502f..1bd65a8 100644
--- a/dali-toolkit/internal/builder/builder-impl.cpp
+++ b/dali-toolkit/internal/builder/builder-impl.cpp
@@ -23,9 +23,10 @@
 #include <boost/function.hpp>
 #include <sstream>
 
-// INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 
+// INTERNAL INCLUDES
+
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/builder/json-parser.h>
 
@@ -292,7 +293,7 @@ void Builder::SetProperties( const TreeNode& node, Handle& handle, const Replace
 
       Handle propertyObject( handle );
 
-      Property::Index index = propertyObject.GetPropertyIndex( key );
+      Dali::Property::Index index = propertyObject.GetPropertyIndex( key );
 
       if( Property::INVALID_INDEX == index )
       {
@@ -769,7 +770,7 @@ Path Builder::GetPath( const std::string& name )
           if( SetPropertyFromNode( *pointsProperty, Property::ARRAY, points ) )
           {
             ret = Path::New();
-            ret.SetProperty( Path::POINTS, points);
+            ret.SetProperty( Path::Property::Points, points);
 
             //control-points property
             if( OptionalChild pointsProperty = IsChild( *path, "control-points") )
@@ -777,7 +778,7 @@ Path Builder::GetPath( const std::string& name )
               Dali::Property::Value points(Property::ARRAY);
               if( SetPropertyFromNode( *pointsProperty, Property::ARRAY, points ) )
               {
-                ret.SetProperty( Path::CONTROL_POINTS, points);
+                ret.SetProperty( Path::Property::ControlPoints, points);
               }
             }
             else