summaryrefslogtreecommitdiffstats
path: root/map-widget/qmlmapwidgethelper.cpp
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 /map-widget/qmlmapwidgethelper.cpp
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 'map-widget/qmlmapwidgethelper.cpp')
-rw-r--r--map-widget/qmlmapwidgethelper.cpp9
1 files changed, 4 insertions, 5 deletions
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();