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

computer configuration: use value semantics for DeviceDetails

Browse source 
The memory managements for DeviceDetails was very sketchy.
First of all, sharing a pointer to a structure between threads
seems like a recipe for disaster. Secondly, the structure was
a QObject and when first generated included in the (silly)
Qt object tree, but when generated in the threads it was not.
Clearly, this leaks.

Instead, use value semantics and use local copies of the
structure. I didn't go full length and use std::move to
move the data, because this doesn't work through signals
(which are the wrong abstraction here, but OK) and secondly
I didn't have time to analyze whether the caller still
needs the data after passing it down to the worker thread.

To be able to pass an object through signals, the class
has to be registered in the Qt MetaType system. Super
ugly, but fine for now. Ultimately, this whole thing should
probably be replaced by futures, co-routines, or whatever.

Moreover, this removes the prefix from  number of "m_*"
function parameters. By convention, "m_" marks member
variables, which function parameters are not.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

make DeviceDetails a metatype

So that we can pass it as value through the signal/slot system.
(squash with original commit)

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-03-16 09:29:54 +01:00 • committed by bstoeger
parent 322c1b56b2
commit 8733828380
9 changed files with 861 additions and 865 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/configuredivecomputer.h
View file

@ -32,10 +32,10 @@ public:
QString lastError;
states currentState;
void saveDeviceDetails(DeviceDetails *details, device_data_t *data);
void saveDeviceDetails(const DeviceDetails &details, device_data_t *data);
void fetchDeviceDetails();
bool saveXMLBackup(const QString &fileName, DeviceDetails *details, device_data_t *data);
bool restoreXMLBackup(const QString &fileName, DeviceDetails *details);
bool saveXMLBackup(const QString &fileName, const DeviceDetails &details, device_data_t *data);
bool restoreXMLBackup(const QString &fileName, DeviceDetails &details);
void startFirmwareUpdate(const QString &fileName, device_data_t *data, bool forceUpdate);
void resetSettings(device_data_t *data);
@ -48,7 +48,7 @@ signals:
void message(QString msg);
void error(QString err);
void stateChanged(states newState);
void deviceDetailsChanged(DeviceDetails *newDetails);
void deviceDetailsChanged(DeviceDetails newDetails);
private:
ReadSettingsThread *readThread;