projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
36a2987
)
Updates required for https://review.tizen.org/gerrit/#/c/41602/
03/41603/1
author
Kimmo Hoikka
<kimmo.hoikka@samsung.com>
Tue, 16 Jun 2015 14:30:50 +0000
(15:30 +0100)
committer
Kimmo Hoikka
<kimmo.hoikka@samsung.com>
Tue, 16 Jun 2015 14:30:50 +0000
(15:30 +0100)
Change-Id: Id188e5221ac0d54516fbe9c2730a9b0529acd923
dali-toolkit/internal/builder/builder-impl.cpp
patch
|
blob
|
history
dali-toolkit/internal/builder/builder-set-property.cpp
patch
|
blob
|
history
plugins/dali-script-v8/src/object/property-value-wrapper.cpp
patch
|
blob
|
history
diff --git
a/dali-toolkit/internal/builder/builder-impl.cpp
b/dali-toolkit/internal/builder/builder-impl.cpp
index
ca264ab
..
ea0b15a
100644
(file)
--- a/
dali-toolkit/internal/builder/builder-impl.cpp
+++ b/
dali-toolkit/internal/builder/builder-impl.cpp
@@
-176,11
+176,6
@@
std::string PropertyValueToString( const Property::Value& value )
ret = std::string("Map Size=") + ToString( value.Get<Property::Map>().Count() );
break;
}
- case Property::TYPE_COUNT:
- {
- ret = "";
- break;
- }
}
return ret;
diff --git
a/dali-toolkit/internal/builder/builder-set-property.cpp
b/dali-toolkit/internal/builder/builder-set-property.cpp
index
d1ce450
..
77fa1f4
100644
(file)
--- a/
dali-toolkit/internal/builder/builder-set-property.cpp
+++ b/
dali-toolkit/internal/builder/builder-set-property.cpp
@@
-409,7
+409,6
@@
bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Property::V
}
break;
}
- case Property::TYPE_COUNT:
case Property::NONE:
{
break;
diff --git
a/plugins/dali-script-v8/src/object/property-value-wrapper.cpp
b/plugins/dali-script-v8/src/object/property-value-wrapper.cpp
index
b5595f8
..
c58d991
100644
(file)
--- a/
plugins/dali-script-v8/src/object/property-value-wrapper.cpp
+++ b/
plugins/dali-script-v8/src/object/property-value-wrapper.cpp
@@
-769,7
+769,6
@@
Dali::Property::Value PropertyValueWrapper::ExtractPropertyValue( v8::Isolate* i
break;
}
case Dali::Property::NONE:
- case Dali::Property::TYPE_COUNT:
default:
{
break;