6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-06-01 06:41:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1129 from TomHarte/FarewellCodecvt

Browse Source 
Eliminate use of deprecated codecvt.
This commit is contained in:
Thomas Harte 2023-04-30 17:21:43 -04:00 committed by GitHub
commit 0cb4fec504
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 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 <cassert>
#include <codecvt>
#include <cstdlib>
#include <iomanip>
#include <locale>
#include <sstream>
@ -248,7 +248,7 @@ std::string Description::description(int flags) const {
std::stringstream output;
// 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.
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::wstringstream output;
std::wstring_convert<std::codecvt_utf8<wchar_t>> wstring_converter;
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) {
output << std::endl;
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;
case ROM::Request::LineItem::Description:
case ROM::Request::LineItem::Description: {
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) {
output << ";";
@ -359,7 +361,7 @@ std::wstring Request::description(int description_flags, wchar_t bullet_point) {
} else {
output << ".";
}
break;
} break;
}
}
);

9
OSBindings/Mac/Clock Signal/Machine/CSMachine.mm
View File

@ -33,7 +33,6 @@
#include <cassert>
#include <atomic>
#include <bitset>
#include <codecvt>
#include <locale>
namespace {
@ -145,9 +144,13 @@ struct ActivityObserver: public Activity::Observer {
ROM::Request missing_roms;
_machine.reset(Machine::MachineForTargets(_analyser.targets, CSROMFetcher(&missing_roms), error));
if(!_machine) {
std::wstring_convert<std::codecvt_utf8<wchar_t>> wstring_converter;
const std::wstring description = missing_roms.description(0, L'•');
[missingROMs appendString:[NSString stringWithUTF8String:wstring_converter.to_bytes(description).c_str()]];
static_assert(sizeof(wchar_t) == 4, "This code assumes wchar_t is UTF32");
NSString *nativeString = [[NSString alloc]
initWithBytes:description.data()
length:description.size()*sizeof(wchar_t)
encoding:NSUTF32LittleEndianStringEncoding];
[missingROMs appendString:nativeString];
return nil;
}
updater.performer.machine = _machine.get();