summaryrefslogtreecommitdiffstats
path: root/desktop-widgets
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-10-25 12:23:19 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-29 00:09:31 +0000
commit872d56de0122036e1b9d37348d758b40dcd142d9 (patch)
treedc15645e7ca0e12d697fdfbd025a14f6a2edc512 /desktop-widgets
parentcedc23f487977b880495d03a9d170934bbda16fb (diff)
downloadsubsurface-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 'desktop-widgets')
-rw-r--r--desktop-widgets/locationinformation.cpp2
-rw-r--r--desktop-widgets/mapwidget.cpp4
-rw-r--r--desktop-widgets/mapwidget.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp
index 69fc330d0..65ccfa7f0 100644
--- a/desktop-widgets/locationinformation.cpp
+++ b/desktop-widgets/locationinformation.cpp
@@ -341,7 +341,7 @@ void LocationInformationWidget::updateLocationOnMap()
location_t location;
if (!parseGpsText(ui.diveSiteCoordinates->text(), location))
return;
- MapWidget::instance()->updateDiveSiteCoordinates(diveSite->uuid, location);
+ MapWidget::instance()->updateDiveSiteCoordinates(diveSite, location);
filter_model.setCoordinates(location);
}
diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp
index 211840884..9d3735efb 100644
--- a/desktop-widgets/mapwidget.cpp
+++ b/desktop-widgets/mapwidget.cpp
@@ -116,10 +116,10 @@ void MapWidget::coordinatesChangedLocal(const location_t &location)
emit coordinatesChanged(location);
}
-void MapWidget::updateDiveSiteCoordinates(uint32_t uuid, const location_t &location)
+void MapWidget::updateDiveSiteCoordinates(struct dive_site *ds, const location_t &location)
{
CHECK_IS_READY_RETURN_VOID();
- m_mapHelper->updateDiveSiteCoordinates(uuid, location);
+ m_mapHelper->updateDiveSiteCoordinates(ds, location);
}
MapWidget::~MapWidget()
diff --git a/desktop-widgets/mapwidget.h b/desktop-widgets/mapwidget.h
index 7ba62c6cf..4eb0d3ca9 100644
--- a/desktop-widgets/mapwidget.h
+++ b/desktop-widgets/mapwidget.h
@@ -37,7 +37,7 @@ public slots:
void selectedDivesChanged(QList<int>);
void coordinatesChangedLocal(const location_t &);
void doneLoading(QQuickWidget::Status status);
- void updateDiveSiteCoordinates(uint32_t uuid, const location_t &);
+ void updateDiveSiteCoordinates(struct dive_site *ds, const location_t &);
private:
static MapWidget *m_instance;