Converting the device_info list into a Qt data structure

This data structure was quite fragile and made 'undo' when editing
rather hard to implement. So instead I decided to turn this into a
QMultiMap which seemed like the ideal data structure for it.

This map holds all the dive computer related data indexed by the model. As
QMultiMap it allows multiple entries per key (model string) and
disambiguates between them with the deviceId.

This commit turned out much larger than I wanted. But I didn't manage to
find a clean way to break it up and make the pieces make sense.

So this brings back the Ok / Cancel button for the dive computer edit
dialog. And it makes those two buttons actually do the right thing (which
is what started this whole process). For this to work we simply copy the
map to a working copy and do all edits on that one - and then copy that
over the 'real' map when we accept the changes.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 3 insertions, 16 deletions

diff --git a/device.h b/device.h
index 59969473a..3067f009e 100644
--- a/device.h
+++ b/device.h
@@ -6,23 +6,10 @@
 extern "C" {
 #endif
 
-struct device_info {
-	const char *model;
-	uint32_t deviceid;
-
-	const char *serial_nr;
-	const char *firmware;
-	const char *nickname;
-	struct device_info *next;
-};
-
-extern struct device_info *get_device_info(const char *model, uint32_t deviceid);
-extern struct device_info *get_different_device_info(const char *model, uint32_t deviceid);
-extern struct device_info *create_device_info(const char *model, uint32_t deviceid);
-extern struct device_info *remove_device_info(const char *model, uint32_t deviceid);
-extern struct device_info *head_of_device_info_list(void);
 extern struct divecomputer *fake_dc(struct divecomputer* dc);
-extern void remove_dive_computer(const char *model, uint32_t deviceid);
+extern void create_device_node(const char *model, uint32_t deviceid, const char *serial, const char *firmware, const char *nickname);
+extern void call_for_each_dc(FILE *f, void (*callback)(FILE *, const char *, uint32_t,
+						const char *, const char *, const char *));
 
 #ifdef __cplusplus
 }