diff options
Diffstat (limited to 'map-widget')
| -rw-r--r-- | map-widget/qmlmapwidgethelper.cpp | 10 | ||||
| -rw-r--r-- | map-widget/qmlmapwidgethelper.h | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/map-widget/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp index e4311cf83..a4960608a 100644 --- a/map-widget/qmlmapwidgethelper.cpp +++ b/map-widget/qmlmapwidgethelper.cpp @@ -22,19 +22,17 @@ MapWidgetHelper::MapWidgetHelper(QObject *parent) : QObject(parent) this, SLOT(selectedLocationChanged(MapLocation *))); } -QGeoCoordinate MapWidgetHelper::getCoordinatesForUUID(QVariant dive_site_uuid) +QGeoCoordinate MapWidgetHelper::getCoordinates(QVariant dive_site) { - const uint32_t uuid = qvariant_cast<uint32_t>(dive_site_uuid); - struct dive_site *ds = get_dive_site_by_uuid(uuid); + struct dive_site *ds = (struct dive_site *)dive_site.value<uintptr_t>(); if (!ds || !dive_site_has_gps_location(ds)) return QGeoCoordinate(0.0, 0.0); return QGeoCoordinate(ds->location.lat.udeg * 0.000001, ds->location.lon.udeg * 0.000001); } -void MapWidgetHelper::centerOnDiveSiteUUID(QVariant dive_site_uuid) +void MapWidgetHelper::centerOnDiveSite(QVariant dive_site) { - const uint32_t uuid = qvariant_cast<uint32_t>(dive_site_uuid); - struct dive_site *ds = get_dive_site_by_uuid(uuid); + struct dive_site *ds = (struct dive_site *)dive_site.value<uintptr_t>(); if (ds) centerOnDiveSite(ds); } diff --git a/map-widget/qmlmapwidgethelper.h b/map-widget/qmlmapwidgethelper.h index f0d17a28d..8fad3aed2 100644 --- a/map-widget/qmlmapwidgethelper.h +++ b/map-widget/qmlmapwidgethelper.h @@ -29,8 +29,8 @@ public: void centerOnDiveSite(struct dive_site *); void centerOnSelectedDiveSite(); - Q_INVOKABLE QGeoCoordinate getCoordinatesForUUID(QVariant dive_site_uuid); - Q_INVOKABLE void centerOnDiveSiteUUID(QVariant dive_site_uuid); + Q_INVOKABLE QGeoCoordinate getCoordinates(QVariant dive_site); + Q_INVOKABLE void centerOnDiveSite(QVariant dive_site); Q_INVOKABLE void reloadMapLocations(); Q_INVOKABLE void copyToClipboardCoordinates(QGeoCoordinate coord, bool formatTraditional); Q_INVOKABLE void calculateSmallCircleRadius(QGeoCoordinate coord); |