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

Fix wstring to string conversion warnings in GigabyteAorusMouseController.cpp

Browse source
This commit is contained in:
Adam Honse 2024-07-29 22:50:51 -05:00
parent 2225ca0ec4
commit bb34aba76e
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.cpp
View file

@ -11,25 +11,13 @@
#include <string.h>
#include "GigabyteAorusMouseController.h"
#include "StringUtils.h"
GigabyteAorusMouseController::GigabyteAorusMouseController(hid_device* dev_handle, const hid_device_info& info)
{
dev = dev_handle;
location = info.path;
version = "";
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
if(ret != 0)
{
serial_number = "";
}
else
{
std::wstring return_wstring = serial_string;
serial_number = std::string(return_wstring.begin(), return_wstring.end());
}
}
GigabyteAorusMouseController::~GigabyteAorusMouseController()
@ -44,7 +32,15 @@ std::string GigabyteAorusMouseController::GetDeviceLocation()
std::string GigabyteAorusMouseController::GetSerialString()
{
return(serial_number);
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
if(ret != 0)
{
return("");
}
return(StringUtils::wstring_to_string(serial_string));
}
std::string GigabyteAorusMouseController::GetFirmwareVersion()

1
Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.h
View file

@ -54,6 +54,5 @@ private:
hid_device* dev;
std::string location;
std::string serial_number;
std::string version;
};