From 8ea359ec8a62f6de8235cc1c516aa7c3d2e2a517 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Mon, 28 Dec 2020 20:33:09 +0100
Subject: [PATCH] Pass char16_t to QString::fromUtf16()

---
 src/device/macosdevicelister.mm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/device/macosdevicelister.mm b/src/device/macosdevicelister.mm
index 1b1d3133c..9e90424ae 100644
--- a/src/device/macosdevicelister.mm
+++ b/src/device/macosdevicelister.mm
@@ -591,11 +591,7 @@ void MacOsDeviceLister::USBDeviceAddedCallback(void* refcon, io_iterator_t it) {
 
       // The device actually returned something. That's a good sign.
       // Because this was designed by MS, the characters are in UTF-16 (LE?).
-      // FIXME
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-      QString str = QString::fromUtf16(reinterpret_cast<ushort*>(data.data() + 2), (data.size() / 2) - 2);
-#pragma GCC diagnostic pop
+      QString str = QString::fromUtf16(reinterpret_cast<char16_t*>(data.data() + 2), (data.size() / 2) - 2);
 
       if (str.startsWith("MSFT100")) {
         // We got the OS descriptor!