From 15d9fab0bbe5cae41116c7eb24dc1797f05957c1 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 28 Jun 2020 18:15:30 +0200 Subject: Common: Rename UTF16ToUTF8 This function does *not* always convert from UTF-16. It converts from UTF-16 on Windows and UTF-32 on other operating systems. Also renaming UTF8ToUTF16 for consistency, even though it technically doesn't have the same problem since it only was implemented on Windows. --- Source/Core/Common/Timer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/Common/Timer.cpp') diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp index 794f2dfd49..66c71db568 100644 --- a/Source/Core/Common/Timer.cpp +++ b/Source/Core/Common/Timer.cpp @@ -218,7 +218,7 @@ std::string Timer::GetTimeFormatted() #ifdef _WIN32 struct timeb tp; (void)::ftime(&tp); - return UTF16ToUTF8(tmp) + fmt::format(":{:03}", tp.millitm); + return WStringToUTF8(tmp) + fmt::format(":{:03}", tp.millitm); #elif defined __APPLE__ struct timeval t; (void)gettimeofday(&t, nullptr); @@ -276,7 +276,7 @@ std::string Timer::GetDateTimeFormatted(double time) #ifdef _WIN32 wchar_t tmp[32] = {}; wcsftime(tmp, sizeof(tmp), L"%x %X", localTime); - return UTF16ToUTF8(tmp); + return WStringToUTF8(tmp); #else char tmp[32] = {}; strftime(tmp, sizeof(tmp), "%x %X", localTime); -- cgit v1.2.3