From a76e09808905d280282a81958cb4c68f71f18ca4 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sat, 21 Feb 2015 10:37:25 +0100
Subject: o Consistence reference usage.

---
 ble/LinuxBluetooth.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'ble/LinuxBluetooth.cpp')

diff --git a/ble/LinuxBluetooth.cpp b/ble/LinuxBluetooth.cpp
index a5d092b..d62bf23 100644
--- a/ble/LinuxBluetooth.cpp
+++ b/ble/LinuxBluetooth.cpp
@@ -55,21 +55,21 @@ private:
 class LinuxBluetoothDevice : public DefaultBluetoothDevice<LinuxBluetoothAdapter> {
 public:
     LinuxBluetoothDevice(LinuxBluetoothAdapter &adapter, Mac &mac);
+
     ~LinuxBluetoothDevice();
 
     BluetoothGatt &connectGatt() override;
 
 private:
-    LinuxBluetoothGatt* gatt;
+    LinuxBluetoothGatt *gatt;
     int l2cap;
 };
 
-class LinuxBluetoothGatt : public DefaultBluetoothGatt {
+class LinuxBluetoothGatt : public DefaultBluetoothGatt<LinuxBluetoothDevice> {
 public:
     LinuxBluetoothGatt(LinuxBluetoothDevice &device, int l2cap);
-    ~LinuxBluetoothGatt();
 
-//    LinuxBluetoothDevice &getDevice() override;
+    ~LinuxBluetoothGatt();
 
     void connect() override;
 
@@ -84,7 +84,6 @@ private:
 
     ByteBuffer writeAndRead(ByteBuffer &out, shared_ptr<uint8_t> buffer, size_t size);
 
-    LinuxBluetoothDevice &device;
     int l2cap;
 };
 
@@ -131,7 +130,7 @@ BluetoothGatt &LinuxBluetoothDevice::connectGatt() {
 // -----------------------------------------------------------------------
 
 LinuxBluetoothGatt::LinuxBluetoothGatt(LinuxBluetoothDevice &device, int l2cap) :
-        device(device), l2cap(l2cap) {
+        DefaultBluetoothGatt(device), l2cap(l2cap) {
 }
 
 LinuxBluetoothGatt::~LinuxBluetoothGatt() {
-- 
cgit v1.2.3