summaryrefslogtreecommitdiff
path: root/src/mbgl
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <thiago@mapbox.com>2016-12-20 15:06:56 -0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2017-01-20 18:50:45 +0100
commit181b3635f17101672c05af3e0800d7841fd259e8 (patch)
treec24b830459b7ac11c844c1d369a99579685d9ebb /src/mbgl
parentcbf28083e61a1bda85765db610ae93291d077086 (diff)
downloadqtlocation-mapboxgl-181b3635f17101672c05af3e0800d7841fd259e8.tar.gz
[core][Qt] Use Qt for UTF16, since `codecvt` is not always available
Diffstat (limited to 'src/mbgl')
-rw-r--r--src/mbgl/util/utf.hpp10
1 files changed, 2 insertions, 8 deletions
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