summaryrefslogtreecommitdiff
path: root/src/mbgl/style/paint_property.hpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-04-26 10:36:25 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-04-26 11:44:48 -0700
commit878310b8912c83445ce7b12ee2b30a4489bf34f7 (patch)
tree826e2c7087f11fbfcb5556e98ee4e501548e19bb /src/mbgl/style/paint_property.hpp
parent64fe75b01109d38977b20c83773e6236e55905a8 (diff)
downloadqtlocation-mapboxgl-878310b8912c83445ce7b12ee2b30a4489bf34f7.tar.gz
[core] Simplify property parsing
This is a followup to #4811. Now that use of Function is consistent, we can have a single separate parseProperty template function that delegates to a parseConstant template function.
Diffstat (limited to 'src/mbgl/style/paint_property.hpp')
-rw-r--r--src/mbgl/style/paint_property.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp
index 124b0a7c0a..3c2b4ba7d7 100644
--- a/src/mbgl/style/paint_property.hpp
+++ b/src/mbgl/style/paint_property.hpp
@@ -51,14 +51,14 @@ public:
ClassID classID = isClass ? ClassDictionary::Get().lookup(paintName.substr(6)) : ClassID::Default;
if (it->value.HasMember(name)) {
- auto v = parseProperty<Fn>(name, it->value[name]);
+ auto v = parseProperty<T>(name, it->value[name]);
if (v) {
values.emplace(classID, *v);
}
}
if (it->value.HasMember(transitionName.c_str())) {
- auto v = parseProperty<PropertyTransition>(name, it->value[transitionName.c_str()]);
+ auto v = parsePropertyTransition(name, it->value[transitionName.c_str()]);
if (v) {
transitions.emplace(classID, *v);
}