From 47af83e1947ea896b4ed351de7a653d9888cd9af Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Wed, 7 Aug 2024 21:58:46 -0500 Subject: [PATCH] Fix wstring to string conversion warning in ThermaltakeRiingQuadController.cpp --- .../ThermaltakeRiingQuadController.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController/ThermaltakeRiingQuadController.cpp b/Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController/ThermaltakeRiingQuadController.cpp index 70984027..26d0408c 100644 --- a/Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController/ThermaltakeRiingQuadController.cpp +++ b/Controllers/ThermaltakeRiingController/ThermaltakeRiingQuadController/ThermaltakeRiingQuadController.cpp @@ -15,18 +15,19 @@ ThermaltakeRiingQuadController::ThermaltakeRiingQuadController(hid_device* dev_handle, const char* path) { - wchar_t tmpName[HID_MAX_STR]; - dev = dev_handle; location = path; - hid_get_manufacturer_string(dev, tmpName, HID_MAX_STR); - std::wstring wName = std::wstring(tmpName); - device_name = std::string(wName.begin(), wName.end()); + /*---------------------------------------------------------*\ + | Get device name from HID manufacturer and product strings | + \*---------------------------------------------------------*/ + wchar_t name_string[HID_MAX_STR]; - hid_get_product_string(dev, tmpName, HID_MAX_STR); - wName = std::wstring(tmpName); - device_name.append(" ").append(std::string(wName.begin(), wName.end())); + hid_get_manufacturer_string(dev, name_string, HID_MAX_STR); + device_name = StringUtils::wstring_to_string(name_string); + + hid_get_product_string(dev, name_string, HID_MAX_STR); + device_name.append(" ").append(StringUtils::wstring_to_string(name_string)); SendInit();