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
|
@ -1070,7 +1070,7 @@ bool QMLManager::checkLocation(DiveSiteChange &res, struct dive *d, QString loca
|
|||
bool changed = false;
|
||||
QString oldLocation = QString::fromStdString(get_dive_location(d));
|
||||
if (oldLocation != location) {
|
||||
ds = divelog.sites->get_by_name(location.toStdString());
|
||||
ds = divelog.sites.get_by_name(location.toStdString());
|
||||
if (!ds && !location.isEmpty()) {
|
||||
res.createdDs = std::make_unique<dive_site>(qPrintable(location));
|
||||
res.changed = true;
|
||||
|
@ -1808,7 +1808,7 @@ QString QMLManager::getVersion() const
|
|||
|
||||
QString QMLManager::getGpsFromSiteName(const QString &siteName)
|
||||
{
|
||||
struct dive_site *ds = divelog.sites->get_by_name(siteName.toStdString());
|
||||
struct dive_site *ds = divelog.sites.get_by_name(siteName.toStdString());
|
||||
if (!ds)
|
||||
return QString();
|
||||
return printGPSCoords(&ds->location);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue