diff options
| author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-09-23 17:22:38 +0300 |
|---|---|---|
| committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-09-26 10:55:47 +0300 |
| commit | e5cdc4ecf362dadf2da148a22cf97aaf3c9c4ecf (patch) | |
| tree | ebae02fa6a6da0f4c81cb72df87c6d7359c17acd /platform/android/src | |
| parent | 9c8295c6a64b6f5b2c9b67fd01633a156481a3c8 (diff) | |
| download | qtlocation-mapboxgl-e5cdc4ecf362dadf2da148a22cf97aaf3c9c4ecf.tar.gz | |
[core][android][darwin] Move number format to i18n
Diffstat (limited to 'platform/android/src')
| -rw-r--r-- | platform/android/src/i18n/number_format.cpp (renamed from platform/android/src/text/format_number.cpp) | 5 | ||||
| -rw-r--r-- | platform/android/src/i18n/number_format_jni.hpp (renamed from platform/android/src/text/format_number_jni.hpp) | 2 | ||||
| -rw-r--r-- | platform/android/src/jni_native.cpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/platform/android/src/text/format_number.cpp b/platform/android/src/i18n/number_format.cpp index 3a41175ecc..c8e0b70562 100644 --- a/platform/android/src/text/format_number.cpp +++ b/platform/android/src/i18n/number_format.cpp @@ -1,11 +1,10 @@ -#include <mbgl/style/expression/collator.hpp> +#include <mbgl/i18n/number_format.hpp> #include <mbgl/text/language_tag.hpp> -#include <mbgl/util/platform.hpp> #include <jni/jni.hpp> #include "../attach_env.hpp" -#include "format_number_jni.hpp" +#include "number_format_jni.hpp" namespace mbgl { namespace android { diff --git a/platform/android/src/text/format_number_jni.hpp b/platform/android/src/i18n/number_format_jni.hpp index 1b63012c6e..1720038925 100644 --- a/platform/android/src/text/format_number_jni.hpp +++ b/platform/android/src/i18n/number_format_jni.hpp @@ -2,7 +2,7 @@ #include <jni/jni.hpp> -#include "../i18n/collator_jni.hpp" +#include "collator_jni.hpp" /* android::NumberFormat is the JNI wrapper diff --git a/platform/android/src/jni_native.cpp b/platform/android/src/jni_native.cpp index 966dc6a007..9fe14f8f1f 100644 --- a/platform/android/src/jni_native.cpp +++ b/platform/android/src/jni_native.cpp @@ -51,9 +51,9 @@ #include "snapshotter/map_snapshot.hpp" #endif #include "i18n/collator_jni.hpp" +#include "i18n/number_format_jni.hpp" #include "logger.hpp" #include "text/local_glyph_rasterizer_jni.hpp" -#include "text/format_number_jni.hpp" namespace mbgl { namespace android { |