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

cleanup: remove get_times() functions

Browse source 
The function
1) was misnamed: it determined the time of the first selcted dive.
2) had only one caller.
3) would crash if there was no selected dive.

Let's just fold the functionality into the caller. It's a one-liner
anyway.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-10-25 11:45:27 +01:00 • committed by Dirk Hohndel
parent 464dd93fe8
commit 4aa571d5a0
3 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/dive.c
View file

@ -3311,18 +3311,6 @@ bool time_during_dive_with_offset(const struct dive *dive, timestamp_t when, tim
return start - offset <= when && when <= end + offset; return start - offset <= when && when <= end + offset;
} }
timestamp_t get_times()
{
int i;
struct dive *dive;
for_each_dive (i, dive) {
if (dive->selected)
break;
}
return dive->when;
}
/* this sets a usually unused copy of the preferences with the units /* this sets a usually unused copy of the preferences with the units
* that were active the last time the dive list was saved to git storage * that were active the last time the dive list was saved to git storage
* (this isn't used in XML files); storing the unit preferences in the * (this isn't used in XML files); storing the unit preferences in the

2
core/dive.h
View file

@ -260,8 +260,6 @@ extern void subsurface_console_init(void);
extern void subsurface_console_exit(void); extern void subsurface_console_exit(void);
extern bool subsurface_user_is_root(void); extern bool subsurface_user_is_root(void);
extern timestamp_t get_times();
extern struct dive *alloc_dive(void); extern struct dive *alloc_dive(void);
extern void free_dive(struct dive *); extern void free_dive(struct dive *);
extern void free_dive_dcs(struct divecomputer *dc); extern void free_dive_dcs(struct divecomputer *dc);

8
desktop-widgets/simplewidgets.cpp
View file

@ -193,9 +193,11 @@ void ShiftTimesDialog::buttonClicked(QAbstractButton *button)
} }
ui.timeEdit->setTime(QTime(0, 0, 0, 0)); ui.timeEdit->setTime(QTime(0, 0, 0, 0));
when = get_times(); //get time of first selected dive dive *d = first_selected_dive();
ui.currentTime->setText(get_dive_date_string(when)); if (d) {
ui.shiftedTime->setText(get_dive_date_string(when)); ui.currentTime->setText(get_dive_date_string(d->when));
ui.shiftedTime->setText(get_dive_date_string(d->when));
}
} }
void ShiftTimesDialog::changeTime() void ShiftTimesDialog::changeTime()