diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-06-02 15:27:17 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-06-03 06:26:55 +0000 |
| commit | 23639ab07278ecae1b12f49da1cee2460c80f335 (patch) | |
| tree | 2eaa19dc66d90b90eeee2b0db90cb1196be42dc2 /src/bluetooth/qbluetoothlocaldevice_osx.mm | |
| parent | 62d488b5afdc0cf2e7d630b10eeccdcecdee7425 (diff) | |
QtBluetooth - get rid of outdated Q_FUNC_INFO use pattern
No Q_FUNC_INFO in qCDebug/Warning/Critical needed anymore.
Change-Id: I0e47ccc7ffa971b8277b8d742e00319f4acef2f7
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice_osx.mm')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_osx.mm | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice_osx.mm b/src/bluetooth/qbluetoothlocaldevice_osx.mm index 1d58363d..9fa060d2 100644 --- a/src/bluetooth/qbluetoothlocaldevice_osx.mm +++ b/src/bluetooth/qbluetoothlocaldevice_osx.mm @@ -119,29 +119,25 @@ QBluetoothLocalDevicePrivate::QBluetoothLocalDevicePrivate(QBluetoothLocalDevice HostController defaultController([[IOBluetoothHostController defaultController] retain]); if (!defaultController) { - qCCritical(QT_BT_OSX) << Q_FUNC_INFO << "failed to " - "init a host controller object"; + qCCritical(QT_BT_OSX) << "failed to init a host controller object"; return; } if (!address.isNull()) { NSString *const hciAddress = [defaultController addressAsString]; if (!hciAddress) { - qCCritical(QT_BT_OSX) << Q_FUNC_INFO << "failed to " - "obtain an address"; + qCCritical(QT_BT_OSX) << "failed to obtain an address"; return; } BluetoothDeviceAddress iobtAddress = {}; if (IOBluetoothNSStringToDeviceAddress(hciAddress, &iobtAddress) != kIOReturnSuccess) { - qCCritical(QT_BT_OSX) << Q_FUNC_INFO << "invalid " - "local device's address"; + qCCritical(QT_BT_OSX) << "invalid local device's address"; return; } if (address != OSXBluetooth::qt_address(&iobtAddress)) { - qCCritical(QT_BT_OSX) << Q_FUNC_INFO << "invalid " - "local device's address"; + qCCritical(QT_BT_OSX) << "invalid local device's address"; return; } } @@ -184,8 +180,7 @@ void QBluetoothLocalDevicePrivate::requestPairing(const QBluetoothAddress &addre if ([device isPaired]) { emitPairingFinished(address, pairing, true); } else if ([pos.value() start] != kIOReturnSuccess) { - qCCritical(QT_BT_OSX) << Q_FUNC_INFO << "failed to " - "start a new pairing request"; + qCCritical(QT_BT_OSX) << "failed to start a new pairing request"; emitError(QBluetoothLocalDevice::PairingError, true); } return; @@ -196,8 +191,7 @@ void QBluetoothLocalDevicePrivate::requestPairing(const QBluetoothAddress &addre // it'll just finish with success (skipping any intermediate steps). PairingRequest newRequest([[ObjCPairingRequest alloc] initWithTarget:address delegate:this], false); if (!newRequest) { - qCCritical(QT_BT_OSX) << Q_FUNC_INFO << "failed to " - "allocate a new pairing request"; + qCCritical(QT_BT_OSX) << "failed to allocate a new pairing request"; emitError(QBluetoothLocalDevice::PairingError, true); return; } @@ -206,8 +200,7 @@ void QBluetoothLocalDevicePrivate::requestPairing(const QBluetoothAddress &addre const IOReturn result = [newRequest start]; if (result != kIOReturnSuccess) { pairingRequests.erase(pos); - qCCritical(QT_BT_OSX) << Q_FUNC_INFO << "failed to " - "start a new pairing request"; + qCCritical(QT_BT_OSX) << "failed to start a new pairing request"; emitError(QBluetoothLocalDevice::PairingError, true); } } |