First pass on an updated QLowEnergyCharacteristic class

This patch creates QLECharacteristic based on the old
QLECharacteristicInfo class. Some details
have been removed since they no longer apply and the class has been
integrated into QLEService QLEControllerNew and its data store.

This is still work in progress and the unit tests must still be
modified but it's already functional.

Change-Id: Id80c4f01fffd77cd225b49753c74c3336f8e127e
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/src/bluetooth/qlowenergyserviceprivate_p.h b/src/bluetooth/qlowenergyserviceprivate_p.h
index e2836fa4..16bfee5a 100644
--- a/src/bluetooth/qlowenergyserviceprivate_p.h
+++ b/src/bluetooth/qlowenergyserviceprivate_p.h
@@ -46,6 +46,7 @@
 #include <QtCore/QPointer>
 #include <QtBluetooth/qbluetooth.h>
 #include <QtBluetooth/QLowEnergyService>
+#include <QtBluetooth/QLowEnergyCharacteristic>
 
 #include "qlowenergycontrollernew_p.h"
 
@@ -58,6 +59,13 @@ public:
     explicit QLowEnergyServicePrivate(QObject *parent = 0);
     ~QLowEnergyServicePrivate();
 
+    struct CharData {
+        QLowEnergyHandle valueHandle;
+        QBluetoothUuid uuid;
+        QLowEnergyCharacteristic::PropertyTypes properties;
+        QByteArray value;
+    };
+
     void setController(QLowEnergyControllerNewPrivate* control);
     void setError(QLowEnergyService::ServiceError newError);
     void setState(QLowEnergyService::ServiceState newState);
@@ -66,8 +74,6 @@ signals:
     void stateChanged(QLowEnergyService::ServiceState newState);
     void error(QLowEnergyService::ServiceError error);
 
-public slots:
-
 public:
     QLowEnergyHandle startHandle;
     QLowEnergyHandle endHandle;
@@ -77,6 +83,8 @@ public:
     QLowEnergyService::ServiceState state;
     QLowEnergyService::ServiceError lastError;
 
+    QHash<QLowEnergyHandle, CharData> characteristicList;
+
     QPointer<QLowEnergyControllerNewPrivate> controller;
 };