From f6e7bdc5ef99d5a5fe71ac4f32511900fa82e804 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Tue, 26 Feb 2019 22:26:11 +0100 Subject: Dive site: add dive site table parameter to dive site functions To enable undo of dive site functions, it is crucial to work with different dive site tables. Therefore add a dive site table parameter to dive site functions. For now, always pass the global dive site table. Thus, this commit shouldn't alter any functionality. After this change, a simple search for dive_site_table reveals all places where the global dive site table is accessed. Signed-off-by: Berthold Stoeger --- mobile-widgets/qmlmanager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mobile-widgets') diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 196554654..8239bfc7a 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -773,7 +773,7 @@ static void setupDivesite(struct dive *d, struct dive_site *ds, double lat, doub if (ds) { ds->location = location; } else { - d->dive_site = create_dive_site_with_gps(locationtext, &location, d->when); + d->dive_site = create_dive_site_with_gps(locationtext, &location, d->when, &dive_site_table); } } @@ -889,9 +889,9 @@ bool QMLManager::checkLocation(DiveObjectHelper *myDive, struct dive *d, QString qDebug() << "checkLocation" << location << "gps" << gps << "dive had" << myDive->location() << "gps" << myDive->gas(); if (myDive->location() != location) { diveChanged = true; - ds = get_dive_site_by_name(qPrintable(location)); + ds = get_dive_site_by_name(qPrintable(location), &dive_site_table); if (!ds && !location.isEmpty()) - ds = create_dive_site(qPrintable(location), d->when); + ds = create_dive_site(qPrintable(location), d->when, &dive_site_table); d->dive_site = ds; } // now make sure that the GPS coordinates match - if the user changed the name but not @@ -1597,11 +1597,11 @@ QString QMLManager::getVersion() const return versionRe.cap(1); } -QString QMLManager::getGpsFromSiteName(const QString& siteName) +QString QMLManager::getGpsFromSiteName(const QString &siteName) { struct dive_site *ds; - ds = get_dive_site_by_name(qPrintable(siteName)); + ds = get_dive_site_by_name(qPrintable(siteName), &dive_site_table); if (!ds) return QString(); return printGPSCoords(&ds->location); -- cgit v1.2.3-70-g09d2