Cleanup: fold cleanUpEmpty() into closeCurrentFile()

The latter was the only caller of the former and there seems
to be no clear separation between the two. By making a single
function out of this the code is easier to follow and duplicate
code can be more easily detected. Matter of fact, the profile
was cleared twice.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

2 files changed, 11 insertions, 18 deletions

diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 47306bad9..416119b3b 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -634,21 +634,6 @@ void MainWindow::on_actionCloudOnline_triggered()
 	updateCloudOnlineStatus();
 }
 
-void MainWindow::cleanUpEmpty()
-{
-	current_dive = nullptr;
-	mainTab->clearTabs();
-	mainTab->updateDiveInfo();
-	graphics->setEmptyState();
-	diveList->reload();
-	diveList->setSortOrder(DiveTripModelBase::NR, Qt::DescendingOrder);
-	MapWidget::instance()->reload();
-	LocationInformationModel::instance()->update();
-	if (!existing_filename)
-		setTitle();
-	disableShortcuts();
-}
-
 bool MainWindow::okToClose(QString message)
 {
 	if (DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING ||
@@ -670,12 +655,21 @@ void MainWindow::setFileClean()
 
 void MainWindow::closeCurrentFile()
 {
-	graphics->setEmptyState();
 	/* free the dives and trips */
 	clear_git_id();
 	clear_dive_file_data();
+	current_dive = nullptr;
 	setCurrentFile(nullptr);
-	cleanUpEmpty();
+	graphics->setEmptyState();
+	mainTab->clearTabs();
+	mainTab->updateDiveInfo();
+	diveList->reload();
+	diveList->setSortOrder(DiveTripModelBase::NR, Qt::DescendingOrder);
+	MapWidget::instance()->reload();
+	LocationInformationModel::instance()->update();
+	if (!existing_filename)
+		setTitle();
+	disableShortcuts();
 	setFileClean();
 
 	clear_events();
diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h
index 62cc1b6f1..0eaa5e1fa 100644
--- a/desktop-widgets/mainwindow.h
+++ b/desktop-widgets/mainwindow.h
@@ -71,7 +71,6 @@ public:
 
 	void loadFiles(const QStringList files);
 	void importFiles(const QStringList importFiles);
-	void cleanUpEmpty();
 	void setToolButtonsEnabled(bool enabled);
 	void printPlan();
 	void checkSurvey();