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>

5 files changed, 9 insertions, 10 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);
diff --git a/map-widget/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp
index dcf57182c..b9c4e2eeb 100644
--- a/map-widget/qmlmapwidgethelper.cpp
+++ b/map-widget/qmlmapwidgethelper.cpp
@@ -288,24 +288,23 @@ void MapWidgetHelper::exitEditMode()
 	emit editModeChanged();
 }
 
-void MapWidgetHelper::enterEditMode(quint32 uuid)
+void MapWidgetHelper::enterEditMode(struct dive_site *ds)
 {
 	// We don't support editing of a dive site that doesn't exist
-	struct dive_site *ds = get_dive_site_by_uuid(uuid);
 	if (!ds)
 		return;
 
 	m_editMode = true;
-	MapLocation *exists = m_mapLocationModel->getMapLocationForUuid(uuid);
+	MapLocation *exists = m_mapLocationModel->getMapLocationForUuid(ds->uuid);
 	QGeoCoordinate coord;
 	// if divesite doesn't exist in the model, add a new MapLocation.
 	if (!exists) {
 		coord = m_map->property("center").value<QGeoCoordinate>();
-		m_mapLocationModel->add(new MapLocation(uuid, coord, QString(ds->name)));
+		m_mapLocationModel->add(new MapLocation(ds->uuid, coord, QString(ds->name)));
 	} else {
 		coord = exists->coordinate();
 	}
-	centerOnDiveSiteUUID(uuid);
+	centerOnDiveSite(ds);
 	location_t location = mk_location(coord);
 	emit coordinatesChanged(location);
 	emit editModeChanged();
diff --git a/map-widget/qmlmapwidgethelper.h b/map-widget/qmlmapwidgethelper.h
index e3d9ee865..65fb85f33 100644
--- a/map-widget/qmlmapwidgethelper.h
+++ b/map-widget/qmlmapwidgethelper.h
@@ -37,7 +37,7 @@ public:
 	Q_INVOKABLE void updateCurrentDiveSiteCoordinatesFromMap(quint32 uuid, QGeoCoordinate coord);
 	Q_INVOKABLE void selectVisibleLocations();
 	void updateDiveSiteCoordinates(uint32_t uuid, const location_t &);
-	void enterEditMode(uint32_t uuid);
+	void enterEditMode(struct dive_site *ds);
 	void exitEditMode();
 	QString pluginObject();