From 2225ca0ec4887065fe57b2949bd649cb9aa18d30 Mon Sep 17 00:00:00 2001
From: Adam Honse <calcprogrammer1@gmail.com>
Date: Mon, 29 Jul 2024 22:49:56 -0500
Subject: [PATCH] Fix wstring to string conversion warnings in
 GigabyteAorusLaptopControllercpp

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

diff --git a/Controllers/GigabyteAorusLaptopController/GigabyteAorusLaptopController.cpp b/Controllers/GigabyteAorusLaptopController/GigabyteAorusLaptopController.cpp
index 6b807b11..02409138 100644
--- a/Controllers/GigabyteAorusLaptopController/GigabyteAorusLaptopController.cpp
+++ b/Controllers/GigabyteAorusLaptopController/GigabyteAorusLaptopController.cpp
@@ -12,6 +12,7 @@
 #include <cmath>
 #include <string.h>
 #include "GigabyteAorusLaptopController.h"
+#include "StringUtils.h"
 
 /*---------------------------------------------------------*\
 | Indexed colors mapping                                    |
@@ -36,19 +37,6 @@ GigabyteAorusLaptopController::GigabyteAorusLaptopController(hid_device* dev_han
     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());
-    }
 }
 
 GigabyteAorusLaptopController::~GigabyteAorusLaptopController()
@@ -63,7 +51,15 @@ std::string GigabyteAorusLaptopController::GetDeviceLocation()
 
 std::string GigabyteAorusLaptopController::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 GigabyteAorusLaptopController::GetFirmwareVersion()
diff --git a/Controllers/GigabyteAorusLaptopController/GigabyteAorusLaptopController.h b/Controllers/GigabyteAorusLaptopController/GigabyteAorusLaptopController.h
index 0422e6cc..f6c305d2 100644
--- a/Controllers/GigabyteAorusLaptopController/GigabyteAorusLaptopController.h
+++ b/Controllers/GigabyteAorusLaptopController/GigabyteAorusLaptopController.h
@@ -69,6 +69,5 @@ private:
     unsigned char   GetColourIndex(unsigned char red, unsigned char green, unsigned char blue);
 
     std::string location;
-    std::string serial_number;
     std::string version;
 };