summaryrefslogtreecommitdiffstats
path: root/map-widget/qmlmapwidgethelper.cpp
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-10-25 20:58:54 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-29 00:09:31 +0000
commitf41bb32428f1e6377b7b293215e8c2f71fa06c9a (patch)
treefe6976ce3ff689c2dd0a59f11565316306e06f5c /map-widget/qmlmapwidgethelper.cpp
parent75b5d61522f3721adb1761141ce1aeb79c3761c1 (diff)
downloadsubsurface-f41bb32428f1e6377b7b293215e8c2f71fa06c9a.tar.gz
Dive site: use an array of pointers in reloadMapLocations()
MapWidgetHelper::reloadMapLocations() used an array of uuids to add dive sites to the map only once. Replace this by an array of pointers. This is a small piece of a larger effort to remove dive site UUIDs. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'map-widget/qmlmapwidgethelper.cpp')
-rw-r--r--map-widget/qmlmapwidgethelper.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/map-widget/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp
index a4960608a..4bfa4ea31 100644
--- a/map-widget/qmlmapwidgethelper.cpp
+++ b/map-widget/qmlmapwidgethelper.cpp
@@ -120,7 +120,7 @@ void MapWidgetHelper::reloadMapLocations()
m_mapLocationModel->clear();
MapLocation *location;
QVector<MapLocation *> locationList;
- QVector<uint32_t> locationUuids;
+ QVector<struct dive_site *> locations;
qreal latitude, longitude;
for_each_dive(idx, dive) {
@@ -129,7 +129,7 @@ void MapWidgetHelper::reloadMapLocations()
if (dive->hidden_by_filter && dive != current_dive)
continue;
struct dive_site *ds = get_dive_site_for_dive(dive);
- if (!dive_site_has_gps_location(ds) || locationUuids.contains(ds->uuid))
+ if (!dive_site_has_gps_location(ds) || locations.contains(ds))
continue;
latitude = ds->location.lat.udeg * 0.000001;
longitude = ds->location.lon.udeg * 0.000001;
@@ -145,7 +145,7 @@ void MapWidgetHelper::reloadMapLocations()
}
location = new MapLocation(ds->uuid, dsCoord, name);
locationList.append(location);
- locationUuids.append(ds->uuid);
+ locations.append(ds);
locationNameMap[name] = location;
}
m_mapLocationModel->addList(locationList);