diff options
author | Kevin Funk <kfunk@kde.org> | 2017-09-24 23:54:54 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-29 19:14:13 +0000 |
commit | 844382001f8deaa7fcc9faac779b24188f35329b (patch) | |
tree | 30253a96379774154edbaa35c0fb6f90ed788307 /src/bluetooth/osx/osxbtobexsession.mm | |
parent | 38e561011bb248ae9b803084eb66824588c7b22a (diff) |
Replace Q_NULLPTR with nullptr
Change-Id: Ica194c2568465a94d851ddeaf62ca71b33fe4464
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/bluetooth/osx/osxbtobexsession.mm')
-rw-r--r-- | src/bluetooth/osx/osxbtobexsession.mm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/bluetooth/osx/osxbtobexsession.mm b/src/bluetooth/osx/osxbtobexsession.mm index b8e604c8..e228d6db 100644 --- a/src/bluetooth/osx/osxbtobexsession.mm +++ b/src/bluetooth/osx/osxbtobexsession.mm @@ -489,11 +489,11 @@ QT_USE_NAMESPACE const OBEXError status = [session OBEXConnect:kOBEXConnectFlagNone maxPacketLength:[QT_MANGLE_NAMESPACE(OSXBTOBEXSession) maxPacketLength] - optionalHeaders:Q_NULLPTR + optionalHeaders:nullptr optionalHeadersLength:0 eventSelector:@selector(OBEXConnectHandler:) selectorTarget:self - refCon:Q_NULLPTR]; + refCon:nullptr]; if (status != kOBEXSuccess) { currentRequest = OSXBluetooth::OBEXNoop; @@ -572,11 +572,11 @@ QT_USE_NAMESPACE return kOBEXSessionNotConnectedError; currentRequest = OBEXAbort; - const OBEXError status = [session OBEXAbort:Q_NULLPTR + const OBEXError status = [session OBEXAbort:nullptr optionalHeadersLength:0 eventSelector:@selector(OBEXAbortHandler:) selectorTarget:self - refCon:Q_NULLPTR]; + refCon:nullptr]; if (status != kOBEXSuccess) currentRequest = OBEXNoop; @@ -677,7 +677,7 @@ QT_USE_NAMESPACE bodyDataLength:[chunk length] eventSelector:@selector(OBEXPutHandler:) selectorTarget:self - refCon:Q_NULLPTR]; + refCon:nullptr]; if (status == kOBEXSuccess) { if (delegate && fileSize && !input->isSequential()) @@ -737,16 +737,16 @@ QT_USE_NAMESPACE return; } - void *dataPtr = chunk ? [chunk mutableBytes] : Q_NULLPTR; + void *dataPtr = chunk ? [chunk mutableBytes] : nullptr; const NSUInteger dataSize = chunk ? [chunk length] : 0; const OBEXError status = [session OBEXPut:lastChunk - headersData:Q_NULLPTR + headersData:nullptr headersDataLength:0 bodyData:dataPtr bodyDataLength:dataSize eventSelector:@selector(OBEXPutHandler:) selectorTarget:self - refCon:Q_NULLPTR]; + refCon:nullptr]; if (status != kOBEXSuccess) { qCWarning(QT_BT_OSX) << "failed to send the next memory chunk"; @@ -778,11 +778,11 @@ QT_USE_NAMESPACE currentRequest = OSXBluetooth::OBEXDisconnect; - [session OBEXDisconnect:Q_NULLPTR + [session OBEXDisconnect:nullptr optionalHeadersLength:0 eventSelector:@selector(OBEXDisconnectHandler:) selectorTarget:self - refCon:Q_NULLPTR]; + refCon:nullptr]; } - (void)OBEXDisconnectHandler:(const OBEXSessionEvent*)event @@ -806,7 +806,7 @@ QT_USE_NAMESPACE // Clear the delegate and reset the request, // do not try any of OBEX commands - the session will be deleted // immediately. - delegate = Q_NULLPTR; + delegate = nullptr; // This will stop any handler (callback) preventing // any read/write to potentially deleted objects. currentRequest = OSXBluetooth::OBEXNoop; |