From bb34aba76e7cf67956267f0e35d6c8eef9b86531 Mon Sep 17 00:00:00 2001
From: Adam Honse <calcprogrammer1@gmail.com>
Date: Mon, 29 Jul 2024 22:50:51 -0500
Subject: [PATCH] Fix wstring to string conversion warnings in
 GigabyteAorusMouseController.cpp

---
 .../GigabyteAorusMouseController.cpp          | 24 ++++++++-----------
 .../GigabyteAorusMouseController.h            |  1 -
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.cpp b/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.cpp
index 8be767ab..4754174d 100644
--- a/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.cpp
+++ b/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.cpp
@@ -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()
diff --git a/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.h b/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.h
index a19ce69c..45091c00 100644
--- a/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.h
+++ b/Controllers/GigabyteAorusMouseController/GigabyteAorusMouseController.h
@@ -54,6 +54,5 @@ private:
     hid_device* dev;
 
     std::string location;
-    std::string serial_number;
     std::string version;
 };