|
|
@ -140,9 +140,6 @@ bool BluetoothLink::_hardwareConnect() |
|
|
|
QObject::connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::serviceDiscovered, this, &BluetoothLink::serviceDiscovered); |
|
|
|
QObject::connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::serviceDiscovered, this, &BluetoothLink::serviceDiscovered); |
|
|
|
QObject::connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::finished, this, &BluetoothLink::discoveryFinished); |
|
|
|
QObject::connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::finished, this, &BluetoothLink::discoveryFinished); |
|
|
|
QObject::connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::canceled, this, &BluetoothLink::discoveryFinished); |
|
|
|
QObject::connect(_discoveryAgent, &QBluetoothServiceDiscoveryAgent::canceled, this, &BluetoothLink::discoveryFinished); |
|
|
|
|
|
|
|
|
|
|
|
QObject::connect(_discoveryAgent, static_cast<void (QBluetoothServiceDiscoveryAgent::*)(QBluetoothSocket::SocketError)>(&QBluetoothServiceDiscoveryAgent::error), |
|
|
|
|
|
|
|
this, &BluetoothLink::discoveryError); |
|
|
|
|
|
|
|
_shutDown = false; |
|
|
|
_shutDown = false; |
|
|
|
_discoveryAgent->start(); |
|
|
|
_discoveryAgent->start(); |
|
|
|
#else |
|
|
|
#else |
|
|
@ -170,14 +167,6 @@ void BluetoothLink::_createSocket() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#ifdef __ios__ |
|
|
|
#ifdef __ios__ |
|
|
|
void BluetoothLink::discoveryError(QBluetoothServiceDiscoveryAgent::Error error) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
qDebug() << "Discovery error:" << error; |
|
|
|
|
|
|
|
qDebug() << _discoveryAgent->errorString(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef __ios__ |
|
|
|
|
|
|
|
void BluetoothLink::serviceDiscovered(const QBluetoothServiceInfo& info) |
|
|
|
void BluetoothLink::serviceDiscovered(const QBluetoothServiceInfo& info) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if(!info.device().name().isEmpty() && !_targetSocket) |
|
|
|
if(!info.device().name().isEmpty() && !_targetSocket) |
|
|
|