From 7bd860f2b768ac9f14fea7a55ad23092a9f4bba2 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 25 Feb 2018 00:17:33 +0100 Subject: Cleanup: Use QString as parameter for [get|save]BtDeviceInfo() Each callsite of saveBtDeviceInfo() has a QString, which is converted to a C-string, passed and immediately converted back. Remove these conversions by taking a reference to QString directly. getBtDeviceInfo() is not as clear. Here, the callsite has a C-string handed down from libdivecomputer. Nevertheless, pass a reference of QString here as well. Firstly, for reasons of symmetry. Secondly, to avoid multiple conversions in the getBtDeviceInfo() functions. Signed-off-by: Berthold Stoeger --- core/btdiscovery.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/btdiscovery.cpp') diff --git a/core/btdiscovery.cpp b/core/btdiscovery.cpp index b3aab4fb4..254088ec1 100644 --- a/core/btdiscovery.cpp +++ b/core/btdiscovery.cpp @@ -169,7 +169,7 @@ void BTDiscovery::btDeviceDiscovered(const QBluetoothDeviceInfo &device) // On mobile (iOS) the current ConnectionListModel does not support // additional data, so just save all discovered devices. - saveBtDeviceInfo(btDeviceAddress(&device, false).toUtf8().constData(), device); + saveBtDeviceInfo(btDeviceAddress(&device, false), device); #endif btDeviceDiscoveredMain(this_d); @@ -287,12 +287,12 @@ bool BTDiscovery::checkException(const char* method, const QAndroidJniObject *ob QHash btDeviceInfo; -void saveBtDeviceInfo(const char* devaddr, QBluetoothDeviceInfo deviceInfo) +void saveBtDeviceInfo(const QString &devaddr, QBluetoothDeviceInfo deviceInfo) { btDeviceInfo[devaddr] = deviceInfo; } -QBluetoothDeviceInfo getBtDeviceInfo(const char* devaddr) +QBluetoothDeviceInfo getBtDeviceInfo(const QString &devaddr) { if (btDeviceInfo.contains(devaddr)) return btDeviceInfo[devaddr]; -- cgit v1.2.3-70-g09d2