projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/tizen' into new_text
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
builder-impl.cpp
diff --git
a/dali-toolkit/internal/builder/builder-impl.cpp
b/dali-toolkit/internal/builder/builder-impl.cpp
index
82a502f
..
1bd65a8
100644
(file)
--- 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>
#include <boost/function.hpp>
#include <sstream>
-// INTERNAL INCLUDES
#include <dali/integration-api/debug.h>
#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>
#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 );
Handle propertyObject( handle );
- Property::Index index = propertyObject.GetPropertyIndex( key );
+
Dali::
Property::Index index = propertyObject.GetPropertyIndex( key );
if( Property::INVALID_INDEX == index )
{
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();
if( SetPropertyFromNode( *pointsProperty, Property::ARRAY, points ) )
{
ret = Path::New();
- ret.SetProperty( Path::P
OINTS
, points);
+ ret.SetProperty( Path::P
roperty::Points
, points);
//control-points property
if( OptionalChild pointsProperty = IsChild( *path, "control-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 ) )
{
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
}
}
else