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

Dive site: pass dive-site pointer to delete_dive_site()

Browse source 
Instead of passing a uuid, pass a pointer to the dive site.
This is small step in an effort to remove uuids.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-23 19:11:13 +02:00 • committed by Dirk Hohndel
parent 8de471f90e
commit f527a70831
8 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/divelist.c
View file

@ -1687,7 +1687,7 @@ void clear_dive_file_data()
while (dive_table.nr) while (dive_table.nr)
delete_single_dive(0); delete_single_dive(0);
while (dive_site_table.nr) while (dive_site_table.nr)
delete_dive_site(get_dive_site(0)->uuid); delete_dive_site(get_dive_site(0));
clear_dive(&displayed_dive); clear_dive(&displayed_dive);

7
core/divesite.c
View file

@ -172,12 +172,11 @@ void free_dive_site(struct dive_site *ds)
} }
} }
void delete_dive_site(uint32_t id) void delete_dive_site(struct dive_site *ds)
{ {
int nr = dive_site_table.nr; int nr = dive_site_table.nr;
for (int i = 0; i < nr; i++) { for (int i = 0; i < nr; i++) {
struct dive_site *ds = get_dive_site(i); if (ds == get_dive_site(i)) {
if (ds->uuid == id) {
free_dive_site(ds); free_dive_site(ds);
if (nr - 1 > i) if (nr - 1 > i)
memmove(&dive_site_table.dive_sites[i], memmove(&dive_site_table.dive_sites[i],
@ -329,7 +328,7 @@ void merge_dive_sites(uint32_t ref, uint32_t* uuids, int count)
for(i = 0; i < count; i++) { for(i = 0; i < count; i++) {
if (uuids[i] == ref) if (uuids[i] == ref)
continue; continue;
delete_dive_site(uuids[i]); delete_dive_site(get_dive_site_by_uuid(uuids[i]));
} }
mark_divelist_changed(true); mark_divelist_changed(true);
} }

2
core/divesite.h
View file

@ -57,7 +57,7 @@ struct dive_site *alloc_or_get_dive_site(uint32_t uuid);
int nr_of_dives_at_dive_site(struct dive_site *ds, bool select_only); int nr_of_dives_at_dive_site(struct dive_site *ds, bool select_only);
bool is_dive_site_used(struct dive_site *ds, bool select_only); bool is_dive_site_used(struct dive_site *ds, bool select_only);
void free_dive_site(struct dive_site *ds); void free_dive_site(struct dive_site *ds);
void delete_dive_site(uint32_t id); void delete_dive_site(struct dive_site *ds);
struct dive_site *create_dive_site(const char *name, timestamp_t divetime); struct dive_site *create_dive_site(const char *name, timestamp_t divetime);
struct dive_site *create_dive_site_from_current_dive(const char *name); struct dive_site *create_dive_site_from_current_dive(const char *name);
struct dive_site *create_dive_site_with_gps(const char *name, const location_t *, timestamp_t divetime); struct dive_site *create_dive_site_with_gps(const char *name, const location_t *, timestamp_t divetime);

4
core/save-git.c
View file

@ -890,7 +890,7 @@ static void save_divesites(git_repository *repo, struct dir *tree)
if (d->dive_site_uuid == ds->uuid) if (d->dive_site_uuid == ds->uuid)
d->dive_site_uuid = 0; d->dive_site_uuid = 0;
} }
delete_dive_site(ds->uuid); delete_dive_site(ds);
i--; // since we just deleted that one i--; // since we just deleted that one
continue; continue;
} else if (ds->name && } else if (ds->name &&
@ -903,7 +903,7 @@ static void save_divesites(git_repository *repo, struct dir *tree)
if (!is_dive_site_used(ds, false)) { if (!is_dive_site_used(ds, false)) {
if (verbose) if (verbose)
fprintf(stderr, "Deleted unused auto-created dive site %s\n", ds->name); fprintf(stderr, "Deleted unused auto-created dive site %s\n", ds->name);
delete_dive_site(ds->uuid); delete_dive_site(ds);
i--; // since we just deleted that one i--; // since we just deleted that one
continue; continue;
} }

4
core/save-xml.c
View file

@ -605,7 +605,7 @@ void save_dives_buffer(struct membuffer *b, const bool select_only, bool anonymi
if (d->dive_site_uuid == ds->uuid) if (d->dive_site_uuid == ds->uuid)
d->dive_site_uuid = 0; d->dive_site_uuid = 0;
} }
delete_dive_site(ds->uuid); delete_dive_site(ds);
i--; // since we just deleted that one i--; // since we just deleted that one
continue; continue;
} else if (ds->name && } else if (ds->name &&
@ -617,7 +617,7 @@ void save_dives_buffer(struct membuffer *b, const bool select_only, bool anonymi
if (!is_dive_site_used(ds, false)) { if (!is_dive_site_used(ds, false)) {
if (verbose) if (verbose)
fprintf(stderr, "Deleted unused auto-created dive site %s\n", ds->name); fprintf(stderr, "Deleted unused auto-created dive site %s\n", ds->name);
delete_dive_site(ds->uuid); delete_dive_site(ds);
i--; // since we just deleted that one i--; // since we just deleted that one
continue; continue;
} }

4
core/uemis-downloader.c
View file

@ -1193,7 +1193,7 @@ static void get_uemis_divespot(const char *mountpath, int divespot_id, struct di
if (ods) { if (ods) {
/* if the uuid's are the same, the new site is a duplicate and can be deleted */ /* if the uuid's are the same, the new site is a duplicate and can be deleted */
if (nds->uuid != ods->uuid) { if (nds->uuid != ods->uuid) {
delete_dive_site(nds->uuid); delete_dive_site(nds);
dive->dive_site_uuid = ods->uuid; dive->dive_site_uuid = ods->uuid;
} }
} }
@ -1202,7 +1202,7 @@ static void get_uemis_divespot(const char *mountpath, int divespot_id, struct di
/* if we can't load the dive site details, delete the site we /* if we can't load the dive site details, delete the site we
* created in process_raw_buffer * created in process_raw_buffer
*/ */
delete_dive_site(dive->dive_site_uuid); delete_dive_site(get_dive_site_by_uuid(dive->dive_site_uuid));
} }
} }
} }

2
desktop-widgets/tab-widgets/maintab.cpp
View file

@ -888,7 +888,7 @@ void MainTab::acceptChanges()
if (oldDs && !is_dive_site_used(oldDs, false)) { if (oldDs && !is_dive_site_used(oldDs, false)) {
if (verbose) if (verbose)
qDebug() << "delete now unused dive site" << (oldDs->name ? oldDs->name : "without name"); qDebug() << "delete now unused dive site" << (oldDs->name ? oldDs->name : "without name");
delete_dive_site(oldDs->uuid); delete_dive_site(oldDs);
MapWidget::instance()->reload(); MapWidget::instance()->reload();
} }
// the code above can change the correct uuid for the displayed dive site - and the // the code above can change the correct uuid for the displayed dive site - and the

2
qt-models/divelocationmodel.cpp
View file

@ -97,7 +97,7 @@ bool LocationInformationModel::removeRows(int row, int, const QModelIndex&)
beginRemoveRows(QModelIndex(), row, row); beginRemoveRows(QModelIndex(), row, row);
struct dive_site *ds = get_dive_site(row); struct dive_site *ds = get_dive_site(row);
if (ds) if (ds)
delete_dive_site(ds->uuid); delete_dive_site(ds);
endRemoveRows(); endRemoveRows();
return true; return true;
} }