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

Dive site: return pointer to dive_site in get_dive_site_*()

Browse source 
As a first step in removing dive-site uuids, change the interface
of the get_dive_site_*() functions to return pointers instead
of uuids. This makes code a bit more complicated in places where
the uuid is extracted afterwards (needed NULL check). Nevertheless,
these places should disappear once pointers instead of uuids are
stored in the dive-structures.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-23 12:42:01 +02:00 • committed by Dirk Hohndel
parent 4cea7b4901
commit 68961a169e
9 changed files with 68 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

21
mobile-widgets/qmlmanager.cpp
View file

@ -872,16 +872,17 @@ parsed:
bool QMLManager::checkLocation(DiveObjectHelper *myDive, struct dive *d, QString location, QString gps)
{
bool diveChanged = false;
uint32_t uuid = 0;
struct dive_site *ds = get_dive_site_for_dive(d);
qDebug() << "checkLocation" << location << "gps" << gps << "dive had" << myDive->location() << "gps" << myDive->gas();
if (myDive->location() != location) {
diveChanged = true;
if (!ds)
uuid = get_dive_site_uuid_by_name(qPrintable(location), NULL);
if (!uuid && !location.isEmpty())
uuid = create_dive_site(qPrintable(location), d->when);
d->dive_site_uuid = uuid;
ds = get_dive_site_by_name(qPrintable(location));
if (!ds && !location.isEmpty()) {
uint32_t uuid = create_dive_site(qPrintable(location), d->when);
ds = get_dive_site_by_uuid(uuid);
}
d->dive_site_uuid = ds ? ds->uuid : 0;
}
// now make sure that the GPS coordinates match - if the user changed the name but not
// the GPS coordinates, this still does the right thing as the now new dive site will
@ -1474,15 +1475,13 @@ QString QMLManager::getVersion() const
}
QString QMLManager::getGpsFromSiteName(const QString& siteName)
{ uint32_t uuid;
{
struct dive_site *ds;
uuid = get_dive_site_uuid_by_name(qPrintable(siteName), NULL);
if (uuid) {
ds = get_dive_site_by_uuid(uuid);
ds = get_dive_site_by_name(qPrintable(siteName));
if (ds)
return QString(printGPSCoords(&ds->location));
}
return "";
return QString();
}
void QMLManager::setNotificationText(QString text)