From 9be9e34be19e82c03e4e3ef4a147f4083cfad072 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Fri, 2 Aug 2024 00:31:04 -0500 Subject: [PATCH] Fix wstring to string conversion warning in Logitech controllers --- .../LogitechG203LController/LogitechG203LController.cpp | 6 ++---- .../LogitechG213Controller/LogitechG213Controller.cpp | 6 ++---- .../LogitechG810Controller/LogitechG810Controller.cpp | 6 ++---- .../LogitechG815Controller/LogitechG815Controller.cpp | 6 ++---- .../LogitechG910Controller/LogitechG910Controller.cpp | 6 ++---- .../LogitechG915Controller/LogitechG915Controller.cpp | 6 ++---- .../LogitechGLightsyncController.cpp | 6 ++---- .../LogitechGProKeyboardController.cpp | 6 ++---- .../LogitechX56Controller/LogitechX56Controller.cpp | 6 ++---- 9 files changed, 18 insertions(+), 36 deletions(-) diff --git a/Controllers/LogitechController/LogitechG203LController/LogitechG203LController.cpp b/Controllers/LogitechController/LogitechG203LController/LogitechG203LController.cpp index 2b143f4b..c99bfd67 100644 --- a/Controllers/LogitechController/LogitechG203LController/LogitechG203LController.cpp +++ b/Controllers/LogitechController/LogitechG203LController/LogitechG203LController.cpp @@ -9,6 +9,7 @@ #include #include "LogitechG203LController.h" +#include "StringUtils.h" #define PACKET_SIZE 20 @@ -56,10 +57,7 @@ std::string LogitechG203LController::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 LogitechG203LController::SendApply() diff --git a/Controllers/LogitechController/LogitechG213Controller/LogitechG213Controller.cpp b/Controllers/LogitechController/LogitechG213Controller/LogitechG213Controller.cpp index a1018855..7e5660b8 100644 --- a/Controllers/LogitechController/LogitechG213Controller/LogitechG213Controller.cpp +++ b/Controllers/LogitechController/LogitechG213Controller/LogitechG213Controller.cpp @@ -11,6 +11,7 @@ #include #include "LogitechG213Controller.h" +#include "StringUtils.h" LogitechG213Controller::LogitechG213Controller(hid_device* dev_handle, const char* path) { @@ -38,10 +39,7 @@ std::string LogitechG213Controller::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 LogitechG213Controller::SetDirect diff --git a/Controllers/LogitechController/LogitechG810Controller/LogitechG810Controller.cpp b/Controllers/LogitechController/LogitechG810Controller/LogitechG810Controller.cpp index ef7d5ec7..92d80f8e 100644 --- a/Controllers/LogitechController/LogitechG810Controller/LogitechG810Controller.cpp +++ b/Controllers/LogitechController/LogitechG810Controller/LogitechG810Controller.cpp @@ -11,6 +11,7 @@ #include #include "LogitechG810Controller.h" +#include "StringUtils.h" LogitechG810Controller::LogitechG810Controller(hid_device* dev_handle_0x11, hid_device* dev_handle_0x12) { @@ -34,10 +35,7 @@ std::string LogitechG810Controller::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 LogitechG810Controller::Commit() diff --git a/Controllers/LogitechController/LogitechG815Controller/LogitechG815Controller.cpp b/Controllers/LogitechController/LogitechG815Controller/LogitechG815Controller.cpp index cddf5946..8c872bed 100644 --- a/Controllers/LogitechController/LogitechG815Controller/LogitechG815Controller.cpp +++ b/Controllers/LogitechController/LogitechG815Controller/LogitechG815Controller.cpp @@ -11,6 +11,7 @@ #include #include "LogitechG815Controller.h" +#include "StringUtils.h" LogitechG815Controller::LogitechG815Controller(hid_device* dev_handle_0x11, hid_device* dev_handle_0x12) { @@ -33,10 +34,7 @@ std::string LogitechG815Controller::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 LogitechG815Controller::Commit() diff --git a/Controllers/LogitechController/LogitechG910Controller/LogitechG910Controller.cpp b/Controllers/LogitechController/LogitechG910Controller/LogitechG910Controller.cpp index 8364b431..beec0751 100644 --- a/Controllers/LogitechController/LogitechG910Controller/LogitechG910Controller.cpp +++ b/Controllers/LogitechController/LogitechG910Controller/LogitechG910Controller.cpp @@ -11,6 +11,7 @@ #include #include "LogitechG910Controller.h" +#include "StringUtils.h" LogitechG910Controller::LogitechG910Controller(hid_device* dev_handle_0x11, hid_device* dev_handle_0x12) { @@ -34,10 +35,7 @@ std::string LogitechG910Controller::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 LogitechG910Controller::Commit() diff --git a/Controllers/LogitechController/LogitechG915Controller/LogitechG915Controller.cpp b/Controllers/LogitechController/LogitechG915Controller/LogitechG915Controller.cpp index 7e1833e5..a014923c 100644 --- a/Controllers/LogitechController/LogitechG915Controller/LogitechG915Controller.cpp +++ b/Controllers/LogitechController/LogitechG915Controller/LogitechG915Controller.cpp @@ -11,6 +11,7 @@ #include #include "LogitechG915Controller.h" +#include "StringUtils.h" LogitechG915Controller::LogitechG915Controller(hid_device* dev_handle, bool wired) { @@ -49,10 +50,7 @@ std::string LogitechG915Controller::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 LogitechG915Controller::Commit() diff --git a/Controllers/LogitechController/LogitechGLightsyncController/LogitechGLightsyncController.cpp b/Controllers/LogitechController/LogitechGLightsyncController/LogitechGLightsyncController.cpp index 0e715081..d0a222b6 100644 --- a/Controllers/LogitechController/LogitechGLightsyncController/LogitechGLightsyncController.cpp +++ b/Controllers/LogitechController/LogitechGLightsyncController/LogitechGLightsyncController.cpp @@ -11,6 +11,7 @@ #include #include "LogitechGLightsyncController.h" +#include "StringUtils.h" LogitechGLightsyncController::LogitechGLightsyncController(hid_device* dev_cmd_handle, hid_device *dev_handle, const char *path, unsigned char hid_dev_index, unsigned char hid_feature_index, unsigned char hid_fctn_ase_id) { @@ -54,10 +55,7 @@ std::string LogitechGLightsyncController::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 LogitechGLightsyncController::UpdateMouseLED( diff --git a/Controllers/LogitechController/LogitechGProKeyboardController/LogitechGProKeyboardController.cpp b/Controllers/LogitechController/LogitechGProKeyboardController/LogitechGProKeyboardController.cpp index 434519b2..baf7972f 100644 --- a/Controllers/LogitechController/LogitechGProKeyboardController/LogitechGProKeyboardController.cpp +++ b/Controllers/LogitechController/LogitechGProKeyboardController/LogitechGProKeyboardController.cpp @@ -11,6 +11,7 @@ #include #include "LogitechGProKeyboardController.h" +#include "StringUtils.h" LogitechGProKeyboardController::LogitechGProKeyboardController(hid_device* dev_handle_0x11, hid_device* dev_handle_0x12) { @@ -34,10 +35,7 @@ std::string LogitechGProKeyboardController::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 LogitechGProKeyboardController::Commit() diff --git a/Controllers/LogitechController/LogitechX56Controller/LogitechX56Controller.cpp b/Controllers/LogitechController/LogitechX56Controller/LogitechX56Controller.cpp index cb65d737..108cb05a 100644 --- a/Controllers/LogitechController/LogitechX56Controller/LogitechX56Controller.cpp +++ b/Controllers/LogitechController/LogitechX56Controller/LogitechX56Controller.cpp @@ -11,6 +11,7 @@ #include #include "LogitechX56Controller.h" +#include "StringUtils.h" LogitechX56Controller::LogitechX56Controller(hid_device* dev_handle, const char* path) { @@ -43,10 +44,7 @@ std::string LogitechX56Controller::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 LogitechX56Controller::SetColor(RGBColor color, uint8_t brightness)