From 11adc3426e530f3c05372cf475826ea3fd3239fb Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 4 Jan 2016 20:09:16 -0200 Subject: [PATCH] Fix build for Android Signed-off-by: Tomaz Canabrava --- src/comm/BluetoothLink.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/comm/BluetoothLink.cc b/src/comm/BluetoothLink.cc index 1ab35f507..3f814b93b 100644 --- a/src/comm/BluetoothLink.cc +++ b/src/comm/BluetoothLink.cc @@ -158,10 +158,12 @@ bool BluetoothLink::_hardwareConnect() _discoveryAgent = NULL; } _discoveryAgent = new QBluetoothServiceDiscoveryAgent(this); - connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::serviceDiscovered, this, &BluetoothLink::serviceDiscovered); - connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::finished, this, &BluetoothLink::discoveryFinished); - connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::canceled, this, &BluetoothLink::discoveryFinished); - connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::error,this, BluetoothLink::discoveryError); + QObject::connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::serviceDiscovered, this, &BluetoothLink::serviceDiscovered); + QObject::connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::finished, this, &BluetoothLink::discoveryFinished); + QObject::connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::canceled, this, &BluetoothLink::discoveryFinished); + + QObject::connect(_discoveryAgent, static_cast(&QBluetoothServiceDiscoveryAgent::error), + this, &BluetoothLink::discoveryError); _shutDown = false; _discoveryAgent->start(); #else @@ -180,9 +182,12 @@ void BluetoothLink::_createSocket() } _targetSocket = new QBluetoothSocket(QBluetoothServiceInfo::RfcommProtocol, this); QObject::connect(_targetSocket, &QBluetoothSocket::connected, this, &BluetoothLink::deviceConnected); - QObject::connect(_targetSocket, &QBluetoothSocket::error, this, &BluetoothLink::deviceError); + QObject::connect(_targetSocket, &QBluetoothSocket::readyRead, this, &BluetoothLink::readBytes); QObject::connect(_targetSocket, &QBluetoothSocket::disconnected, this, &BluetoothLink::deviceDisconnected); + + QObject::connect(_targetSocket, static_cast(&QBluetoothSocket::error), + this, &BluetoothLink::deviceError); } #ifdef __ios__ -- 2.22.0