From d815e0c9476ef62e6b84fb28ce48ab7cddefe77e Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sat, 18 Aug 2018 15:06:15 +0200 Subject: Parse: pass dive_table argument to parse_file() To enable undo of divelog-importing it is crucial that parse_file() can parse into arbitrary dive tables. Signed-off-by: Berthold Stoeger --- desktop-widgets/mainwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'desktop-widgets/mainwindow.cpp') diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 5ec9e5af0..62cbe7b28 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -620,7 +620,7 @@ void MainWindow::on_actionCloudstorageopen_triggered() showProgressBar(); QByteArray fileNamePtr = QFile::encodeName(filename); - if (!parse_file(fileNamePtr.data())) + if (!parse_file(fileNamePtr.data(), &dive_table)) setCurrentFile(fileNamePtr.data()); process_dives(false, false); hideProgressBar(); @@ -1776,7 +1776,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()); + parse_file(fileNamePtr.data(), &dive_table); } process_dives(true, false); refreshDisplay(); @@ -1823,7 +1823,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())) { + if (!parse_file(fileNamePtr.data(), &dive_table)) { setCurrentFile(fileNamePtr.data()); addRecentFile(fileNamePtr, false); } -- cgit v1.2.3-70-g09d2