jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix wstring to string conversion warning in CMKeyboardV2Controller.cpp

Browse source
This commit is contained in:
Adam Honse 2024-08-16 11:09:17 -05:00
parent b45b24b922
commit 8bf07f490e
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Controllers/CoolerMasterController/CMKeyboardController/CMKeyboardV2Controller.cpp
View file

@ -14,6 +14,7 @@
#include <string> #include <string>
#include "CMKeyboardV2Controller.h" #include "CMKeyboardV2Controller.h"
#include "LogManager.h" #include "LogManager.h"
#include "StringUtils.h"
CMKeyboardV2Controller::CMKeyboardV2Controller(hid_device* dev_handle, hid_device_info* dev_info) : CMKeyboardAbstractController(dev_handle, dev_info) CMKeyboardV2Controller::CMKeyboardV2Controller(hid_device* dev_handle, hid_device_info* dev_info) : CMKeyboardAbstractController(dev_handle, dev_info)
{ {
@ -97,8 +98,8 @@ std::string CMKeyboardV2Controller::_GetFirmwareVersion()
cVersionStr[i++] = it; cVersionStr[i++] = it;
} }
std::u16string usFirmwareVersion(reinterpret_cast<const char16_t*>(cVersionStr+8)); std::wstring wsFirmwareVersion(reinterpret_cast<const wchar_t*>(cVersionStr+8));
std::string sFirmwareVersion(usFirmwareVersion.begin(), usFirmwareVersion.end()); std::string sFirmwareVersion(StringUtils::wstring_to_string(wsFirmwareVersion));
LOG_VERBOSE("[%s] GetFirmwareVersion(): [%s]", m_deviceName.c_str(), sFirmwareVersion.c_str()); LOG_VERBOSE("[%s] GetFirmwareVersion(): [%s]", m_deviceName.c_str(), sFirmwareVersion.c_str());