diff options
author | Petre Eftime <[email protected]> | 2016-01-12 12:17:26 +0200 |
---|---|---|
committer | Petre Eftime <[email protected]> | 2016-01-26 17:09:49 +0200 |
commit | 19dd2319b393f7e5ec0610336a6e5741b46c9a4c (patch) | |
tree | c3ab043de6a757e107754041fd4a11ab7c995c89 | |
parent | 86a1fb0b6e18bf97f253c84be8526e5196389d1a (diff) |
Fix compilation warnings
Signed-off-by: Petre Eftime <[email protected]>
-rw-r--r-- | examples/hellotinyb.cpp | 2 | ||||
-rw-r--r-- | src/BluetoothAdapter.cpp | 1 | ||||
-rw-r--r-- | src/BluetoothDevice.cpp | 1 | ||||
-rw-r--r-- | src/BluetoothGattCharacteristic.cpp | 1 | ||||
-rw-r--r-- | src/BluetoothGattService.cpp | 1 | ||||
-rw-r--r-- | src/BluetoothManager.cpp | 14 |
6 files changed, 1 insertions, 19 deletions
diff --git a/examples/hellotinyb.cpp b/examples/hellotinyb.cpp index aeaf94a1..59246c83 100644 --- a/examples/hellotinyb.cpp +++ b/examples/hellotinyb.cpp @@ -154,7 +154,7 @@ int main(int argc, char **argv) data = response.data(); std::cout << "Raw data=["; - for (int i = 0; i < response.size(); i++) + for (unsigned i = 0; i < response.size(); i++) std::cout << std::hex << static_cast<int>(data[i]) << ", "; std::cout << "] "; diff --git a/src/BluetoothAdapter.cpp b/src/BluetoothAdapter.cpp index 4369e58a..821e3c37 100644 --- a/src/BluetoothAdapter.cpp +++ b/src/BluetoothAdapter.cpp @@ -93,7 +93,6 @@ std::unique_ptr<BluetoothAdapter> BluetoothAdapter::make(Object *object, std::vector<std::unique_ptr<BluetoothDevice>> BluetoothAdapter::get_devices() { std::vector<std::unique_ptr<BluetoothDevice>> vector; - BluetoothManager *manager = BluetoothManager::get_bluetooth_manager(); GList *l, *objects = g_dbus_object_manager_get_objects(gdbus_manager); for (l = objects; l != NULL; l = l->next) { diff --git a/src/BluetoothDevice.cpp b/src/BluetoothDevice.cpp index 9b5e0100..cf3a59d4 100644 --- a/src/BluetoothDevice.cpp +++ b/src/BluetoothDevice.cpp @@ -93,7 +93,6 @@ BluetoothDevice *BluetoothDevice::clone() const std::vector<std::unique_ptr<BluetoothGattService>> BluetoothDevice::get_services() { std::vector<std::unique_ptr<BluetoothGattService>> vector; - BluetoothManager *manager = BluetoothManager::get_bluetooth_manager(); GList *l, *objects = g_dbus_object_manager_get_objects(gdbus_manager); for (l = objects; l != NULL; l = l->next) { diff --git a/src/BluetoothGattCharacteristic.cpp b/src/BluetoothGattCharacteristic.cpp index 2af7c822..9f0867dc 100644 --- a/src/BluetoothGattCharacteristic.cpp +++ b/src/BluetoothGattCharacteristic.cpp @@ -222,7 +222,6 @@ std::vector<std::string> BluetoothGattCharacteristic::get_flags () std::vector<std::unique_ptr<BluetoothGattDescriptor>> BluetoothGattCharacteristic::get_descriptors () { std::vector<std::unique_ptr<BluetoothGattDescriptor>> vector; - BluetoothManager *manager = BluetoothManager::get_bluetooth_manager(); GList *l, *objects = g_dbus_object_manager_get_objects(gdbus_manager); for (l = objects; l != NULL; l = l->next) { diff --git a/src/BluetoothGattService.cpp b/src/BluetoothGattService.cpp index cd6b83a1..c1d35be8 100644 --- a/src/BluetoothGattService.cpp +++ b/src/BluetoothGattService.cpp @@ -127,7 +127,6 @@ bool BluetoothGattService::get_primary () std::vector<std::unique_ptr<BluetoothGattCharacteristic>> BluetoothGattService::get_characteristics () { std::vector<std::unique_ptr<BluetoothGattCharacteristic>> vector; - BluetoothManager *manager = BluetoothManager::get_bluetooth_manager(); GList *l, *objects = g_dbus_object_manager_get_objects(gdbus_manager); for (l = objects; l != NULL; l = l->next) { diff --git a/src/BluetoothManager.cpp b/src/BluetoothManager.cpp index b3a97a85..2e540b19 100644 --- a/src/BluetoothManager.cpp +++ b/src/BluetoothManager.cpp @@ -43,9 +43,6 @@ public: GDBusInterface *interface, gpointer user_data) { GDBusInterfaceInfo *info = g_dbus_interface_get_info(interface); BluetoothType type = BluetoothType::NONE; - std::string *name = NULL; - std::string *identifier = NULL; - BluetoothObject *bobj = NULL; /* Unknown interface, ignore */ if (info == NULL) @@ -53,34 +50,23 @@ public: if(IS_GATT_SERVICE1_PROXY(interface)) { type = BluetoothType::GATT_SERVICE; - bobj = new BluetoothGattService(GATT_SERVICE1(object)); - g_print("Object %s - Interface added: %s\n", g_dbus_object_get_object_path(object), info->name); } else if(IS_GATT_CHARACTERISTIC1_PROXY(interface)) { type = BluetoothType::GATT_CHARACTERISTIC; - bobj = new BluetoothGattCharacteristic(GATT_CHARACTERISTIC1(object)); - g_print("Object %s - Interface added: %s\n", g_dbus_object_get_object_path(object), info->name); } else if(IS_GATT_DESCRIPTOR1_PROXY(interface)) { type = BluetoothType::GATT_DESCRIPTOR; - bobj = new BluetoothGattDescriptor(GATT_DESCRIPTOR1(object)); - g_print("Object %s - Interface added: %s\n", g_dbus_object_get_object_path(object), info->name); } else if(IS_DEVICE1_PROXY(interface)) { type = BluetoothType::DEVICE; - bobj = new BluetoothDevice(DEVICE1(object)); - g_print("Object %s - Interface added: %s\n", g_dbus_object_get_object_path(object), info->name); } else if(IS_ADAPTER1_PROXY(interface)) { type = BluetoothType::ADAPTER; - bobj = new BluetoothAdapter(ADAPTER1(object)); - g_print("Object %s - Interface added: %s\n", g_dbus_object_get_object_path(object), info->name); } if (type == BluetoothType::NONE) /* It does not match anything */ return; - //BluetoothEvent event = BluetoothEvent(type, ); } static void on_object_added (GDBusObjectManager *manager, |