diff --git a/Controllers/LianLiController/LianLiGAIITrinityController/LianLiGAIITrinityController.cpp b/Controllers/LianLiController/LianLiGAIITrinityController/LianLiGAIITrinityController.cpp index 470a7b02..9f02c7fd 100644 --- a/Controllers/LianLiController/LianLiGAIITrinityController/LianLiGAIITrinityController.cpp +++ b/Controllers/LianLiController/LianLiGAIITrinityController/LianLiGAIITrinityController.cpp @@ -14,6 +14,7 @@ #include #include #include "LianLiGAIITrinityController.h" +#include "StringUtils.h" LianLiGAIITrinityController::LianLiGAIITrinityController(hid_device* dev_handle) { @@ -37,8 +38,7 @@ LianLiGAIITrinityController::GAII_Info LianLiGAIITrinityController::GetControlle wchar_t tmp[sz]; hid_get_serial_number_string(dev, tmp, sz); - std::wstring serialWStr = std::wstring(tmp); - controllerInfo.serial = std::string(serialWStr.begin(), serialWStr.end()); + controllerInfo.serial = StringUtils::wstring_to_string(tmp); // get firmware version unsigned char data[64] = ""; diff --git a/Controllers/LianLiController/LianLiUniHubALController/LianLiUniHubALController.cpp b/Controllers/LianLiController/LianLiUniHubALController/LianLiUniHubALController.cpp index 5b365c8f..c3f176ce 100644 --- a/Controllers/LianLiController/LianLiUniHubALController/LianLiUniHubALController.cpp +++ b/Controllers/LianLiController/LianLiUniHubALController/LianLiUniHubALController.cpp @@ -12,6 +12,7 @@ #include #include "LianLiUniHubALController.h" +#include "StringUtils.h" using namespace std::chrono_literals; @@ -43,8 +44,7 @@ std::string LianLiUniHubALController::GetFirmwareVersionString() return (""); } - std::wstring return_wstring = product_string; - std::string return_string(return_wstring.begin(),return_wstring.end()); + std::string return_string = StringUtils::wstring_to_string(product_string); return(return_string.substr(return_string.find_last_of("-")+1,4).c_str()); } @@ -64,8 +64,7 @@ std::string LianLiUniHubALController::GetSerialString() return (""); } - std::wstring return_wstring = serial_string; - std::string return_string(return_wstring.begin(), return_wstring.end()); + std::string return_string = StringUtils::wstring_to_string(serial_string); return(return_string);