Undo: make dive site merging undoable

This one was rather trivial, as there is no actual merging
done. Quite simply, a number of dive sites are removed and
their dive added to a different dive site.

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

2 files changed, 0 insertions, 26 deletions

diff --git a/core/divesite.c b/core/divesite.c
index 892a2dd78..8757aeed7 100644
--- a/core/divesite.c
+++ b/core/divesite.c
@@ -310,31 +310,6 @@ void merge_dive_site(struct dive_site *a, struct dive_site *b)
 	}
 }
 
-void merge_dive_sites(struct dive_site *ref, struct dive_site *dive_sites[], int count)
-{
-	int curr_dive, i;
-	struct dive *d;
-	for(i = 0; i < count; i++){
-		if (dive_sites[i] == ref)
-			continue;
-
-		for_each_dive(curr_dive, d) {
-			if (d->dive_site != dive_sites[i] )
-				continue;
-			unregister_dive_from_dive_site(d);
-			add_dive_to_dive_site(d, ref);
-			invalidate_dive_cache(d);
-		}
-	}
-
-	for(i = 0; i < count; i++) {
-		if (dive_sites[i] == ref)
-			continue;
-		delete_dive_site(dive_sites[i], &dive_site_table);
-	}
-	mark_divelist_changed(true);
-}
-
 struct dive_site *find_or_create_dive_site_with_name(const char *name, struct dive_site_table *ds_table)
 {
 	int i;
diff --git a/core/divesite.h b/core/divesite.h
index 50bd0b406..433ad056e 100644
--- a/core/divesite.h
+++ b/core/divesite.h
@@ -69,7 +69,6 @@ void copy_dive_site(struct dive_site *orig, struct dive_site *copy);
 void merge_dive_site(struct dive_site *a, struct dive_site *b);
 unsigned int get_distance(const location_t *loc1, const location_t *loc2);
 struct dive_site *find_or_create_dive_site_with_name(const char *name, struct dive_site_table *ds_table);
-void merge_dive_sites(struct dive_site *ref, struct dive_site *dive_sites[], int count);
 void purge_empty_dive_sites(struct dive_site_table *ds_table);
 void clear_dive_site_table(struct dive_site_table *ds_table);
 void add_dive_to_dive_site(struct dive *d, struct dive_site *ds);