diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-10-25 12:23:19 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-29 00:09:31 +0000 |
| commit | 872d56de0122036e1b9d37348d758b40dcd142d9 (patch) | |
| tree | dc15645e7ca0e12d697fdfbd025a14f6a2edc512 /map-widget | |
| parent | cedc23f487977b880495d03a9d170934bbda16fb (diff) | |
| download | subsurface-872d56de0122036e1b9d37348d758b40dcd142d9.tar.gz | |
Dive site: pass pointer to updateDiveSiteCoordinates()
There are two updateDiveSiteCoordinates() member-functions, viz.
in MapWidget and MapWidgetHelper. Adapt them to take a pointer
to dive_site instead of a UUID. This is part of an effort to
replace UUIDs by pointers.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'map-widget')
| -rw-r--r-- | map-widget/qmlmapwidgethelper.cpp | 6 | ||||
| -rw-r--r-- | map-widget/qmlmapwidgethelper.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/map-widget/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp index b9c4e2eeb..e4311cf83 100644 --- a/map-widget/qmlmapwidgethelper.cpp +++ b/map-widget/qmlmapwidgethelper.cpp @@ -273,12 +273,14 @@ void MapWidgetHelper::updateCurrentDiveSiteCoordinatesFromMap(quint32 uuid, QGeo emit coordinatesChanged(location); } -void MapWidgetHelper::updateDiveSiteCoordinates(uint32_t uuid, const location_t &location) +void MapWidgetHelper::updateDiveSiteCoordinates(struct dive_site *ds, const location_t &location) { + if (!ds) + return; const qreal latitude_r = location.lat.udeg * 0.000001; const qreal longitude_r = location.lon.udeg * 0.000001; QGeoCoordinate coord(latitude_r, longitude_r); - m_mapLocationModel->updateMapLocationCoordinates(uuid, coord); + m_mapLocationModel->updateMapLocationCoordinates(ds->uuid, coord); QMetaObject::invokeMethod(m_map, "centerOnCoordinate", Q_ARG(QVariant, QVariant::fromValue(coord))); } diff --git a/map-widget/qmlmapwidgethelper.h b/map-widget/qmlmapwidgethelper.h index 65fb85f33..f0d17a28d 100644 --- a/map-widget/qmlmapwidgethelper.h +++ b/map-widget/qmlmapwidgethelper.h @@ -36,7 +36,7 @@ public: Q_INVOKABLE void calculateSmallCircleRadius(QGeoCoordinate coord); Q_INVOKABLE void updateCurrentDiveSiteCoordinatesFromMap(quint32 uuid, QGeoCoordinate coord); Q_INVOKABLE void selectVisibleLocations(); - void updateDiveSiteCoordinates(uint32_t uuid, const location_t &); + void updateDiveSiteCoordinates(struct dive_site *ds, const location_t &); void enterEditMode(struct dive_site *ds); void exitEditMode(); QString pluginObject(); |