From 17526ded58703064dedebdf53669e12f0ab4f43e Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Thu, 23 Apr 2020 23:32:42 +0200 Subject: cleanup: move clearing of device nodes to clear_dive_file_data() It makes no sense to keep the device nodes if all the other data is cleared. Let's do this automatically and not explicitly. This ensures that the function is also called on mobile. Currently it was only called on desktop. Weirdly, the parser-tests were expecting that the device nodes were not reset by clear_dive_file_data() and therefore divecomputers were accumulating in the test results. Thus, the additional computers had to be removed from the expected test results. Signed-off-by: Berthold Stoeger --- desktop-widgets/mainwindow.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'desktop-widgets/mainwindow.cpp') diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index d81a2f914..693d1f60f 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -18,7 +18,6 @@ #include "core/color.h" #include "core/device.h" -#include "core/divecomputer.h" #include "core/divesitehelpers.h" #include "core/errorhelper.h" #include "core/file.h" @@ -653,7 +652,7 @@ void MainWindow::closeCurrentFile() { /* free the dives and trips */ clear_git_id(); - MultiFilterSortModel::instance()->clear(); + MultiFilterSortModel::instance()->clear(); // this clears all the core data structures setCurrentFile(nullptr); diveList->setSortOrder(DiveTripModelBase::NR, Qt::DescendingOrder); MapWidget::instance()->reload(); @@ -663,8 +662,6 @@ void MainWindow::closeCurrentFile() setFileClean(); clear_events(); - - dcList.dcs.clear(); } void MainWindow::updateCloudOnlineStatus() -- cgit v1.2.3-70-g09d2