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

15
backend-shared/exportfuncs.cpp
View file

@ -325,21 +325,18 @@ std::vector<const dive_site *> getDiveSitesToExport(bool selectedOnly)
return res;
}
res.reserve(divelog.sites->nr);
for (int i = 0; i < divelog.sites->nr; i++) {
struct dive_site *ds = get_dive_site(i, divelog.sites);
if (dive_site_is_empty(ds))
res.reserve(divelog.sites->size());
for (const auto &ds: *divelog.sites) {
if (dive_site_is_empty(ds.get()))
continue;
if (selectedOnly && !is_dive_site_selected(*ds))
continue;
res.push_back(ds);
res.push_back(ds.get());
}
#else
/* walk the dive site list */
int i;
const struct dive_site *ds;
for_each_dive_site (i, ds, divelog.sites)
res.push_back(get_dive_site(i, divelog.sites));
for (const auto &ds: *divelog.sites)
res.push_back(ds.get());
#endif
return res;
}