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 --- map-widget/qmlmapwidgethelper.cpp | 9 ++++----- map-widget/qmlmapwidgethelper.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'map-widget') 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(); - 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(); -- cgit v1.2.3-70-g09d2