Unify the shared data types between controller and service class

This reduces the overhead and simplifies the data structures

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

1 files changed, 5 insertions, 9 deletions

diff --git a/src/bluetooth/qlowenergyservice.h b/src/bluetooth/qlowenergyservice.h
index 03505e30..4ea1dabb 100644
--- a/src/bluetooth/qlowenergyservice.h
+++ b/src/bluetooth/qlowenergyservice.h
@@ -95,17 +95,13 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QLowEnergyService)
-    QLowEnergyServicePrivate *d_ptr;
+    QSharedPointer<QLowEnergyServicePrivate> d_ptr;
 
-    // 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,
+    // QLowEnergyControllerNewPrivate is the factory for this class
+    friend class QLowEnergyControllerNew;
+    QLowEnergyService(QSharedPointer<QLowEnergyServicePrivate> p,
                       QObject *parent = 0);
-    void setController(QLowEnergyControllerNewPrivate* control);
-    void setError(QLowEnergyService::ServiceError newError);
-    void setState(QLowEnergyService::ServiceState newState);
+
 };
 
 QT_END_NAMESPACE