std::wstring_convert

minetest · Aug 30, 2023 · 32e0e26 · 32e0e26
1 parent 2fd0d98
commit 32e0e26
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 29 deletions.
diff --git a/examples/AutomatedTest/main.cpp b/examples/AutomatedTest/main.cpp
@@ -1,21 +1,7 @@
-#include <cassert>
 #include <iostream>
-#include <string>
 #include <irrlicht.h>
 #include "exampleHelper.h"
 
-// usually provided by Minetest
-std::wstring utf8_to_wide(const std::string &input) {
-	assert(false);
-	return L"false";
-}
-
-// usually provided by Minetest
-std::string wide_to_utf8(const std::wstring &input) {
-	assert(false);
-	return "false";
-}
-
 using namespace irr;
 
 static IrrlichtDevice *device = nullptr;

diff --git a/include/irrString.h b/include/irrString.h
@@ -11,9 +11,8 @@
 #include <cstdio>
 #include <cstring>
 #include <cwchar>
-
-extern std::wstring utf8_to_wide(const std::string &input);
-extern std::string wide_to_utf8(const std::wstring &input);
+#include <locale>
+#include <codecvt>
 
 namespace irr
 {
@@ -866,10 +865,10 @@ class string
 		return ret.size()-oldSize;
 	}
 
-	friend size_t multibyteToWString(irr::core::stringw &destination, const irr::core::stringc &source);
-	friend size_t multibyteToWString(irr::core::stringw &destination, const char *source);
-	friend size_t wStringToMultibyte(irr::core::stringc &destination, const irr::core::stringw &source);
-	friend size_t wStringToMultibyte(irr::core::stringc &destination, const wchar_t *source);
+	friend size_t multibyteToWString(stringw &destination, const stringc &source);
+	friend size_t multibyteToWString(stringw &destination, const char *source);
+	friend size_t wStringToMultibyte(stringc &destination, const stringw &source);
+	friend size_t wStringToMultibyte(stringc &destination, const wchar_t *source);
 
 private:
 
@@ -922,27 +921,31 @@ class string
 };
 
 
-inline size_t multibyteToWString(irr::core::stringw &destination, const irr::core::stringc &source)
+inline size_t multibyteToWString(stringw &destination, const stringc &source)
 {
-	destination = utf8_to_wide(source.str);
+	std::wstring_convert<std::codecvt_utf8<wchar_t>> conv;
+	destination = conv.from_bytes(source.str);
 	return destination.size();
 }
 
-inline size_t multibyteToWString(irr::core::stringw &destination, const char *source)
+inline size_t multibyteToWString(stringw &destination, const char *source)
 {
-	destination = utf8_to_wide(source);
+	std::wstring_convert<std::codecvt_utf8<wchar_t>> conv;
+	destination = conv.from_bytes(source);
 	return destination.size();
 }
 
-inline size_t wStringToMultibyte(irr::core::stringc &destination, const irr::core::stringw &source)
+inline size_t wStringToMultibyte(stringc &destination, const stringw &source)
 {
-	destination = wide_to_utf8(source.str);
+	std::wstring_convert<std::codecvt_utf8<wchar_t>> conv;
+	destination = conv.to_bytes(source.str);
 	return destination.size();
 }
 
-inline size_t wStringToMultibyte(irr::core::stringc &destination, const wchar_t *source)
+inline size_t wStringToMultibyte(stringc &destination, const wchar_t *source)
 {
-	destination = wide_to_utf8(source);
+	std::wstring_convert<std::codecvt_utf8<wchar_t>> conv;
+	destination = conv.to_bytes(source);
 	return destination.size();
 }