diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-02-25 00:17:33 +0100 |
|---|---|---|
| committer |  Jan Mulder <jlmulder@xs4all.nl> | 2018-02-26 08:52:34 +0100 |
| commit | 7bd860f2b768ac9f14fea7a55ad23092a9f4bba2 (patch) | |
| tree | 0df83dd12c2d9a8ea03de6f9e53932d56d642ae5 /core | |
| parent | d9c0df01424268ca7ba568279f08683f2c98aa44 (diff) | |
| download | subsurface-7bd860f2b768ac9f14fea7a55ad23092a9f4bba2.tar.gz | |
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 <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/btdiscovery.cpp | 6 | ||||
| -rw-r--r-- | core/btdiscovery.h | 4 | ||||
| -rw-r--r-- | core/qt-ble.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
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<QString, QBluetoothDeviceInfo> 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]; diff --git a/core/btdiscovery.h b/core/btdiscovery.h index 7a9e9c655..212585688 100644 --- a/core/btdiscovery.h +++ b/core/btdiscovery.h @@ -16,8 +16,8 @@ #include <QAndroidJniEnvironment> #endif -void saveBtDeviceInfo(const char* devaddr, QBluetoothDeviceInfo deviceInfo); -QBluetoothDeviceInfo getBtDeviceInfo(const char* devaddr); +void saveBtDeviceInfo(const QString &devaddr, QBluetoothDeviceInfo deviceInfo); +QBluetoothDeviceInfo getBtDeviceInfo(const QString &devaddr); class BTDiscovery : public QObject { Q_OBJECT diff --git a/core/qt-ble.cpp b/core/qt-ble.cpp index 5836c93af..b39bd5331 100644 --- a/core/qt-ble.cpp +++ b/core/qt-ble.cpp @@ -298,7 +298,7 @@ dc_status_t qt_ble_open(dc_custom_io_t *io, dc_context_t *context, const char *d qputenv("QT_DEFAULT_CENTRAL_SERVICES", "1"); #if defined(Q_OS_MACOS) || defined(Q_OS_IOS) - QBluetoothDeviceInfo remoteDevice = getBtDeviceInfo(devaddr); + QBluetoothDeviceInfo remoteDevice = getBtDeviceInfo(QString(devaddr)); QLowEnergyController *controller = QLowEnergyController::createCentral(remoteDevice); #else // this is deprecated but given that we don't use Qt to scan for |