summaryrefslogtreecommitdiff
path: root/include/mbgl/style/conversion_impl.hpp
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-09-25 23:31:56 +0300
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-09-26 11:57:39 +0300
commite78c31c4b53326f260a4274018b5cb98fac0dbb6 (patch)
treec81f74500b9a1d5a618ee2b12b54324ceaeec175 /include/mbgl/style/conversion_impl.hpp
parentb5862c212769ee1372e4005dd1b96d49b72171e3 (diff)
downloadqtlocation-mapboxgl-e78c31c4b53326f260a4274018b5cb98fac0dbb6.tar.gz
[core] LayerProperty -> StyleProperty
Diffstat (limited to 'include/mbgl/style/conversion_impl.hpp')
-rw-r--r--include/mbgl/style/conversion_impl.hpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/mbgl/style/conversion_impl.hpp b/include/mbgl/style/conversion_impl.hpp
index 866eff9eb5..ebeeee1c79 100644
--- a/include/mbgl/style/conversion_impl.hpp
+++ b/include/mbgl/style/conversion_impl.hpp
@@ -349,22 +349,22 @@ Value makeValue(T&& arg) {
}
template <typename T>
-LayerProperty makeLayerProperty(const PropertyValue<T>& value) {
- return value.match([](const Undefined&) -> LayerProperty { return {}; },
- [](const T& t) -> LayerProperty {
- return {makeValue(t), LayerProperty::Kind::Constant};
+StyleProperty makeStyleProperty(const PropertyValue<T>& value) {
+ return value.match([](const Undefined&) -> StyleProperty { return {}; },
+ [](const T& t) -> StyleProperty {
+ return {makeValue(t), StyleProperty::Kind::Constant};
},
- [](const PropertyExpression<T>& fn) -> LayerProperty {
- return {fn.getExpression().serialize(), LayerProperty::Kind::Expression};
+ [](const PropertyExpression<T>& fn) -> StyleProperty {
+ return {fn.getExpression().serialize(), StyleProperty::Kind::Expression};
});
}
-inline LayerProperty makeLayerProperty(const TransitionOptions& value) {
- return {makeValue(value), LayerProperty::Kind::Transition};
+inline StyleProperty makeStyleProperty(const TransitionOptions& value) {
+ return {makeValue(value), StyleProperty::Kind::Transition};
}
-inline LayerProperty makeLayerProperty(const ColorRampPropertyValue& value) {
- return {makeValue(value), LayerProperty::Kind::Expression};
+inline StyleProperty makeStyleProperty(const ColorRampPropertyValue& value) {
+ return {makeValue(value), StyleProperty::Kind::Expression};
}
} // namespace conversion