summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qlowenergyservice.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/bluetooth/qlowenergyservice.cpp')
-rw-r--r--src/bluetooth/qlowenergyservice.cpp16
1 files changed, 4 insertions, 12 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;
}