diff options
Diffstat (limited to 'src/bluetooth/qbluetoothtransferreply_osx.mm')
-rw-r--r-- | src/bluetooth/qbluetoothtransferreply_osx.mm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bluetooth/qbluetoothtransferreply_osx.mm b/src/bluetooth/qbluetoothtransferreply_osx.mm index 02133860..65c8f82d 100644 --- a/src/bluetooth/qbluetoothtransferreply_osx.mm +++ b/src/bluetooth/qbluetoothtransferreply_osx.mm @@ -75,14 +75,14 @@ public: private: // OBEX session delegate: - void OBEXConnectError(OBEXError errorCode, OBEXOpCode response) Q_DECL_OVERRIDE; - void OBEXConnectSuccess() Q_DECL_OVERRIDE; + void OBEXConnectError(OBEXError errorCode, OBEXOpCode response) override; + void OBEXConnectSuccess() override; - void OBEXAbortSuccess() Q_DECL_OVERRIDE; + void OBEXAbortSuccess() override; - void OBEXPutDataSent(quint32 current, quint32 total) Q_DECL_OVERRIDE; - void OBEXPutSuccess() Q_DECL_OVERRIDE; - void OBEXPutError(OBEXError error, OBEXOpCode response) Q_DECL_OVERRIDE; + void OBEXPutDataSent(quint32 current, quint32 total) override; + void OBEXPutSuccess() override; + void OBEXPutError(OBEXError error, OBEXOpCode response) override; QBluetoothTransferReplyOSX *q_ptr; @@ -394,7 +394,7 @@ bool QBluetoothTransferReplyOSX::abort() // Reset a delegate. [osx_d_ptr->session closeSession]; // Should never be called from an OBEX callback! - osx_d_ptr->session.reset(Q_NULLPTR); + osx_d_ptr->session.reset(nullptr); // Not setReplyError, we emit finished only! osx_d_ptr->requestComplete = true; |