summaryrefslogtreecommitdiffstats
path: root/desktop-widgets
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-10-25 10:07:45 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-29 00:09:31 +0000
commitcedc23f487977b880495d03a9d170934bbda16fb (patch)
treeb1fef8b2af657ff5e1b46a16815557e524b2e72f /desktop-widgets
parentb9b1b3146b3a0a05efcb11c50a953f3e8f2e023c (diff)
downloadsubsurface-cedc23f487977b880495d03a9d170934bbda16fb.tar.gz
Dive site: Pass dive-site pointer to MapWidgetHelper::enterEditMode()
Replace the uuid argument to MapWidgetHelper::enterEditMode() by a pointer. Likewise, adapt the only caller prepareForGetDiveCoordinates(). This is a small step in a bigger effort to replace dive-site UUIDs by pointers. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets')
-rw-r--r--desktop-widgets/locationinformation.cpp2
-rw-r--r--desktop-widgets/mapwidget.cpp4
-rw-r--r--desktop-widgets/mapwidget.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp
index 6c3c2ccac..69fc330d0 100644
--- a/desktop-widgets/locationinformation.cpp
+++ b/desktop-widgets/locationinformation.cpp
@@ -237,7 +237,7 @@ void LocationInformationWidget::initFields(dive_site *ds)
filter_model.set(0, location_t { degrees_t{ 0 }, degrees_t{ 0 } });
clearLabels();
}
- MapWidget::instance()->prepareForGetDiveCoordinates(ds ? ds->uuid : 0);
+ MapWidget::instance()->prepareForGetDiveCoordinates(ds);
}
void LocationInformationWidget::markChangedWidget(QWidget *w)
diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp
index db92e2298..211840884 100644
--- a/desktop-widgets/mapwidget.cpp
+++ b/desktop-widgets/mapwidget.cpp
@@ -94,10 +94,10 @@ void MapWidget::endGetDiveCoordinates()
m_mapHelper->exitEditMode();
}
-void MapWidget::prepareForGetDiveCoordinates(uint32_t uuid)
+void MapWidget::prepareForGetDiveCoordinates(struct dive_site *ds)
{
CHECK_IS_READY_RETURN_VOID();
- m_mapHelper->enterEditMode(uuid);
+ m_mapHelper->enterEditMode(ds);
}
void MapWidget::selectedDivesChanged(QList<int> list)
diff --git a/desktop-widgets/mapwidget.h b/desktop-widgets/mapwidget.h
index aaed93218..7ba62c6cf 100644
--- a/desktop-widgets/mapwidget.h
+++ b/desktop-widgets/mapwidget.h
@@ -33,7 +33,7 @@ public slots:
void centerOnIndex(const QModelIndex& idx);
void endGetDiveCoordinates();
void repopulateLabels();
- void prepareForGetDiveCoordinates(uint32_t uuid);
+ void prepareForGetDiveCoordinates(struct dive_site *ds);
void selectedDivesChanged(QList<int>);
void coordinatesChangedLocal(const location_t &);
void doneLoading(QQuickWidget::Status status);