diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-02-28 22:45:17 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 18:19:07 +0300 |
| commit | 37146c5742503becf75468fb07aab56011cb9101 (patch) | |
| tree | 666e4d609b3d9b882082fcc258d6d153c6c68fa5 /mobile-widgets | |
| parent | 926b6895bbce7cc539ca4d0c3a425876dfa33d6b (diff) | |
| download | subsurface-37146c5742503becf75468fb07aab56011cb9101.tar.gz | |
Parser: parse into custom dive site table
To extend the undo system to dive sites, the importers and downloaders
must not parse directly into the global dive site table. Instead,
pass a dive_site_table argument to parse into.
For now, always pass the global dive_site_table so that this commit
should not cause any functional change.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'mobile-widgets')
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 8239bfc7a..9603a2ad0 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -272,7 +272,7 @@ void QMLManager::openLocalThenRemote(QString url) QByteArray fileNamePrt = QFile::encodeName(url); bool glo = git_local_only; git_local_only = true; - int error = parse_file(fileNamePrt.data(), &dive_table, &trip_table); + int error = parse_file(fileNamePrt.data(), &dive_table, &trip_table, &dive_site_table); git_local_only = glo; if (error) { appendTextToLog(QStringLiteral("loading dives from cache failed %1").arg(error)); @@ -341,7 +341,7 @@ void QMLManager::mergeLocalRepo() char *filename = NOCLOUD_LOCALSTORAGE; struct dive_table table = { 0 }; struct trip_table trips = { 0 }; - parse_file(filename, &table, &trips); + parse_file(filename, &table, &trips, &dive_site_table); add_imported_dives(&table, &trips, IMPORT_MERGE_ALL_TRIPS); } @@ -406,7 +406,7 @@ void QMLManager::finishSetup() QMLPrefs::instance()->setCredentialStatus(qPrefCloudStorage::CS_NOCLOUD); saveCloudCredentials(); appendTextToLog(tr("working in no-cloud mode")); - int error = parse_file(existing_filename, &dive_table, &trip_table); + int error = parse_file(existing_filename, &dive_table, &trip_table, &dive_site_table); if (error) { // we got an error loading the local file setNotificationText(tr("Error parsing local storage, giving up")); @@ -666,7 +666,7 @@ void QMLManager::loadDivesWithValidCredentials() error = git_load_dives(git, branch); } else { appendTextToLog(QString("didn't receive valid git repo, try again")); - error = parse_file(fileNamePrt.data(), &dive_table, &trip_table); + error = parse_file(fileNamePrt.data(), &dive_table, &trip_table, &dive_site_table); } if (!error) { report_error("filename is now %s", fileNamePrt.data()); |