diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-11-03 12:24:31 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-11-13 11:01:13 +0000 |
| commit | 32623c4686d069305c8f7e046038cfcc5817052a (patch) | |
| tree | ebf9b2ff3fafc54b8a9c0f65e2dc37b81cfac294 /src/bluetooth/qlowenergyservice.cpp | |
| parent | a8a4fae732dba2e3783236f4486acde60d03d997 (diff) | |
Convert most old-style QObject::connect() to pointer syntax
The remaining cases (e.g. in QBluetoothServiceDiscoveryAgent)
are connected to Q_PRIVATE_SLOT usage which requires a redesign.
Change-Id: I9227b5459b81228a7aa2660193d5b984c036b74f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/bluetooth/qlowenergyservice.cpp')
| -rw-r--r-- | src/bluetooth/qlowenergyservice.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/bluetooth/qlowenergyservice.cpp b/src/bluetooth/qlowenergyservice.cpp index 7e419e17..39de9d01 100644 --- a/src/bluetooth/qlowenergyservice.cpp +++ b/src/bluetooth/qlowenergyservice.cpp @@ -381,20 +381,20 @@ QLowEnergyService::QLowEnergyService(QSharedPointer<QLowEnergyServicePrivate> p, qRegisterMetaType<QLowEnergyService::ServiceType>(); qRegisterMetaType<QLowEnergyService::WriteMode>(); - connect(p.data(), SIGNAL(error(QLowEnergyService::ServiceError)), - this, SIGNAL(error(QLowEnergyService::ServiceError))); - connect(p.data(), SIGNAL(stateChanged(QLowEnergyService::ServiceState)), - this, SIGNAL(stateChanged(QLowEnergyService::ServiceState))); - connect(p.data(), SIGNAL(characteristicChanged(QLowEnergyCharacteristic,QByteArray)), - this, SIGNAL(characteristicChanged(QLowEnergyCharacteristic,QByteArray))); - connect(p.data(), SIGNAL(characteristicWritten(QLowEnergyCharacteristic,QByteArray)), - this, SIGNAL(characteristicWritten(QLowEnergyCharacteristic,QByteArray))); - connect(p.data(), SIGNAL(descriptorWritten(QLowEnergyDescriptor,QByteArray)), - this, SIGNAL(descriptorWritten(QLowEnergyDescriptor,QByteArray))); - connect(p.data(), SIGNAL(characteristicRead(QLowEnergyCharacteristic,QByteArray)), - this, SIGNAL(characteristicRead(QLowEnergyCharacteristic,QByteArray))); - connect(p.data(), SIGNAL(descriptorRead(QLowEnergyDescriptor,QByteArray)), - this, SIGNAL(descriptorRead(QLowEnergyDescriptor,QByteArray))); + connect(p.data(), &QLowEnergyServicePrivate::error, + this, QOverload<QLowEnergyService::ServiceError>::of(&QLowEnergyService::error)); + connect(p.data(), &QLowEnergyServicePrivate::stateChanged, + this, &QLowEnergyService::stateChanged); + connect(p.data(), &QLowEnergyServicePrivate::characteristicChanged, + this, &QLowEnergyService::characteristicChanged); + connect(p.data(), &QLowEnergyServicePrivate::characteristicWritten, + this, &QLowEnergyService::characteristicWritten); + connect(p.data(), &QLowEnergyServicePrivate::descriptorWritten, + this, &QLowEnergyService::descriptorWritten); + connect(p.data(), &QLowEnergyServicePrivate::characteristicRead, + this, &QLowEnergyService::characteristicRead); + connect(p.data(), &QLowEnergyServicePrivate::descriptorRead, + this, &QLowEnergyService::descriptorRead); } /*! |