Ticket #60889: qt59-qtconnectivity-fix.diff

qtconnectivity-opensource-src-5.9.9/src/bluetooth/osx/osxbtledeviceinquiry.mm

@@ -139 +139 @@
 
 - (void)dealloc
 {
-    if (manager != NULL) {
+    if (manager) {
         [manager setDelegate:nil];
         if (internalState == InquiryActive)
             [manager stopScan];

qtconnectivity-opensource-src-5.9.9/src/bluetooth/osx/osxbtperipheralmanager.mm

@@ -313 +313 @@
 - (void)startAdvertising
 {
     state = PeripheralState::waitingForPowerOn;
-    if (manager != NULL)
+    if (manager)
         [manager setDelegate:nil];
     manager.reset([[CBPeripheralManager alloc] initWithDelegate:self
                    queue:OSXBluetooth::qt_LE_queue()]);
@@ -378 +378 @@
 
 - (void) addServicesToPeripheral
 {
-    Q_ASSERT(manager != NULL);
+    Q_ASSERT(manager);
 
     if (nextServiceToAdd < services.size())
         [manager addService:services[nextServiceToAdd++]];

qtconnectivity-opensource-src-5.9.9/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm

@@ -181 +181 @@
 
 QBluetoothDeviceDiscoveryAgentPrivate::~QBluetoothDeviceDiscoveryAgentPrivate()
 {
-    if (inquiryLE != NULL && agentState != NonActive) {
+    if (inquiryLE && agentState != NonActive) {
         // We want the LE scan to stop as soon as possible.
         if (dispatch_queue_t leQueue = OSXBluetooth::qt_LE_queue()) {
             // Local variable to be retained ...
@@ -195 +195 @@
 
 bool QBluetoothDeviceDiscoveryAgentPrivate::isValid() const
 {
-    return hostController != NULL && [hostController powerState] == kBluetoothHCIPowerStateON;
+    return hostController && [hostController powerState] == kBluetoothHCIPowerStateON;
 }
 
 bool QBluetoothDeviceDiscoveryAgentPrivate::isActive() const
@@ -292 +292 @@
 
     // Check queue and create scanner:
     inquiryLE.reset([[LEDeviceInquiryObjC alloc] initWithNotifier:notifier.data()]);
-    if (inquiryLE != NULL)
+    if (inquiryLE)
         notifier.take(); // Whatever happens next, inquiryLE is already the owner ...
 
     dispatch_queue_t leQueue(qt_LE_queue());

qtconnectivity-opensource-src-5.9.9/src/bluetooth/qbluetoothlocaldevice_osx.mm

@@ -149 +149 @@
 
 bool QBluetoothLocalDevicePrivate::isValid() const
 {
-    return hostController != NULL;
+    return hostController;
 }
 
 void QBluetoothLocalDevicePrivate::requestPairing(const QBluetoothAddress &address, Pairing pairing)

qtconnectivity-opensource-src-5.9.9/src/bluetooth/qbluetoothserver_osx.mm

@@ -142 +142 @@
 
 void QBluetoothServerPrivate::openNotify(IOBluetoothRFCOMMChannel *channel)
 {
-    Q_ASSERT_X(listener != NULL, Q_FUNC_INFO, "invalid listener (nil)");
+    Q_ASSERT_X(listener, Q_FUNC_INFO, "invalid listener (nil)");
     Q_ASSERT_X(channel, Q_FUNC_INFO, "invalid channel (nil)");
     Q_ASSERT_X(q_ptr, Q_FUNC_INFO, "invalid q_ptr (null)");
 
@@ -154 +154 @@
 
 void QBluetoothServerPrivate::openNotify(IOBluetoothL2CAPChannel *channel)
 {
-    Q_ASSERT_X(listener != NULL, Q_FUNC_INFO, "invalid listener (nil)");
+    Q_ASSERT_X(listener, Q_FUNC_INFO, "invalid listener (nil)");
     Q_ASSERT_X(channel, Q_FUNC_INFO, "invalid channel (nil)");
     Q_ASSERT_X(q_ptr, Q_FUNC_INFO, "invalid q_ptr (null)");
 
@@ -293 +293 @@
 
     OSXBluetooth::qt_test_iobluetooth_runloop();
 
-    if (d_ptr->listener != NULL) {
+    if (d_ptr->listener) {
         qCWarning(QT_BT_OSX) << "already in listen mode, close server first";
         return false;
     }

qtconnectivity-opensource-src-5.9.9/src/bluetooth/qbluetoothserviceinfo_osx.mm

@@ -172 +172 @@
     if (!registered)
         return false;
 
-    Q_ASSERT_X(serviceRecord != NULL, Q_FUNC_INFO, "service registered, but serviceRecord is nil");
+    Q_ASSERT_X(serviceRecord, Q_FUNC_INFO, "service registered, but serviceRecord is nil");
 
     [serviceRecord removeServiceRecord];
 

qtconnectivity-opensource-src-5.9.9/src/bluetooth/qbluetoothsocket_osx.mm

@@ -103 +103 @@
 
     if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
         rfcommChannel.reset([[ObjCRFCOMMChannel alloc] initWithDelegate:this]);
-        if (rfcommChannel != NULL)
+        if (rfcommChannel)
             status = [rfcommChannel connectAsyncToDevice:address withChannelID:port];
         else
             status = kIOReturnNoMemory;
     } else if (socketType == QBluetoothServiceInfo::L2capProtocol) {
         l2capChannel.reset([[ObjCL2CAPChannel alloc] initWithDelegate:this]);
-        if (l2capChannel != NULL)
+        if (l2capChannel)
             status = [l2capChannel connectAsyncToDevice:address withPSM:port];
         else
             status = kIOReturnNoMemory;
@@ -183 +183 @@
 
     NSString *nsName = nil;
     if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
-        if (rfcommChannel != NULL)
+        if (rfcommChannel)
             nsName = [rfcommChannel peerName];
     } else if (socketType == QBluetoothServiceInfo::L2capProtocol) {
-        if (l2capChannel != NULL)
+        if (l2capChannel)
             nsName = [l2capChannel peerName];
     }
 
@@ -200 +200 @@
 {
     BluetoothDeviceAddress addr = {};
     if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
-        if (rfcommChannel != NULL)
+        if (rfcommChannel)
             addr = [rfcommChannel peerAddress];
     } else if (socketType == QBluetoothServiceInfo::L2capProtocol) {
-        if (l2capChannel != NULL)
+        if (l2capChannel)
             addr = [l2capChannel peerAddress];
     }
 
@@ -213 +213 @@
 quint16 QBluetoothSocketPrivate::peerPort() const
 {
     if (socketType == QBluetoothServiceInfo::RfcommProtocol) {
-        if (rfcommChannel != NULL)
+        if (rfcommChannel)
             return [rfcommChannel getChannelID];
     } else if (socketType == QBluetoothServiceInfo::L2capProtocol) {
-        if (l2capChannel != NULL)
+        if (l2capChannel)
             return [l2capChannel getPSM];
     }
 
@@ -233 +233 @@
     Q_ASSERT_X(socketType == QBluetoothServiceInfo::L2capProtocol
                || socketType == QBluetoothServiceInfo::RfcommProtocol,
                Q_FUNC_INFO, "invalid socket type");
-    Q_ASSERT_X(l2capChannel != NULL || rfcommChannel != NULL, Q_FUNC_INFO,
+    Q_ASSERT_X(l2capChannel || rfcommChannel, Q_FUNC_INFO,
                "invalid socket (no open channel)");
     Q_ASSERT_X(q_ptr, Q_FUNC_INFO, "invalid q_ptr (null)");
 
@@ -277 +277 @@
 
     openMode = QIODevice::ReadWrite;
     rfcommChannel.reset([[ObjCRFCOMMChannel alloc] initWithDelegate:this channel:channel]);
-    if (rfcommChannel != NULL) {// We do not handle errors, up to an external user.
+    if (rfcommChannel) {// We do not handle errors, up to an external user.
         q_ptr->setOpenMode(QIODevice::ReadWrite);
         state = QBluetoothSocket::ConnectedState;
         socketType = QBluetoothServiceInfo::RfcommProtocol;
     }
 
-    return rfcommChannel != NULL;
+    return rfcommChannel;
 }
 
 bool QBluetoothSocketPrivate::setChannel(IOBluetoothL2CAPChannel *channel)
@@ -301 +301 @@
 
     openMode = QIODevice::ReadWrite;
     l2capChannel.reset([[ObjCL2CAPChannel alloc] initWithDelegate:this channel:channel]);
-    if (l2capChannel != NULL) {// We do not handle errors, up to an external user.
+    if (l2capChannel) {// We do not handle errors, up to an external user.
         q_ptr->setOpenMode(QIODevice::ReadWrite);
         state = QBluetoothSocket::ConnectedState;
         socketType = QBluetoothServiceInfo::L2capProtocol;
     }
 
-    return l2capChannel != NULL;
+    return l2capChannel;
 }
 
 

qtconnectivity-opensource-src-5.9.9/src/bluetooth/qbluetoothtransferreply_osx.mm

@@ -136 +136 @@
     // The OBEX session will be closed then. If
     // somehow IOBluetooth/OBEX still has a reference to our
     // session, it will not call any of delegate's callbacks.
-    if (session != NULL)
+    if (session)
         [session closeSession];
 }
 
 bool QBluetoothTransferReplyOSXPrivate::isActive() const
 {
-    return agent || (session != NULL && [session hasActiveRequest]);
+    return agent || (session && [session hasActiveRequest]);
 }
 
 bool QBluetoothTransferReplyOSXPrivate::startOPP(const QBluetoothAddress &device)
@@ -218 +218 @@
 void QBluetoothTransferReplyOSXPrivate::sendPut()
 {
     Q_ASSERT_X(inputStream, Q_FUNC_INFO, "invalid input stream (null)");
-    Q_ASSERT_X(session != NULL, Q_FUNC_INFO, "invalid OBEX session (nil)");
+    Q_ASSERT_X(session, Q_FUNC_INFO, "invalid OBEX session (nil)");
     Q_ASSERT_X([session isConnected], Q_FUNC_INFO, "not connected");
     Q_ASSERT_X(![session hasActiveRequest], Q_FUNC_INFO,
                "session already has an active request");
@@ -268 +268 @@
     Q_UNUSED(errorCode)
     Q_UNUSED(response)
 
-    if (session != NULL) {
+    if (session) {
         setReplyError(QBluetoothTransferReply::SessionError,
                       QCoreApplication::translate(TRANSFER_REPLY, TR_CONNECT_FAILED));
     } else {

qtconnectivity-opensource-src-5.9.9/src/bluetooth/qlowenergycontroller_osx.mm

@@ -200 +200 @@
 #ifdef Q_OS_TVOS
     return centralManager;
 #else
-    return centralManager != NULL || peripheralManager != NULL;
+    return centralManager || peripheralManager;
 #endif
 }