From cedc23f487977b880495d03a9d170934bbda16fb Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Thu, 25 Oct 2018 10:07:45 +0200 Subject: 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 --- desktop-widgets/locationinformation.cpp | 2 +- desktop-widgets/mapwidget.cpp | 4 ++-- desktop-widgets/mapwidget.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'desktop-widgets') 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 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); void coordinatesChangedLocal(const location_t &); void doneLoading(QQuickWidget::Status status); -- cgit v1.2.3-70-g09d2