diff options
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm')
-rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm index 7f037596..fed33bb2 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm @@ -90,7 +90,7 @@ public: QBluetoothDeviceDiscoveryAgentPrivate(const QBluetoothAddress & address, QBluetoothDeviceDiscoveryAgent *q); - ~QBluetoothDeviceDiscoveryAgentPrivate() Q_DECL_OVERRIDE; + ~QBluetoothDeviceDiscoveryAgentPrivate() override; bool isValid() const; bool isActive() const; @@ -108,9 +108,9 @@ private: }; // DeviceInquiryDelegate: - void inquiryFinished(IOBluetoothDeviceInquiry *inq) Q_DECL_OVERRIDE; - void error(IOBluetoothDeviceInquiry *inq, IOReturn error) Q_DECL_OVERRIDE; - void deviceFound(IOBluetoothDeviceInquiry *inq, IOBluetoothDevice *device) Q_DECL_OVERRIDE; + void inquiryFinished(IOBluetoothDeviceInquiry *inq) override; + void error(IOBluetoothDeviceInquiry *inq, IOReturn error) override; + void deviceFound(IOBluetoothDeviceInquiry *inq, IOBluetoothDevice *device) override; void LEinquiryFinished(); void LEinquiryError(QBluetoothDeviceDiscoveryAgent::Error error); @@ -168,7 +168,7 @@ QBluetoothDeviceDiscoveryAgentPrivate::QBluetoothDeviceDiscoveryAgentPrivate(con { registerQDeviceDiscoveryMetaType(); - Q_ASSERT_X(q != Q_NULLPTR, Q_FUNC_INFO, "invalid q_ptr (null)"); + Q_ASSERT_X(q != nullptr, Q_FUNC_INFO, "invalid q_ptr (null)"); HostController controller([[IOBluetoothHostController defaultController] retain]); if (!controller || [controller powerState] != kBluetoothHCIPowerStateON) { |