From 61c3fc7975075f2b16c41909a30a2fa7a711acf8 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Mon, 29 Jul 2024 22:55:07 -0500 Subject: [PATCH] Fix wstring to string conversion warnings in SinowealthKeyboardController.cpp --- .../SinowealthController/SinowealthKeyboardController.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Controllers/SinowealthController/SinowealthKeyboardController.cpp b/Controllers/SinowealthController/SinowealthKeyboardController.cpp index 2fe6a865..907a12cd 100644 --- a/Controllers/SinowealthController/SinowealthKeyboardController.cpp +++ b/Controllers/SinowealthController/SinowealthKeyboardController.cpp @@ -8,8 +8,9 @@ | Dmitri Kalinichenko (Dima-Kal) 23/06/2021 | \*-----------------------------------------=*/ -#include "SinowealthKeyboardController.h" #include +#include "SinowealthKeyboardController.h" +#include "StringUtils.h" static unsigned char send_per_key_part_of_command_packet[] = { 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, @@ -114,10 +115,7 @@ std::string SinowealthKeyboardController::GetSerialString() return(""); } - std::wstring return_wstring = serial_string; - std::string return_string(return_wstring.begin(), return_wstring.end()); - - return(return_string); + return(StringUtils::wstring_to_string(serial_string)); } void SinowealthKeyboardController::SetLEDsDirect(std::vector colors)