6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-17 02:30:54 +00:00
Code Issues Projects Releases Wiki Activity

Eliminate codecvt.

Browse Source
This commit is contained in:
Thomas Harte 2023-04-30 17:17:40 -04:00
parent 8f0dc9d9a2
commit ec81cdd388
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Machines/Utility/ROMCatalogue.cpp
View File

@ -10,7 +10,7 @@
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include <codecvt> #include <cstdlib>
#include <iomanip> #include <iomanip>
#include <locale> #include <locale>
#include <sstream> #include <sstream>
@ -248,7 +248,7 @@ std::string Description::description(int flags) const {
std::stringstream output; std::stringstream output;
// If there are no CRCs, don't output them. // If there are no CRCs, don't output them.
if(crc32s.empty()) flags &= ~ DescriptionFlag::CRC; if(crc32s.empty()) flags &= ~DescriptionFlag::CRC;
// Print the file name(s) and the descriptive name. // Print the file name(s) and the descriptive name.
if(flags & DescriptionFlag::Filename) { if(flags & DescriptionFlag::Filename) {
@ -316,10 +316,9 @@ std::string Description::description(int flags) const {
std::wstring Request::description(int description_flags, wchar_t bullet_point) { std::wstring Request::description(int description_flags, wchar_t bullet_point) {
std::wstringstream output; std::wstringstream output;
std::wstring_convert<std::codecvt_utf8<wchar_t>> wstring_converter;
visit( visit(
[&output, description_flags, bullet_point, &wstring_converter] (ROM::Request::LineItem item, ROM::Request::ListType type, int indentation_level, const ROM::Description *description, bool is_optional, size_t remaining) { [&output, description_flags, bullet_point] (ROM::Request::LineItem item, ROM::Request::ListType type, int indentation_level, const ROM::Description *description, bool is_optional, size_t remaining) {
if(indentation_level) { if(indentation_level) {
output << std::endl; output << std::endl;
for(int c = 0; c < indentation_level; c++) output << '\t'; for(int c = 0; c < indentation_level; c++) output << '\t';
@ -346,10 +345,13 @@ std::wstring Request::description(int description_flags, wchar_t bullet_point) {
} }
break; break;
case ROM::Request::LineItem::Description: case ROM::Request::LineItem::Description: {
if(is_optional) output << "optionally, "; if(is_optional) output << "optionally, ";
output << wstring_converter.from_bytes(description->description(description_flags)); const auto text = description->description(description_flags);
std::wstring wide_text(text.size(), L' ');
std::mbstowcs(wide_text.data(), text.data(), text.size());
output << wide_text;
if(remaining) { if(remaining) {
output << ";"; output << ";";
@ -359,7 +361,7 @@ std::wstring Request::description(int description_flags, wchar_t bullet_point) {
} else { } else {
output << "."; output << ".";
} }
break; } break;
} }
} }
); );