winrt: Move byteArrayFromBuffer into qbluetoothutils_winrt

That code has been (unneededly) duplicated several times. We should have
that helper function just once.

Change-Id: I28fc9c5f7f7218b7870dc30bec228c9af8c6b090
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

1 files changed, 1 insertions, 31 deletions

diff --git a/src/bluetooth/qlowenergycontroller_winrt_new.cpp b/src/bluetooth/qlowenergycontroller_winrt_new.cpp
index 5501c4f3..45a80252 100644
--- a/src/bluetooth/qlowenergycontroller_winrt_new.cpp
+++ b/src/bluetooth/qlowenergycontroller_winrt_new.cpp
@@ -39,6 +39,7 @@
 
 #include "qlowenergycontroller_winrt_new_p.h"
 #include "qlowenergycontroller_winrt_p.h"
+#include "qbluetoothutils_winrt_p.h"
 
 #include <QtBluetooth/QLowEnergyCharacteristicData>
 #include <QtBluetooth/QLowEnergyDescriptorData>
@@ -119,37 +120,6 @@ QLowEnergyControllerPrivate *createWinRTLowEnergyController()
     return new QLowEnergyControllerPrivateWinRT();
 }
 
-static QByteArray byteArrayFromBuffer(const ComPtr<IBuffer> &buffer, bool isWCharString = false)
-{
-    if (!buffer) {
-        qCWarning(QT_BT_WINRT) << "nullptr passed to byteArrayFromBuffer";
-        return QByteArray();
-    }
-    ComPtr<Windows::Storage::Streams::IBufferByteAccess> byteAccess;
-    HRESULT hr = buffer.As(&byteAccess);
-    if (FAILED(hr)) {
-        qCWarning(QT_BT_WINRT) << "Could not cast Buffer to ByteAccess";
-        return QByteArray();
-    }
-    char *data;
-    hr = byteAccess->Buffer(reinterpret_cast<byte **>(&data));
-    if (FAILED(hr)) {
-        qCWarning(QT_BT_WINRT) << "Could not obtain buffer data";
-        return QByteArray();
-    }
-    UINT32 size;
-    hr = buffer->get_Length(&size);
-    if (FAILED(hr)) {
-        qCWarning(QT_BT_WINRT) << "Could not obtain buffer length";
-        return QByteArray();
-    }
-    if (isWCharString) {
-        QString valueString = QString::fromUtf16(reinterpret_cast<ushort *>(data)).left(size / 2);
-        return valueString.toUtf8();
-    }
-    return QByteArray(data, int(size));
-}
-
 static QByteArray byteArrayFromGattResult(const ComPtr<IGattReadResult> &gattResult,
                                           bool isWCharString = false)
 {