diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2019-08-05 11:28:30 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2019-08-12 08:09:19 +0200 |
| commit | cfc5eaa6904354fc3084659691a6f28a51bf2269 (patch) | |
| tree | da49c1c9717a03cdc2e69970ad4848e989e6bb8c /src/bluetooth/osx/osxbtrfcommchannel.mm | |
| parent | 8b7b52d66f2616040ca4aaae3f2732be96e19ab8 (diff) | |
| parent | 99db6526341e6f0f2a4798088c1f954cff013b7b (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/win"
Diffstat (limited to 'src/bluetooth/osx/osxbtrfcommchannel.mm')
| -rw-r--r-- | src/bluetooth/osx/osxbtrfcommchannel.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bluetooth/osx/osxbtrfcommchannel.mm b/src/bluetooth/osx/osxbtrfcommchannel.mm index 00b67ee0..d2d3e2f8 100644 --- a/src/bluetooth/osx/osxbtrfcommchannel.mm +++ b/src/bluetooth/osx/osxbtrfcommchannel.mm @@ -37,22 +37,22 @@ ** ****************************************************************************/ -#include "osxbtchanneldelegate_p.h" #include "osxbtrfcommchannel_p.h" #include "qbluetoothaddress.h" #include "osxbtutility_p.h" +#include "btdelegates_p.h" QT_USE_NAMESPACE @implementation QT_MANGLE_NAMESPACE(OSXBTRFCOMMChannel) { - QT_PREPEND_NAMESPACE(OSXBluetooth)::ChannelDelegate *delegate; + QT_PREPEND_NAMESPACE(DarwinBluetooth)::ChannelDelegate *delegate; IOBluetoothDevice *device; IOBluetoothRFCOMMChannel *channel; bool connected; } -- (id)initWithDelegate:(OSXBluetooth::ChannelDelegate *)aDelegate +- (id)initWithDelegate:(DarwinBluetooth::ChannelDelegate *)aDelegate { Q_ASSERT_X(aDelegate, Q_FUNC_INFO, "invalid delegate (null)"); @@ -66,7 +66,7 @@ QT_USE_NAMESPACE return self; } -- (id)initWithDelegate:(QT_PREPEND_NAMESPACE(OSXBluetooth::ChannelDelegate) *)aDelegate +- (id)initWithDelegate:(QT_PREPEND_NAMESPACE(DarwinBluetooth::ChannelDelegate) *)aDelegate channel:(IOBluetoothRFCOMMChannel *)aChannel { // This type of channel does not require connect, it's created with |