mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: include divesite table directly in divelog
Having this as a pointer is an artifact from the C/C++ split. The divesitetable header is small enough so that we can include it directly. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
7792f54a73
commit
5af9d28291
29 changed files with 90 additions and 91 deletions
|
@ -1408,12 +1408,12 @@ void MainWindow::on_actionImportDiveSites_triggered()
|
|||
parse_file(fileNamePtr.data(), &log);
|
||||
}
|
||||
// The imported dive sites still have pointers to imported dives - remove them
|
||||
for (const auto &ds: *log.sites)
|
||||
for (const auto &ds: log.sites)
|
||||
ds->dives.clear();
|
||||
|
||||
QString source = fileNames.size() == 1 ? fileNames[0] : tr("multiple files");
|
||||
|
||||
DivesiteImportDialog divesiteImport(std::move(*log.sites), source, this);
|
||||
DivesiteImportDialog divesiteImport(std::move(log.sites), source, this);
|
||||
divesiteImport.exec();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue