From 0e88176db8ce9f3fb631feb56bdd29d4ada054f5 Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Sat, 7 Mar 2020 14:01:11 +0100 Subject: GUIHyperText: Fix bug with UTF8 chars in action name + simplify UTF8 stringw conversion (#9437) Co-authored-by: Pierre-Yves Rollo --- src/util/string.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'src/util/string.cpp') diff --git a/src/util/string.cpp b/src/util/string.cpp index 2134fbd15..e6c52585d 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -860,28 +860,3 @@ std::wstring translate_string(const std::wstring &s) { translate_all(s, i, res); return res; } - -/** - * Create a std::string from a irr::core:stringw. - */ -std::string strwtostr(const irr::core::stringw &str) -{ - std::string text = core::stringc(str.c_str()).c_str(); - return text; -} - -/** - * Create a irr::core:stringw from a std::string. - */ -irr::core::stringw strtostrw(const std::string &str) -{ - size_t size = str.size(); - // s.size() doesn't include NULL terminator - wchar_t *text = new wchar_t[size + sizeof(wchar_t)]; - const char *data = &str[0]; - - mbsrtowcs(text, &data, size, NULL); - - text[size] = L'\0'; - return text; -} -- cgit v1.2.3