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, 0 insertions, 113 deletions

diff --git a/device.c b/device.c
index 2baa2e03a..6244e4117 100644
--- a/device.c
+++ b/device.c
@@ -2,119 +2,6 @@
 #include "dive.h"
 #include "device.h"
 
-static struct device_info *device_info_list;
-
-struct device_info *head_of_device_info_list(void)
-{
-	return device_info_list;
-}
-
-void remove_dive_computer(const char *model, uint32_t deviceid)
-{
-	free(remove_device_info(model, deviceid));
-}
-
-static int match_device_info(struct device_info *entry, const char *model, uint32_t deviceid)
-{
-	return !strcmp(entry->model, model) && entry->deviceid == deviceid;
-}
-
-/* just find the entry for this divecomputer */
-struct device_info *get_device_info(const char *model, uint32_t deviceid)
-{
-	struct device_info *known = device_info_list;
-
-	/* a 0 deviceid doesn't get a nickname - those come from development
-	 * versions of Subsurface that didn't store the deviceid in the divecomputer entries */
-	if (!deviceid || !model)
-		return NULL;
-	while (known) {
-		if (match_device_info(known, model, deviceid))
-			return known;
-		known = known->next;
-	}
-	return NULL;
-}
-
-/*
- * Sort the device_info list, so that we write it out
- * in a stable order. Otherwise we'll end up having the
- * XML file have the devices listed in some arbitrary
- * order, which is annoying.
- */
-static void add_entry_sorted(struct device_info *entry)
-{
-	struct device_info *p, **pp = &device_info_list;
-
-	while ((p = *pp) != NULL) {
-		int cmp = strcmp(p->model, entry->model);
-		if (cmp > 0)
-			break;
-		if (!cmp && p->deviceid > entry->deviceid)
-			break;
-		pp = &p->next;
-	}
-
-	entry->next = p;
-	*pp = entry;
-}
-
-/* Get an existing device info model or create a new one if valid */
-struct device_info *create_device_info(const char *model, uint32_t deviceid)
-{
-	struct device_info *entry;
-
-	if (!deviceid || !model || !*model)
-		return NULL;
-	entry = get_device_info(model, deviceid);
-	if (entry)
-		return entry;
-	entry = calloc(1, sizeof(*entry));
-	if (entry) {
-		entry->model = strdup(model);
-		entry->deviceid = deviceid;
-		add_entry_sorted(entry);
-	}
-	return entry;
-}
-
-/* do we have a DIFFERENT divecomputer of the same model? */
-struct device_info *get_different_device_info(const char *model, uint32_t deviceid)
-{
-	struct device_info *known = device_info_list;
-
-	/* a 0 deviceid matches any DC of the same model - those come from development
-	 * versions of Subsurface that didn't store the deviceid in the divecomputer entries */
-	if (!deviceid)
-		return NULL;
-	if (!model)
-		model = "";
-	while (known) {
-		if (known->model && !strcmp(known->model, model) &&
-		    known->deviceid != deviceid)
-			return known;
-		known = known->next;
-	}
-	return NULL;
-}
-
-struct device_info *remove_device_info(const char *model, uint32_t deviceid)
-{
-	struct device_info *entry, **p;
-
-	if (!deviceid || !model || !*model)
-		return NULL;
-	p = &device_info_list;
-	while ((entry = *p) != NULL) {
-		if (match_device_info(entry, model, deviceid)) {
-			*p = entry->next;
-			break;
-		}
-		p = &entry->next;
-	}
-	return entry;
-}
-
 struct divecomputer* fake_dc(struct divecomputer* dc)
 {
 	static struct sample fake[4];