ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

StringUtil: Move ThousandSeparate() into Common namespace

This commit is contained in:
Lioncash 2023-05-16 14:26:33 -04:00
parent 954afd81ec
commit 1a2b48c204
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Source/Core/Common/StringUtil.h
View File

@ -211,25 +211,6 @@ inline std::string UTF8ToTStr(std::string_view str)
std::filesystem::path StringToPath(std::string_view path); std::filesystem::path StringToPath(std::string_view path);
std::string PathToString(const std::filesystem::path& path); std::string PathToString(const std::filesystem::path& path);
// Thousand separator. Turns 12345678 into 12,345,678
template <typename I>
std::string ThousandSeparate(I value, int spaces = 0)
{
#ifdef _WIN32
std::wostringstream stream;
#else
std::ostringstream stream;
#endif
stream << std::setw(spaces) << value;
#ifdef _WIN32
return WStringToUTF8(stream.str());
#else
return stream.str();
#endif
}
namespace Common namespace Common
{ {
/// Returns whether a character is printable, i.e. whether 0x20 <= c <= 0x7e is true. /// Returns whether a character is printable, i.e. whether 0x20 <= c <= 0x7e is true.
@ -258,6 +239,25 @@ inline char ToUpper(char ch)
return std::toupper(ch, std::locale::classic()); return std::toupper(ch, std::locale::classic());
} }
// Thousand separator. Turns 12345678 into 12,345,678
template <typename I>
std::string ThousandSeparate(I value, int spaces = 0)
{
#ifdef _WIN32
std::wostringstream stream;
#else
std::ostringstream stream;
#endif
stream << std::setw(spaces) << value;
#ifdef _WIN32
return WStringToUTF8(stream.str());
#else
return stream.str();
#endif
}
#ifdef _WIN32 #ifdef _WIN32
std::vector<std::string> CommandLineToUtf8Argv(const wchar_t* command_line); std::vector<std::string> CommandLineToUtf8Argv(const wchar_t* command_line);
#endif #endif

2
Source/Core/Core/HW/DVD/FileMonitor.cpp
View File

@ -77,7 +77,7 @@ void FileLogger::Log(const DiscIO::Volume& volume, const DiscIO::Partition& part
if (m_previous_partition == partition && m_previous_file_offset == file_offset) if (m_previous_partition == partition && m_previous_file_offset == file_offset)
return; return;
const std::string size_string = ThousandSeparate(file_info->GetSize() / 1000, 7); const std::string size_string = Common::ThousandSeparate(file_info->GetSize() / 1000, 7);
const std::string path = file_info->GetPath(); const std::string path = file_info->GetPath();
const std::string log_string = fmt::format("{} kB {}", size_string, path); const std::string log_string = fmt::format("{} kB {}", size_string, path);
if (IsSoundFile(path)) if (IsSoundFile(path))