diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-10-26 17:03:54 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-29 00:09:31 +0000 |
| commit | 724055f0af4fb7cdb9f1570967fe4b34797f3419 (patch) | |
| tree | 6aab8c34e7d0a6df1d6fe84bc5794e8eb5404b7d /desktop-widgets/locationinformation.cpp | |
| parent | acd44467c1100a1a774cc644921b1dc33dca1266 (diff) | |
| download | subsurface-724055f0af4fb7cdb9f1570967fe4b34797f3419.tar.gz | |
Dive site: replace dive->dive_site_uuid by dive_site
Replace the UUID reference of struct dive by a pointer to dive_site.
This commit is rather large in lines, but nevertheless quite simple
since most of the UUID->pointer work was done in previous commits.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/locationinformation.cpp')
| -rw-r--r-- | desktop-widgets/locationinformation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index e48c46008..2b57c122c 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -206,7 +206,7 @@ void LocationInformationWidget::acceptChanges() parseGpsText(ui.diveSiteCoordinates->text(), diveSite->location); if (dive_site_is_empty(diveSite)) { LocationInformationModel::instance()->removeRow(get_divesite_idx(diveSite)); - displayed_dive.dive_site_uuid = 0; + displayed_dive.dive_site = nullptr; diveSite = nullptr; } mark_divelist_changed(true); @@ -386,7 +386,7 @@ QVariant DiveLocationModel::data(const QModelIndex &index, int role) const case Qt::DisplayRole: return new_ds_value[index.row()]; case Qt::ToolTipRole: - return displayed_dive.dive_site_uuid ? + return displayed_dive.dive_site ? tr("Create a new dive site, copying relevant information from the current dive.") : tr("Create a new dive site with this name"); case Qt::DecorationRole: |