Connect QLowEnergyService and QLowEnergyControllerNew classes

Ensures that the two classes have sufficient references to each other.
When the controller disconnects the related QLES classes should become
invalid.

Introduces an error flag for QLowEnergyService.

Change-Id: I28aee49e45f93c68c4ac69a5e489c0a3cc33dbf5
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

1 files changed, 17 insertions, 3 deletions

diff --git a/src/bluetooth/qlowenergyservice.h b/src/bluetooth/qlowenergyservice.h
index 20ff6c9c..03505e30 100644
--- a/src/bluetooth/qlowenergyservice.h
+++ b/src/bluetooth/qlowenergyservice.h
@@ -47,6 +47,7 @@
 QT_BEGIN_NAMESPACE
 
 class QLowEnergyServicePrivate;
+class QLowEnergyControllerNewPrivate;
 class Q_BLUETOOTH_EXPORT QLowEnergyService : public QObject
 {
     Q_OBJECT
@@ -56,6 +57,11 @@ public:
         IncludedService
     };
 
+    enum ServiceError {
+        NoError = 0,
+        ServiceNotValidError
+    };
+
     enum ServiceState {
         InvalidService = 0, // when underlying controller disconnects
         DiscoveryRequired,  // we know start/end handle but nothing more
@@ -76,22 +82,30 @@ public:
 
     void discoverDetails();
 
+    ServiceError error() const;
+
+
 Q_SIGNALS:
     void stateChanged(QLowEnergyService::ServiceState newState);
     void characteristicChanged(const QLowEnergyCharacteristicInfo &info,
                                const QByteArray &value);
     void descriptorChanged(const QLowEnergyDescriptorInfo &info,
                            const QByteArray &value);
+    void error(QLowEnergyService::ServiceError error);
 
 private:
     Q_DECLARE_PRIVATE(QLowEnergyService)
     QLowEnergyServicePrivate *d_ptr;
 
-    //somehow we need to connect this to QLowEnergyControllerNew
-    //which owns the communication
+    // the symbols below are used by QLowEnergyControllerNewPrivate
+    // TODO check whether there are other ways of accessing the internals
+    friend class QLowEnergyControllerNewPrivate;
+
     QLowEnergyService(const QBluetoothUuid &uuid,
                       QObject *parent = 0);
-    friend class QLowEnergyControllerNewPrivate;
+    void setController(QLowEnergyControllerNewPrivate* control);
+    void setError(QLowEnergyService::ServiceError newError);
+    void setState(QLowEnergyService::ServiceState newState);
 };
 
 QT_END_NAMESPACE