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/qlowenergyservice.cpp | |
| parent | 38e561011bb248ae9b803084eb66824588c7b22a (diff) | |
Replace Q_NULLPTR with nullptr
Change-Id: Ica194c2568465a94d851ddeaf62ca71b33fe4464
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/bluetooth/qlowenergyservice.cpp')
| -rw-r--r-- | src/bluetooth/qlowenergyservice.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bluetooth/qlowenergyservice.cpp b/src/bluetooth/qlowenergyservice.cpp index 9d3129fd..35a3a7d0 100644 --- a/src/bluetooth/qlowenergyservice.cpp +++ b/src/bluetooth/qlowenergyservice.cpp @@ -632,7 +632,7 @@ void QLowEnergyService::readCharacteristic( { Q_D(QLowEnergyService); - if (d->controller == Q_NULLPTR || state() != ServiceDiscovered || !contains(characteristic)) { + if (d->controller == nullptr || state() != ServiceDiscovered || !contains(characteristic)) { d->setError(QLowEnergyService::OperationError); return; } @@ -703,7 +703,7 @@ void QLowEnergyService::writeCharacteristic( //TODO check behavior when writing to WriteSigned characteristic Q_D(QLowEnergyService); - if (d->controller == Q_NULLPTR + if (d->controller == nullptr || (d->controller->role == QLowEnergyController::CentralRole && state() != ServiceDiscovered) || !contains(characteristic)) { @@ -762,7 +762,7 @@ void QLowEnergyService::readDescriptor( { Q_D(QLowEnergyService); - if (d->controller == Q_NULLPTR || state() != ServiceDiscovered || !contains(descriptor)) { + if (d->controller == nullptr || state() != ServiceDiscovered || !contains(descriptor)) { d->setError(QLowEnergyService::OperationError); return; } @@ -804,7 +804,7 @@ void QLowEnergyService::writeDescriptor(const QLowEnergyDescriptor &descriptor, { Q_D(QLowEnergyService); - if (d->controller == Q_NULLPTR + if (d->controller == nullptr || (d->controller->role == QLowEnergyController::CentralRole && state() != ServiceDiscovered) || !contains(descriptor)) { |