mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 03:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: remove redundant checks for null dive site

Browse source 
The dive_site_has_gps_location() function already checks for the null
dive site. Remove redundant checks.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-04-01 22:46:07 +02:00 committed by Dirk Hohndel
parent 53c9d524ca
commit 779c4eb5d0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/worldmap-save.c
View file

@ -34,7 +34,7 @@ void writeMarkers(struct membuffer *b, const bool selected_only)
continue; continue;
} }
struct dive_site *ds = get_dive_site_for_dive(dive); struct dive_site *ds = get_dive_site_for_dive(dive);
if (!ds || !dive_site_has_gps_location(ds)) if (!dive_site_has_gps_location(ds))
continue; continue;
put_degrees(b, ds->location.lat, "temp = new google.maps.Marker({position: new google.maps.LatLng(", ""); put_degrees(b, ds->location.lat, "temp = new google.maps.Marker({position: new google.maps.LatLng(", "");
put_degrees(b, ds->location.lon, ",", ")});\n"); put_degrees(b, ds->location.lon, ",", ")});\n");

4
map-widget/qmlmapwidgethelper.cpp
View file

@ -24,14 +24,14 @@ MapWidgetHelper::MapWidgetHelper(QObject *parent) : QObject(parent)
QGeoCoordinate MapWidgetHelper::getCoordinates(struct dive_site *ds) QGeoCoordinate MapWidgetHelper::getCoordinates(struct dive_site *ds)
{ {
if (!ds || !dive_site_has_gps_location(ds)) if (!dive_site_has_gps_location(ds))
return QGeoCoordinate(0.0, 0.0); return QGeoCoordinate(0.0, 0.0);
return QGeoCoordinate(ds->location.lat.udeg * 0.000001, ds->location.lon.udeg * 0.000001); return QGeoCoordinate(ds->location.lat.udeg * 0.000001, ds->location.lon.udeg * 0.000001);
} }
void MapWidgetHelper::centerOnDiveSite(struct dive_site *ds) void MapWidgetHelper::centerOnDiveSite(struct dive_site *ds)
{ {
if (!ds || !dive_site_has_gps_location(ds)) { if (!dive_site_has_gps_location(ds)) {
// dive site with no GPS // dive site with no GPS
m_mapLocationModel->setSelected(ds, false); m_mapLocationModel->setSelected(ds, false);
QMetaObject::invokeMethod(m_map, "deselectMapLocation"); QMetaObject::invokeMethod(m_map, "deselectMapLocation");