mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: fold cleanUpEmpty() into closeCurrentFile()

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2019-11-15 19:38:27 +01:00 • committed by Dirk Hohndel
parent 36094e4a18
commit 808316f434
2 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
desktop-widgets/mainwindow.cpp
View file

@ -634,21 +634,6 @@ void MainWindow::on_actionCloudOnline_triggered()
updateCloudOnlineStatus(); 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) bool MainWindow::okToClose(QString message)
{ {
if (DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING || if (DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING ||
@ -670,12 +655,21 @@ void MainWindow::setFileClean()
void MainWindow::closeCurrentFile() void MainWindow::closeCurrentFile()
{ {
graphics->setEmptyState();
/* free the dives and trips */ /* free the dives and trips */
clear_git_id(); clear_git_id();
clear_dive_file_data(); clear_dive_file_data();
current_dive = nullptr;
setCurrentFile(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(); setFileClean();
clear_events(); clear_events();

1
desktop-widgets/mainwindow.h
View file

@ -71,7 +71,6 @@ public:
void loadFiles(const QStringList files); void loadFiles(const QStringList files);
void importFiles(const QStringList importFiles); void importFiles(const QStringList importFiles);
void cleanUpEmpty();
void setToolButtonsEnabled(bool enabled); void setToolButtonsEnabled(bool enabled);
void printPlan(); void printPlan();
void checkSurvey(); void checkSurvey();