summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/input
diff options
context:
space:
mode:
author Vas Crabb <cuavas@users.noreply.github.com>2016-10-05 21:08:28 +1100
committer GitHub <noreply@github.com>2016-10-05 21:08:28 +1100
commit9ae59fb76b157db06a0102eaebe6ea384767081b (patch)
treea68cb906db2a9a249842ba9d6db9ea587783f576 /src/osd/modules/input
parent5ce77bf9b89cc61fa826869cc88cc22299579a97 (diff)
parent85ba2fde280fdf9782b2e0ebc358113b75a7bce1 (diff)
Merge pull request #1469 from npwoods/new_strconv_overloads
Adding new string conversion overloads
Diffstat (limited to 'src/osd/modules/input')
-rw-r--r--src/osd/modules/input/input_dinput.cpp4
-rw-r--r--src/osd/modules/input/input_dinput.h2
-rw-r--r--src/osd/modules/input/input_rawinput.cpp6
3 files changed, 6 insertions, 6 deletions
diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp
index b17cf3a61a3..c4a62cd0d2f 100644
--- a/src/osd/modules/input/input_dinput.cpp
+++ b/src/osd/modules/input/input_dinput.cpp
@@ -262,14 +262,14 @@ public:
}
// convert the name to utf8
- std::string namestring = utf8_from_tstring(instance.tszName);
+ std::string namestring = osd::text::from_tstring(instance.tszName);
// if no suffix, return as-is
if (suffix == nullptr)
return namestring;
// convert the suffix to utf8
- std::string suffix_utf8 = utf8_from_tstring(suffix);
+ std::string suffix_utf8 = osd::text::from_tstring(suffix);
// Concat the name and suffix
return namestring + " " + suffix_utf8;
diff --git a/src/osd/modules/input/input_dinput.h b/src/osd/modules/input/input_dinput.h
index db640490dc6..deda207b81a 100644
--- a/src/osd/modules/input/input_dinput.h
+++ b/src/osd/modules/input/input_dinput.h
@@ -79,7 +79,7 @@ public:
HRESULT result;
// convert instance name to utf8
- std::string utf8_instance_name = utf8_from_tstring(instance->tszInstanceName);
+ std::string utf8_instance_name = osd::text::from_tstring(instance->tszInstanceName);
// set device id to name
std::string utf8_instance_id = utf8_instance_name;
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<TDevice>(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<std::uint8_t>, &devinfo->keyboard.state[keynum]);