VERY experimental Nintendo Switch 2 emulator
C++
common: string_util: Use std::string_view for UTF16ToUTF8/UTF8ToUTF16W.
bunneia59583c7ab33
diff --git a/src/common/string_util.cpp b/src/common/string_util.cppindex e0b6180c55..feab1653df 100644--- a/src/common/string_util.cpp+++ b/src/common/string_util.cpp@@ -125,18 +125,18 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::streturn result;}-std::string UTF16ToUTF8(const std::u16string& input) {+std::string UTF16ToUTF8(std::u16string_view input) {std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;- return convert.to_bytes(input);+ return convert.to_bytes(input.data(), input.data() + input.size());}-std::u16string UTF8ToUTF16(const std::string& input) {+std::u16string UTF8ToUTF16(std::string_view input) {std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;- return convert.from_bytes(input);+ return convert.from_bytes(input.data(), input.data() + input.size());}#ifdef _WIN32-static std::wstring CPToUTF16(u32 code_page, const std::string& input) {+static std::wstring CPToUTF16(u32 code_page, std::string_view input) {const auto size =MultiByteToWideChar(code_page, 0, input.data(), static_cast<int>(input.size()), nullptr, 0);@@ -154,7 +154,7 @@ static std::wstring CPToUTF16(u32 code_page, const std::string& input) {return output;}-std::string UTF16ToUTF8(const std::wstring& input) {+std::string UTF16ToUTF8(std::wstring_view input) {const auto size = WideCharToMultiByte(CP_UTF8, 0, input.data(), static_cast<int>(input.size()),nullptr, 0, nullptr, nullptr);if (size == 0) {@@ -172,7 +172,7 @@ std::string UTF16ToUTF8(const std::wstring& input) {return output;}-std::wstring UTF8ToUTF16W(const std::string& input) {+std::wstring UTF8ToUTF16W(std::string_view input) {return CPToUTF16(CP_UTF8, input);}diff --git a/src/common/string_util.h b/src/common/string_util.hindex f8aecc875e..c351f1a0c8 100644--- a/src/common/string_util.h+++ b/src/common/string_util.h@@ -36,12 +36,12 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _[[nodiscard]] std::string ReplaceAll(std::string result, const std::string& src,const std::string& dest);-[[nodiscard]] std::string UTF16ToUTF8(const std::u16string& input);-[[nodiscard]] std::u16string UTF8ToUTF16(const std::string& input);+[[nodiscard]] std::string UTF16ToUTF8(std::u16string_view input);+[[nodiscard]] std::u16string UTF8ToUTF16(std::string_view input);#ifdef _WIN32-[[nodiscard]] std::string UTF16ToUTF8(const std::wstring& input);-[[nodiscard]] std::wstring UTF8ToUTF16W(const std::string& str);+[[nodiscard]] std::string UTF16ToUTF8(std::wstring_view input);+[[nodiscard]] std::wstring UTF8ToUTF16W(std::string_view str);#endif