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 sites: simplify nr_of_dives_at_dive_site()

Browse source 
1) The second parameter (selected_only) was always false. Therefore,
   remove it.

2) Simplify the function by simply returning the reference count.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-03-07 09:01:18 +01:00 • committed by Dirk Hohndel
parent 9e9821551f
commit 992ad2fa27
3 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/divesite.c
View file

@ -159,19 +159,9 @@ struct dive_site *alloc_or_get_dive_site(uint32_t uuid, struct dive_site_table *
return ds; return ds;
} }
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)
{ {
int j; return ds->dives.nr;
int nr = 0;
struct dive *d;
if (!ds)
return 0;
for_each_dive(j, d) {
if (d->dive_site == ds && (!select_only || d->selected)) {
nr++;
}
}
return nr;
} }
bool is_dive_site_used(struct dive_site *ds, bool select_only) bool is_dive_site_used(struct dive_site *ds, bool select_only)

2
core/divesite.h
View file

@ -53,7 +53,7 @@ void register_dive_site(struct dive_site *ds);
void unregister_dive_site(struct dive_site *ds); void unregister_dive_site(struct dive_site *ds);
struct dive_site *alloc_or_get_dive_site(uint32_t uuid, struct dive_site_table *ds_table); struct dive_site *alloc_or_get_dive_site(uint32_t uuid, struct dive_site_table *ds_table);
struct dive_site *alloc_dive_site(); struct dive_site *alloc_dive_site();
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 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 unregister_dive_site(struct dive_site *ds); void unregister_dive_site(struct dive_site *ds);

2
desktop-widgets/modeldelegates.cpp
View file

@ -495,7 +495,7 @@ void LocationFilterDelegate::paint(QPainter *painter, const QStyleOptionViewItem
} else { } else {
int distanceMeters = get_distance(&ds->location, &currentDiveSite->location); int distanceMeters = get_distance(&ds->location, &currentDiveSite->location);
QString distance = distance_string(distanceMeters); QString distance = distance_string(distanceMeters);
int nr = nr_of_dives_at_dive_site(ds, false); int nr = nr_of_dives_at_dive_site(ds);
bottomText += tr(" (~%1 away").arg(distance); bottomText += tr(" (~%1 away").arg(distance);
bottomText += tr(", %n dive(s) here)", "", nr); bottomText += tr(", %n dive(s) here)", "", nr);
} }