summaryrefslogtreecommitdiff
path: root/platform/android/src/style/conversion/transition_options.hpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2018-08-17 16:25:12 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2018-08-21 09:26:44 -0700
commit2ff1ac309727a5f34cfa9472dc5802d5b5c3113c (patch)
tree14cafb88bc86c6f1d7a257129c2878f2c702bce8 /platform/android/src/style/conversion/transition_options.hpp
parent7ce6af3f55d94e5e271aeafff44a11508b79dead (diff)
downloadqtlocation-mapboxgl-2ff1ac309727a5f34cfa9472dc5802d5b5c3113c.tar.gz
[android] Move conversion code to .cpp files
Diffstat (limited to 'platform/android/src/style/conversion/transition_options.hpp')
-rw-r--r--platform/android/src/style/conversion/transition_options.hpp19
1 files changed, 5 insertions, 14 deletions
diff --git a/platform/android/src/style/conversion/transition_options.hpp b/platform/android/src/style/conversion/transition_options.hpp
index ae65a32194..6630456d37 100644
--- a/platform/android/src/style/conversion/transition_options.hpp
+++ b/platform/android/src/style/conversion/transition_options.hpp
@@ -1,11 +1,11 @@
#pragma once
#include "../../conversion/conversion.hpp"
+#include "../transition_options.hpp"
-#include <jni/jni.hpp>
#include <mbgl/style/transition_options.hpp>
-#include "../../jni/local_object.hpp"
-#include "../transition_options.hpp"
+
+#include <jni/jni.hpp>
namespace mbgl {
namespace android {
@@ -13,18 +13,9 @@ namespace conversion {
template<>
struct Converter<jni::Object<TransitionOptions>, mbgl::style::TransitionOptions> {
- Result<jni::Object<TransitionOptions>> operator()(jni::JNIEnv &env, const mbgl::style::TransitionOptions &value) const {
-
- // Convert duration
- jlong duration = std::chrono::duration_cast<std::chrono::milliseconds>(value.duration.value_or(mbgl::Duration::zero())).count();
- // Convert delay
- jlong delay = std::chrono::duration_cast<std::chrono::milliseconds>(value.delay.value_or(mbgl::Duration::zero())).count();
-
- // Create transition options
- return TransitionOptions::fromTransitionOptions(env, duration, delay);
- }
+ Result<jni::Object<TransitionOptions>> operator()(jni::JNIEnv&, const mbgl::style::TransitionOptions&) const;
};
}
}
-} \ No newline at end of file
+}