diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-09-06 17:41:25 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-09-08 17:20:09 -0700 |
| commit | 048cdcaa318f111e12d78c60927a0e2fc30eb1d6 (patch) | |
| tree | bd790310bf18472427874af3ef484bd495cc4859 /profile-widget | |
| parent | 0424ee8996f231dbba1ffb6e6db087855dbb26a2 (diff) | |
| download | subsurface-048cdcaa318f111e12d78c60927a0e2fc30eb1d6.tar.gz | |
cleanup: remove count_divecomputers() function
There is a number_of_computers() function which does
the same thing with two exceptions:
1) checks for null-dive
2) returns an unsigned int
Replace calls to count_divecomputers() by calls to number_of_computers().
In one case, the return type makes a different - add a cast to int there.
Ultimately, we should probably change the dc_number to signed int
throughout the code.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'profile-widget')
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 01870406b..3373b96cd 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -1436,13 +1436,13 @@ void ProfileWidget2::contextMenuEvent(QContextMenuEvent *event) parentItem = parentItem->parentItem(); } if (isDCName) { - if (dc_number == 0 && count_divecomputers(current_dive) == 1) + if (dc_number == 0 && number_of_computers(current_dive) == 1) // nothing to do, can't delete or reorder return; // create menu to show when right clicking on dive computer name if (dc_number > 0) m.addAction(tr("Make first dive computer"), this, &ProfileWidget2::makeFirstDC); - if (count_divecomputers(current_dive) > 1) { + if (number_of_computers(current_dive) > 1) { m.addAction(tr("Delete this dive computer"), this, &ProfileWidget2::deleteCurrentDC); m.addAction(tr("Split this dive computer into own dive"), this, &ProfileWidget2::splitCurrentDC); } |