summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-24 23:54:54 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-29 19:14:13 +0000
commit844382001f8deaa7fcc9faac779b24188f35329b (patch)
tree30253a96379774154edbaa35c0fb6f90ed788307 /src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
parent38e561011bb248ae9b803084eb66824588c7b22a (diff)
Replace Q_NULLPTR with nullptr
Change-Id: Ica194c2568465a94d851ddeaf62ca71b33fe4464 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent_osx.mm')
-rw-r--r--src/bluetooth/qbluetoothservicediscoveryagent_osx.mm8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
index f9e4afaf..e1e73a0c 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
@@ -152,7 +152,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::stopDeviceDiscovery()
Q_ASSERT_X(state == DeviceDiscovery, Q_FUNC_INFO, "invalid state");
deviceDiscoveryAgent->stop();
- deviceDiscoveryAgent.reset(Q_NULLPTR);
+ deviceDiscoveryAgent.reset(nullptr);
state = Inactive;
emit q_ptr->canceled();
@@ -268,7 +268,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::_q_deviceDiscoveryError(QBluetoothD
errorString = QCoreApplication::translate(DEV_DISCOVERY, DD_UNKNOWN_ERROR);
deviceDiscoveryAgent->stop();
- deviceDiscoveryAgent.reset(Q_NULLPTR);
+ deviceDiscoveryAgent.reset(nullptr);
state = QBluetoothServiceDiscoveryAgentPrivate::Inactive;
emit q_ptr->error(error);
@@ -283,12 +283,12 @@ void QBluetoothServiceDiscoveryAgentPrivate::_q_deviceDiscoveryFinished()
//Forward the device discovery error
error = static_cast<QBluetoothServiceDiscoveryAgent::Error>(deviceDiscoveryAgent->error());
errorString = deviceDiscoveryAgent->errorString();
- deviceDiscoveryAgent.reset(Q_NULLPTR);
+ deviceDiscoveryAgent.reset(nullptr);
state = Inactive;
emit q_ptr->error(error);
emit q_ptr->finished();
} else {
- deviceDiscoveryAgent.reset(Q_NULLPTR);
+ deviceDiscoveryAgent.reset(nullptr);
startServiceDiscovery();
}
}