summaryrefslogtreecommitdiff
path: root/src/mbgl/style/conversion/transition_options.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2018-07-30 15:04:41 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2018-07-30 17:17:38 -0700
commit9a1bb1ad14e18433d4cc8e805af57a6014275561 (patch)
tree60533ceadc7bebe48d655041b9c4dbcf4133c32a /src/mbgl/style/conversion/transition_options.cpp
parentbf7785618ac5f3bbcba068e61ef6359d70aff92b (diff)
downloadqtlocation-mapboxgl-9a1bb1ad14e18433d4cc8e805af57a6014275561.tar.gz
[core] Tweak conversions to reduce binary size
* return {} → return nullopt * error = { "..." } → error.message = "..."
Diffstat (limited to 'src/mbgl/style/conversion/transition_options.cpp')
-rw-r--r--src/mbgl/style/conversion/transition_options.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/style/conversion/transition_options.cpp b/src/mbgl/style/conversion/transition_options.cpp
index 116d44f9d9..924032a0c0 100644
--- a/src/mbgl/style/conversion/transition_options.cpp
+++ b/src/mbgl/style/conversion/transition_options.cpp
@@ -6,8 +6,8 @@ namespace conversion {
optional<TransitionOptions> Converter<TransitionOptions>::operator()(const Convertible& value, Error& error) const {
if (!isObject(value)) {
- error = { "transition must be an object" };
- return {};
+ error.message = "transition must be an object";
+ return nullopt;
}
optional<TransitionOptions> result = TransitionOptions{};
@@ -16,8 +16,8 @@ optional<TransitionOptions> Converter<TransitionOptions>::operator()(const Conve
if (duration) {
auto number = toNumber(*duration);
if (!number) {
- error = { "duration must be a number" };
- return {};
+ error.message = "duration must be a number";
+ return nullopt;
}
result->duration = { std::chrono::milliseconds(int64_t(*number)) };
}
@@ -26,8 +26,8 @@ optional<TransitionOptions> Converter<TransitionOptions>::operator()(const Conve
if (delay) {
auto number = toNumber(*delay);
if (!number) {
- error = { "delay must be a number" };
- return {};
+ error.message = "delay must be a number";
+ return nullopt;
}
result->delay = { std::chrono::milliseconds(int64_t(*number)) };
}