From 85ba2fde280fdf9782b2e0ebc358113b75a7bce1 Mon Sep 17 00:00:00 2001 From: Nathan Woods Date: Mon, 3 Oct 2016 23:20:25 -0400 Subject: Bulk renaming of Windows string conversion functions utf8_from_[a|w|t]string ==> osd::text::from_[a|w|t]string [a|w|t]string_from_utf8 ==> osd::text::to_[a|w|t]string --- src/osd/modules/input/input_rawinput.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/osd/modules/input/input_rawinput.cpp') diff --git a/src/osd/modules/input/input_rawinput.cpp b/src/osd/modules/input/input_rawinput.cpp index 0cddbad6acb..6d5cca778e8 100644 --- a/src/osd/modules/input/input_rawinput.cpp +++ b/src/osd/modules/input/input_rawinput.cpp @@ -573,10 +573,10 @@ protected: std::wstring name = rawinput_device_improve_name(tname.get()); // convert name to utf8 - std::string utf8_name = utf8_from_wstring(name.c_str()); + std::string utf8_name = osd::text::from_wstring(name.c_str()); // set device id to raw input name - std::string utf8_id = utf8_from_wstring(tname.get()); + std::string utf8_id = osd::text::from_wstring(tname.get()); devinfo = devicelist()->create_device(machine, utf8_name.c_str(), utf8_id.c_str(), *this); @@ -679,7 +679,7 @@ protected: // generate the name if (GetKeyNameText(((keynum & 0x7f) << 16) | ((keynum & 0x80) << 17), keyname, ARRAY_LENGTH(keyname)) == 0) _sntprintf(keyname, ARRAY_LENGTH(keyname), TEXT("Scan%03d"), keynum); - std::string name = utf8_from_tstring(keyname); + std::string name = osd::text::from_tstring(keyname); // add the item to the device devinfo->device()->add_item(name.c_str(), itemid, generic_button_get_state, &devinfo->keyboard.state[keynum]); -- cgit v1.2.3