mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

import: turn C-string in device_data_t into std::strings

Browse source 
It was never clear what was a pointer to a static string from
libdivecomputer and what was allocated.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-02 21:26:22 +02:00 • committed by bstoeger
parent 0915c1ce43
commit 01306224ff
15 changed files with 120 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/qt-ble.h
View file

@ -23,17 +23,12 @@ class BLEObject : public QObject
Q_OBJECT
public:
BLEObject(QLowEnergyController *c, device_data_t *);
BLEObject(QLowEnergyController *c, device_data_t &);
~BLEObject();
inline void set_timeout(int value) { timeout = value; }
dc_status_t write(const void* data, size_t size, size_t *actual);
dc_status_t read(void* data, size_t size, size_t *actual);
inline dc_status_t get_name(char *res, size_t size)
{
if (!device->btname) return DC_STATUS_UNSUPPORTED;
strncpy(res, device->btname, size);
return DC_STATUS_SUCCESS;
}
dc_status_t get_name(char *res, size_t size);
dc_status_t poll(int timeout);
inline QLowEnergyService *preferredService() { return preferred; }
@ -51,11 +46,11 @@ public slots:
private:
QVector<QLowEnergyService *> services;
QLowEnergyController *controller = nullptr;
QLowEnergyController *controller;
QLowEnergyService *preferred = nullptr;
QList<QByteArray> receivedPackets;
bool isCharacteristicWritten;
device_data_t *device;
device_data_t &device;
unsigned int hw_credit = 0;
unsigned int desc_written = 0;
int timeout;