diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-12-20 15:06:56 -0200 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-01-20 18:50:45 +0100 |
commit | 181b3635f17101672c05af3e0800d7841fd259e8 (patch) | |
tree | c24b830459b7ac11c844c1d369a99579685d9ebb | |
parent | cbf28083e61a1bda85765db610ae93291d077086 (diff) | |
download | qtlocation-mapboxgl-181b3635f17101672c05af3e0800d7841fd259e8.tar.gz |
[core][Qt] Use Qt for UTF16, since `codecvt` is not always available
-rw-r--r-- | platform/android/config.cmake | 1 | ||||
-rw-r--r-- | platform/default/utf.cpp | 16 | ||||
-rw-r--r-- | platform/ios/config.cmake | 1 | ||||
-rw-r--r-- | platform/linux/config.cmake | 1 | ||||
-rw-r--r-- | platform/macos/config.cmake | 1 | ||||
-rw-r--r-- | platform/qt/qt.cmake | 1 | ||||
-rw-r--r-- | platform/qt/src/utf.cpp | 17 | ||||
-rw-r--r-- | src/mbgl/util/utf.hpp | 10 |
8 files changed, 40 insertions, 8 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index 635c27a44f..c3c461ffa1 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -79,6 +79,7 @@ macro(mbgl_platform_core) PRIVATE platform/android/src/logging_android.cpp PRIVATE platform/default/string_stdlib.cpp PRIVATE platform/default/bidi.cpp + PRIVATE platform/default/utf.cpp # Image handling PRIVATE platform/default/image.cpp diff --git a/platform/default/utf.cpp b/platform/default/utf.cpp new file mode 100644 index 0000000000..ba9678c91f --- /dev/null +++ b/platform/default/utf.cpp @@ -0,0 +1,16 @@ +#include <mbgl/util/utf.hpp> + +#include <memory> +#include <locale> +#include <codecvt> + +namespace mbgl { +namespace util { + +std::u16string utf8_to_utf16::convert(std::string const& utf8) { + std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter; + return converter.from_bytes(utf8); +} + +} // namespace util +} // namespace mbgl diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake index 12db02921c..1150171c54 100644 --- a/platform/ios/config.cmake +++ b/platform/ios/config.cmake @@ -41,6 +41,7 @@ macro(mbgl_platform_core) PRIVATE platform/darwin/src/nsthread.mm PRIVATE platform/darwin/src/string_nsstring.mm PRIVATE platform/default/bidi.cpp + PRIVATE platform/default/utf.cpp # Image handling PRIVATE platform/darwin/src/image.mm diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 5e0f07073c..dcd4692a18 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -72,6 +72,7 @@ macro(mbgl_platform_core) PRIVATE platform/default/string_stdlib.cpp PRIVATE platform/default/thread.cpp PRIVATE platform/default/bidi.cpp + PRIVATE platform/default/utf.cpp # Image handling PRIVATE platform/default/image.cpp diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index ced1121cca..d7a9c894b8 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -37,6 +37,7 @@ macro(mbgl_platform_core) PRIVATE platform/darwin/src/nsthread.mm PRIVATE platform/darwin/src/string_nsstring.mm PRIVATE platform/default/bidi.cpp + PRIVATE platform/default/utf.cpp # Image handling PRIVATE platform/darwin/src/image.mm diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 3382a9ac6b..bd7c863f98 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -48,6 +48,7 @@ set(MBGL_QT_FILES PRIVATE platform/qt/src/string_stdlib.cpp PRIVATE platform/qt/src/timer.cpp PRIVATE platform/qt/src/timer_impl.hpp + PRIVATE platform/qt/src/utf.cpp ) include_directories( diff --git a/platform/qt/src/utf.cpp b/platform/qt/src/utf.cpp new file mode 100644 index 0000000000..d8bf2ca0b3 --- /dev/null +++ b/platform/qt/src/utf.cpp @@ -0,0 +1,17 @@ +#include <mbgl/util/utf.hpp> + +#include <QString> + +namespace mbgl { +namespace util { + +std::u16string utf8_to_utf16::convert(std::string const& utf8) { + auto utf16 = QString::fromUtf8(utf8.data(), utf8.length()); + + // Newers Qt have QString::toStdU16String(), but this is how it is + // implemented. Do it here to keep compatibility with older versions. + return std::u16string(reinterpret_cast<const char16_t*>(utf16.utf16()), utf16.length()); +} + +} // namespace util +} // namespace mbgl diff --git a/src/mbgl/util/utf.hpp b/src/mbgl/util/utf.hpp index 81330cfc83..c13b094371 100644 --- a/src/mbgl/util/utf.hpp +++ b/src/mbgl/util/utf.hpp @@ -1,19 +1,13 @@ #pragma once -#include <memory> - -#include <locale> -#include <codecvt> +#include <string> namespace mbgl { namespace util { class utf8_to_utf16 { public: - static std::u16string convert(std::string const& utf8) { - std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter; - return converter.from_bytes(utf8); - } + static std::u16string convert(std::string const&); }; } // namespace util |