diff options
author | Nedim Hadzic <nhadzic@blackberry.com> | 2013-10-23 17:33:36 +0200 |
---|---|---|
committer | Nedim Hadzic <nhadzic@blackberry.com> | 2013-11-11 17:33:15 +0100 |
commit | 658183e0b1b27b3c935a9a19f21de0e3e677a70b (patch) | |
tree | c927824d5c4768a0ebcf1172fa06aaef09286444 /src/bluetooth/qlowenergyserviceinfo_p.h | |
parent | ec61d7b9e82e6d653c02df14f34acdba8fc060db (diff) |
Additional constructors to QLowEnergyDescriptorInfo class and method modification in QLowEnergyCharacteristicInfo class.
Characteristic notification change and solving the warnings were implemented.
Change-Id: I8abec8b580e477578b4bc1dfd1e92e838ef7a372
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qlowenergyserviceinfo_p.h')
-rw-r--r-- | src/bluetooth/qlowenergyserviceinfo_p.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/bluetooth/qlowenergyserviceinfo_p.h b/src/bluetooth/qlowenergyserviceinfo_p.h index a71e09f2..e91a78bb 100644 --- a/src/bluetooth/qlowenergyserviceinfo_p.h +++ b/src/bluetooth/qlowenergyserviceinfo_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QGATTSERVICEINFO_P_H -#define QGATTSERVICEINFO_P_H +#ifndef QLOWENERGYSERVICEINFO_P_H +#define QLOWENERGYSERVICEINFO_P_H #include "qbluetoothuuid.h" #include "qlowenergyserviceinfo.h" #include "qlowenergycharacteristicinfo.h" @@ -61,7 +61,6 @@ class QLowEnergyProcess; class QLowEnergyServiceInfoPrivate: public QObject { Q_OBJECT - Q_DECLARE_PUBLIC(QLowEnergyServiceInfo) public: QLowEnergyServiceInfoPrivate(); @@ -88,6 +87,7 @@ public: QString endingHandle; QString path; QBluetoothAddress adapterAddress; + bool randomAddress; void connectToTerminal(); void setHandles(); void setCharacteristics(); @@ -120,13 +120,9 @@ private: int m_valueCounter; int m_readCounter; #endif - bool randomAddress; int m_instance; - -protected: - QLowEnergyServiceInfo *q_ptr; }; QT_END_NAMESPACE -#endif // QGATTSERVICEINFO_P_H +#endif // QLOWENERGYSERVICEINFO_P_H |