From 8a33c04894d6830885d7f47140962d5fdafd648f Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 15 Nov 2019 20:59:13 +0100 Subject: Cleanup: use DiveTripModelBase::clear() to reset the log Introduce a DiveTripModelBase::clear() function that cleanly clears all dive data inside a beginResetModel()/endResetModel() pair. Thus, the UI will be cleanly reset and we can remove explicit calls to - graphics->setEmptyState() - mainTab->clearTabs() - mainTab->clearTabs() - diveList->reload() from MainWindow::closeCurrentFile(). Signed-off-by: Berthold Stoeger --- desktop-widgets/mainwindow.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 632917733..7b3120ca4 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -657,12 +657,8 @@ void MainWindow::closeCurrentFile() { /* free the dives and trips */ clear_git_id(); - clear_dive_file_data(); + DiveTripModelBase::instance()->clear(); setCurrentFile(nullptr); - graphics->setEmptyState(); - mainTab->clearTabs(); - mainTab->updateDiveInfo(); - diveList->reload(); diveList->setSortOrder(DiveTripModelBase::NR, Qt::DescendingOrder); MapWidget::instance()->reload(); LocationInformationModel::instance()->update(); -- cgit v1.2.3-70-g09d2