diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-09-14 01:35:38 +0400 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-09-16 09:11:36 +0000 |
| commit | ff59294c0d7a7464870a7a7d3bc1449c7a7695a7 (patch) | |
| tree | 083cd922b83fbebfee3ef113e82264e8b5795f67 /src | |
| parent | aa6cc482b09bf06d9baaaca1a02d600f8203c2a4 (diff) | |
A nano optimization to QLowEnergyService
Rearrange condition to fail earlier for an invalid service object.
Change-Id: I3ee0c611bab5610352ea4a058edd4af810212aaf
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/bluetooth/qlowenergyservice.cpp | 16 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergyservice_osx.mm | 9 |
2 files changed, 8 insertions, 17 deletions
diff --git a/src/bluetooth/qlowenergyservice.cpp b/src/bluetooth/qlowenergyservice.cpp index 07590943..67bd7c77 100644 --- a/src/bluetooth/qlowenergyservice.cpp +++ b/src/bluetooth/qlowenergyservice.cpp @@ -597,9 +597,7 @@ void QLowEnergyService::readCharacteristic( { Q_D(QLowEnergyService); - if (!contains(characteristic) - || state() != ServiceDiscovered - || !d->controller) { + if (d->controller == Q_NULLPTR || state() != ServiceDiscovered || !contains(characteristic)) { d->setError(QLowEnergyService::OperationError); return; } @@ -648,9 +646,7 @@ void QLowEnergyService::writeCharacteristic( //TODO check behavior when writing to WriteSigned characteristic Q_D(QLowEnergyService); - if (!contains(characteristic) - || state() != ServiceDiscovered - || !d->controller) { + if (d->controller == Q_NULLPTR || state() != ServiceDiscovered || !contains(characteristic)) { d->setError(QLowEnergyService::OperationError); return; } @@ -716,9 +712,7 @@ void QLowEnergyService::readDescriptor( { Q_D(QLowEnergyService); - if (!contains(descriptor) - || state() != ServiceDiscovered - || !d->controller) { + if (d->controller == Q_NULLPTR || state() != ServiceDiscovered || !contains(descriptor)) { d->setError(QLowEnergyService::OperationError); return; } @@ -750,9 +744,7 @@ void QLowEnergyService::writeDescriptor(const QLowEnergyDescriptor &descriptor, { Q_D(QLowEnergyService); - if (!contains(descriptor) - || state() != ServiceDiscovered - || !d->controller) { + if (d->controller == Q_NULLPTR || state() != ServiceDiscovered || !contains(descriptor)) { d->setError(QLowEnergyService::OperationError); return; } diff --git a/src/bluetooth/qlowenergyservice_osx.mm b/src/bluetooth/qlowenergyservice_osx.mm index b424dc96..78861dc1 100644 --- a/src/bluetooth/qlowenergyservice_osx.mm +++ b/src/bluetooth/qlowenergyservice_osx.mm @@ -185,7 +185,7 @@ bool QLowEnergyService::contains(const QLowEnergyCharacteristic &characteristic) void QLowEnergyService::readCharacteristic(const QLowEnergyCharacteristic &characteristic) { QLowEnergyControllerPrivateOSX *const controller = qt_mac_le_controller(d_ptr); - if (!contains(characteristic) || state() != ServiceDiscovered || !controller) { + if (controller == Q_NULLPTR || state() != ServiceDiscovered || !contains(characteristic)) { d_ptr->setError(OperationError); return; } @@ -198,8 +198,7 @@ void QLowEnergyService::writeCharacteristic(const QLowEnergyCharacteristic &ch, WriteMode mode) { QLowEnergyControllerPrivateOSX *const controller = qt_mac_le_controller(d_ptr); - - if (!contains(ch) || state() != ServiceDiscovered || !controller) { + if (controller == Q_NULLPTR || state() != ServiceDiscovered || !contains(ch)) { d_ptr->setError(QLowEnergyService::OperationError); return; } @@ -234,7 +233,7 @@ bool QLowEnergyService::contains(const QLowEnergyDescriptor &descriptor) const void QLowEnergyService::readDescriptor(const QLowEnergyDescriptor &descriptor) { QLowEnergyControllerPrivateOSX *const controller = qt_mac_le_controller(d_ptr); - if (!contains(descriptor) || state() != ServiceDiscovered || !controller) { + if (controller == Q_NULLPTR || state() != ServiceDiscovered || !contains(descriptor)) { d_ptr->setError(OperationError); return; } @@ -246,7 +245,7 @@ void QLowEnergyService::writeDescriptor(const QLowEnergyDescriptor &descriptor, const QByteArray &newValue) { QLowEnergyControllerPrivateOSX *const controller = qt_mac_le_controller(d_ptr); - if (!contains(descriptor) || state() != ServiceDiscovered || !controller) { + if (controller == Q_NULLPTR || state() != ServiceDiscovered || !contains(descriptor)) { d_ptr->setError(OperationError); return; } |