diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2018-07-20 12:15:55 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2018-07-25 11:16:21 +0000 |
commit | 4aa30934473380793fb7bce38c9c8f6f235c9e4a (patch) | |
tree | 3b9a29050db1fcb24a2620b1287334f03acbf1f8 /src/bluetooth/qbluetoothsocket_p.h | |
parent | 40beb226dfe8c23f290d554d5449806e91227f7e (diff) |
Add QBluetoothSocketPrivate interface for WinRT
Task-number: QTBUG-68550
Change-Id: I14fe43fcbbbdd6950f05feda900643f6899daa24
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/bluetooth/qbluetoothsocket_p.h')
-rw-r--r-- | src/bluetooth/qbluetoothsocket_p.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/src/bluetooth/qbluetoothsocket_p.h b/src/bluetooth/qbluetoothsocket_p.h index d4839fb0..6eef56fb 100644 --- a/src/bluetooth/qbluetoothsocket_p.h +++ b/src/bluetooth/qbluetoothsocket_p.h @@ -55,12 +55,6 @@ #include "qbluetoothsocketbase_p.h" #include <QtGlobal> -QT_FORWARD_DECLARE_CLASS(QSocketNotifier) - -#ifdef QT_WINRT_BLUETOOTH -QT_FORWARD_DECLARE_CLASS(SocketWorker) -#endif - QT_BEGIN_NAMESPACE class QBluetoothSocketPrivate : public QBluetoothSocketBasePrivate @@ -91,12 +85,6 @@ public: qint64 writeData(const char *data, qint64 maxSize) override; qint64 readData(char *data, qint64 maxSize) override; -#if defined(QT_WINRT_BLUETOOTH) - bool setSocketDescriptor(Microsoft::WRL::ComPtr<ABI::Windows::Networking::Sockets::IStreamSocket> socket, - QBluetoothServiceInfo::Protocol socketType, - QBluetoothSocket::SocketState socketState = QBluetoothSocket::ConnectedState, - QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite) override; -#endif bool setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType, QBluetoothSocket::SocketState socketState = QBluetoothSocket::ConnectedState, QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite) override; @@ -104,31 +92,6 @@ public: qint64 bytesAvailable() const override; bool canReadLine() const override; qint64 bytesToWrite() const override; - -#ifdef QT_WINRT_BLUETOOTH - SocketWorker *m_worker; - - Microsoft::WRL::ComPtr<ABI::Windows::Networking::Sockets::IStreamSocket> m_socketObject; - Microsoft::WRL::ComPtr<ABI::Windows::Foundation::IAsyncAction> m_connectOp; - - QMutex m_readMutex; - - // Protected by m_readMutex. Written in addToPendingData (native callback) - QVector<QByteArray> m_pendingData; - - Q_INVOKABLE void addToPendingData(const QVector<QByteArray> &data); - -private slots: - void handleNewData(const QVector<QByteArray> &data); - void handleError(QBluetoothSocket::SocketError error); -#endif // QT_WINRT_BLUETOOTH - -private: - -#ifdef QT_WINRT_BLUETOOTH - HRESULT handleConnectOpFinished(ABI::Windows::Foundation::IAsyncAction *action, - ABI::Windows::Foundation::AsyncStatus status); -#endif }; QT_END_NAMESPACE |