mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: replace divesite_table_t by a vector of std::unique_ptr<>s

Browse source 
This is a long commit, because it introduces a new abstraction:
a general std::vector<> of std::unique_ptrs<>.

Moreover, it replaces a number of pointers by C++ references,
when the callee does not suppoert null objects.

This simplifies memory management and makes ownership more
explicit. It is a proof-of-concept and a test-bed for
the other core data structrures.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-11 11:47:45 +02:00 • committed by bstoeger
parent 411188728d
commit e39dea3d68
41 changed files with 451 additions and 426 deletions
Download patch file Download diff file Expand all files Collapse all files

25
qt-models/maplocationmodel.cpp
View file

@ -118,15 +118,15 @@ const QVector<dive_site *> &MapLocationModel::selectedDs() const
return m_selectedDs;
}
static bool hasVisibleDive(const dive_site *ds)
static bool hasVisibleDive(const dive_site &ds)
{
return std::any_of(ds->dives.begin(), ds->dives.end(),
return std::any_of(ds.dives.begin(), ds.dives.end(),
[] (const dive *d) { return !d->hidden_by_filter; });
}
static bool hasSelectedDive(const dive_site *ds)
static bool hasSelectedDive(const dive_site &ds)
{
return std::any_of(ds->dives.begin(), ds->dives.end(),
return std::any_of(ds.dives.begin(), ds.dives.end(),
[] (const dive *d) { return d->selected; });
}
@ -160,18 +160,17 @@ void MapLocationModel::reload(QObject *map)
if (diveSiteMode)
m_selectedDs = DiveFilter::instance()->filteredDiveSites();
#endif
for (int i = 0; i < divelog.sites->nr; ++i) {
struct dive_site *ds = divelog.sites->dive_sites[i];
for (const auto &ds: *divelog.sites) {
QGeoCoordinate dsCoord;
// Don't show dive sites of hidden dives, unless we're in dive site edit mode.
if (!diveSiteMode && !hasVisibleDive(ds))
if (!diveSiteMode && !hasVisibleDive(*ds))
continue;
if (!dive_site_has_gps_location(ds)) {
if (!dive_site_has_gps_location(ds.get())) {
// Dive sites that do not have a gps location are not shown in normal mode.
// In dive-edit mode, selected sites are placed at the center of the map,
// so that the user can drag them somewhere without having to enter coordinates.
if (!diveSiteMode || !m_selectedDs.contains(ds) || !map)
if (!diveSiteMode || !m_selectedDs.contains(ds.get()) || !map)
continue;
dsCoord = map->property("center").value<QGeoCoordinate>();
} else {
@ -179,8 +178,8 @@ void MapLocationModel::reload(QObject *map)
qreal longitude = ds->location.lon.udeg * 0.000001;
dsCoord = QGeoCoordinate(latitude, longitude);
}
if (!diveSiteMode && hasSelectedDive(ds) && !m_selectedDs.contains(ds))
m_selectedDs.append(ds);
if (!diveSiteMode && hasSelectedDive(*ds) && !m_selectedDs.contains(ds.get()))
m_selectedDs.append(ds.get());
QString name = siteMapDisplayName(ds->name);
if (!diveSiteMode) {
// don't add dive locations with the same name, unless they are
@ -192,8 +191,8 @@ void MapLocationModel::reload(QObject *map)
continue;
}
}
bool selected = m_selectedDs.contains(ds);
MapLocation *location = new MapLocation(ds, dsCoord, name, selected);
bool selected = m_selectedDs.contains(ds.get());
MapLocation *location = new MapLocation(ds.get(), dsCoord, name, selected);
m_mapLocations.append(location);
if (!diveSiteMode)
locationNameMap[name] = location;