diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-11-27 00:25:15 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-09 20:58:04 -0800 |
| commit | 7e33369dc8b27b20385ab055b662e06bbf369784 (patch) | |
| tree | af674ccdd1ccb67d4de84d68cb585b481d020fb3 /desktop-widgets/mainwindow.cpp | |
| parent | ec37c71f5eeb7d4b0c4b8719b52583fadb0b8f4c (diff) | |
| download | subsurface-7e33369dc8b27b20385ab055b662e06bbf369784.tar.gz | |
Parser: add trip_table parameter to parsing functions
To allow parsing into arbitrary trip_tables, add the corresponding
parameter to the parsing functions and the parser state. Currently,
all callers pass the global trip_table so there should be no change
in functionality. These arguments will be replaced in subsequent commits.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/mainwindow.cpp')
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index d53d4f97e..d195eb5ad 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -614,7 +614,7 @@ void MainWindow::on_actionCloudstorageopen_triggered() showProgressBar(); QByteArray fileNamePtr = QFile::encodeName(filename); - if (!parse_file(fileNamePtr.data(), &dive_table)) + if (!parse_file(fileNamePtr.data(), &dive_table, &trip_table)) setCurrentFile(fileNamePtr.data()); process_loaded_dives(); Command::clear(); @@ -1711,7 +1711,7 @@ void MainWindow::importFiles(const QStringList fileNames) for (int i = 0; i < fileNames.size(); ++i) { fileNamePtr = QFile::encodeName(fileNames.at(i)); - parse_file(fileNamePtr.data(), &table); + parse_file(fileNamePtr.data(), &table, &trip_table); } process_imported_dives(&table, false, false); Command::clear(); @@ -1729,7 +1729,7 @@ void MainWindow::loadFiles(const QStringList fileNames) showProgressBar(); for (int i = 0; i < fileNames.size(); ++i) { fileNamePtr = QFile::encodeName(fileNames.at(i)); - if (!parse_file(fileNamePtr.data(), &dive_table)) { + if (!parse_file(fileNamePtr.data(), &dive_table, &trip_table)) { setCurrentFile(fileNamePtr.data()); addRecentFile(fileNamePtr, false); } |