X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-impl.cpp;h=a6c74b0bb3253f3a6d3f6862fbc301cf52f04d73;hb=refs%2Fchanges%2F28%2F38928%2F2;hp=82a502f9df2e733832739f310b695d44ef4c538b;hpb=306d2f61a1b64179e801fa8a0bb2bd7b4e9dd682;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/builder/builder-impl.cpp b/dali-toolkit/internal/builder/builder-impl.cpp index 82a502f..a6c74b0 100644 --- a/dali-toolkit/internal/builder/builder-impl.cpp +++ b/dali-toolkit/internal/builder/builder-impl.cpp @@ -22,10 +22,16 @@ #include #include #include - -// INTERNAL INCLUDES +#include +#include +#include +#include +#include +#include +#include #include +// INTERNAL INCLUDES #include #include @@ -272,7 +278,7 @@ void Builder::SetProperties( const TreeNode& node, Handle& handle, const Replace // special field 'effect' references the shader effect instances if(key == "effect") { - RenderableActor actor = RenderableActor::DownCast(handle); + ImageActor actor = ImageActor::DownCast(handle); if( actor ) { OptionalString str = constant.IsString( keyChild.second ); @@ -292,11 +298,11 @@ 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 ) { - RenderableActor actor = RenderableActor::DownCast(handle); + ImageActor actor = ImageActor::DownCast(handle); if( actor ) { if( ShaderEffect effect = actor.GetShaderEffect() ) @@ -769,7 +775,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 +783,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::CONTROL_POINTS, points); } } else