diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-07-04 16:13:44 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-07-15 11:22:23 +0200 |
| commit | c1286c3a344593c79feced5c782ff85bca80bfff (patch) | |
| tree | ee8e20e7971a2ab4453d3cac15f3a01d5c29ce82 /src/bluetooth/qbluetoothserver_osx.mm | |
| parent | de3e8e85cc5a442dbae966c6956c84ee434ad108 (diff) | |
QBluetoothSocket - deduplicate the code (macOS)
Implement the proper interface from QBluetoothSocketBasePrivate,
remove a dummy base class. Remove all public API from
qbluetoothsocket_osx.mm and re-use the code in qbluetoothsocket.cpp.
The code generally is the same, a bit of re-hashin/deletion.
Task-number: QTBUG-75348
Change-Id: I0034dfd283daf9d51775d8f9551b85d2d436aa85
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/bluetooth/qbluetoothserver_osx.mm')
| -rw-r--r-- | src/bluetooth/qbluetoothserver_osx.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothserver_osx.mm b/src/bluetooth/qbluetoothserver_osx.mm index 325381c8..9674331d 100644 --- a/src/bluetooth/qbluetoothserver_osx.mm +++ b/src/bluetooth/qbluetoothserver_osx.mm @@ -389,10 +389,10 @@ QBluetoothSocket *QBluetoothServer::nextPendingConnection() d_ptr->pendingConnections.pop_front(); if (d_ptr->serverType == ServiceInfo::RfcommProtocol) { - if (!newSocket->d_ptr->setChannel(channel.getAs<IOBluetoothRFCOMMChannel>())) + if (!static_cast<QBluetoothSocketPrivate *>(newSocket->d_ptr)->setRFCOMChannel(channel.getAs<IOBluetoothRFCOMMChannel>())) return nullptr; } else { - if (!newSocket->d_ptr->setChannel(channel.getAs<IOBluetoothL2CAPChannel>())) + if (!static_cast<QBluetoothSocketPrivate *>(newSocket->d_ptr)->setL2CAPChannel(channel.getAs<IOBluetoothL2CAPChannel>())) return nullptr; } |