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/divelogimportdialog.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/divelogimportdialog.cpp')
| -rw-r--r-- | desktop-widgets/divelogimportdialog.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp index eb551217e..09bb6c535 100644 --- a/desktop-widgets/divelogimportdialog.cpp +++ b/desktop-widgets/divelogimportdialog.cpp @@ -904,10 +904,10 @@ void DiveLogImportDialog::on_buttonBox_accepted() if (ui->knownImports->currentText() != "Manual import") { for (int i = 0; i < fileNames.size(); ++i) { if (ui->knownImports->currentText() == "Seabear CSV") { - parse_seabear_log(qPrintable(fileNames[i]), &table); + parse_seabear_log(qPrintable(fileNames[i]), &table, &trip_table); } else if (ui->knownImports->currentText() == "Poseidon MkVI") { QPair<QString, QString> pair = poseidonFileNames(fileNames[i]); - parse_txt_file(qPrintable(pair.second), qPrintable(pair.first), &table); + parse_txt_file(qPrintable(pair.second), qPrintable(pair.first), &table, &trip_table); } else { char *params[49]; int pnr = 0; @@ -924,7 +924,7 @@ void DiveLogImportDialog::on_buttonBox_accepted() pnr = setup_csv_params(r, params, pnr); parse_csv_file(qPrintable(fileNames[i]), params, pnr - 1, specialCSV.contains(ui->knownImports->currentIndex()) ? qPrintable(CSVApps[ui->knownImports->currentIndex()].name) : "csv", - &table); + &table, &trip_table); } } } else { @@ -988,7 +988,7 @@ void DiveLogImportDialog::on_buttonBox_accepted() params[pnr++] = intdup(r.indexOf(tr("Rating"))); params[pnr++] = NULL; - parse_manual_file(qPrintable(fileNames[i]), params, pnr - 1, &table); + parse_manual_file(qPrintable(fileNames[i]), params, pnr - 1, &table, &trip_table); } else { char *params[51]; int pnr = 0; @@ -1005,7 +1005,7 @@ void DiveLogImportDialog::on_buttonBox_accepted() pnr = setup_csv_params(r, params, pnr); parse_csv_file(qPrintable(fileNames[i]), params, pnr - 1, specialCSV.contains(ui->knownImports->currentIndex()) ? qPrintable(CSVApps[ui->knownImports->currentIndex()].name) : "csv", - &table); + &table, &trip_table); } } } |