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 "Const correctness improvements for Property::Value." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
tooltip
/
tooltip.cpp
diff --git
a/dali-toolkit/internal/controls/tooltip/tooltip.cpp
b/dali-toolkit/internal/controls/tooltip/tooltip.cpp
index
80a558e
..
e7f8b9f
100644
(file)
--- a/
dali-toolkit/internal/controls/tooltip/tooltip.cpp
+++ b/
dali-toolkit/internal/controls/tooltip/tooltip.cpp
@@
-85,7
+85,7
@@
void Tooltip::SetProperties( const Property::Value& value )
Toolkit::Control control = mControl.GetHandle();
if( control )
{
Toolkit::Control control = mControl.GetHandle();
if( control )
{
- Property::Map* properties = value.GetMap();
+
const
Property::Map* properties = value.GetMap();
if( properties )
{
const Property::Map::SizeType count = properties->Count();
if( properties )
{
const Property::Map::SizeType count = properties->Count();
@@
-229,7
+229,7
@@
void Tooltip::SetContent( Toolkit::Control& control, const Property::Value& valu
Property::Type type = value.GetType();
if( type == Property::MAP )
{
Property::Type type = value.GetType();
if( type == Property::MAP )
{
- Property::Map* map = value.GetMap();
+
const
Property::Map* map = value.GetMap();
if( map )
{
mContentTextVisual.Merge( *map );
if( map )
{
mContentTextVisual.Merge( *map );
@@
-302,7
+302,7
@@
void Tooltip::SetBackground( const Property::Value& value )
}
else if( type == Property::MAP )
{
}
else if( type == Property::MAP )
{
- Property::Map* map = value.GetMap();
+
const
Property::Map* map = value.GetMap();
if( map )
{
const Property::Map::SizeType count = map->Count();
if( map )
{
const Property::Map::SizeType count = map->Count();