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
[dali_1.9.14] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
control
/
control-debug.cpp
diff --git
a/dali-toolkit/internal/controls/control/control-debug.cpp
b/dali-toolkit/internal/controls/control/control-debug.cpp
index
a359dee
..
8afaa03
100644
(file)
--- a/
dali-toolkit/internal/controls/control/control-debug.cpp
+++ b/
dali-toolkit/internal/controls/control/control-debug.cpp
@@
-287,7
+287,7
@@
std::string DumpControl( const Internal::Control& control )
std::ostringstream oss;
oss << "{\n ";
std::ostringstream oss;
oss << "{\n ";
- const std::string& name = control.Self().Get
Name(
);
+ const std::string& name = control.Self().Get
Property< std::string >( Dali::Actor::Property::NAME
);
if( ! name.empty() )
{
oss << "\"name\":\"" << name << "\",\n";
if( ! name.empty() )
{
oss << "\"name\":\"" << name << "\",\n";
@@
-306,7
+306,7
@@
std::string DumpActor( Actor actor )
{
std::ostringstream oss;
oss << "{\n ";
{
std::ostringstream oss;
oss << "{\n ";
- const std::string& name = actor.Get
Name(
);
+ const std::string& name = actor.Get
Property< std::string >( Dali::Actor::Property::NAME
);
if( ! name.empty() )
{
oss << "\"name\":\"" << name << "\",\n";
if( ! name.empty() )
{
oss << "\"name\":\"" << name << "\",\n";