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

cleanup: remove MainWindow::unsavedChanges() function

Browse source 
This function was used to unify both methods of checking for
unsaved changes: the global unsaved_changes() flag and the
Command::clean() function of the undo-system.

However, all desktop functions are now undoable and therefore
the function is not needed and can be replaced by calls
to !Command::clean().

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-10-21 23:20:46 +02:00 • committed by Dirk Hohndel
parent 8a20d019c2
commit fa6235d035
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
desktop-widgets/mainwindow.cpp
View file

@ -570,14 +570,6 @@ void MainWindow::on_actionCloudstoragesave_triggered()
setFileClean(); setFileClean();
} }
// Currently we have two markers for unsaved changes:
// 1) unsaved_changes() returns true for non-undoable changes.
// 2) Command::isClean() returns false for undoable changes.
static bool unsavedChanges()
{
return unsaved_changes() || !Command::isClean();
}
void MainWindow::on_actionCloudOnline_triggered() void MainWindow::on_actionCloudOnline_triggered()
{ {
bool isOffline = !ui.actionCloudOnline->isChecked(); bool isOffline = !ui.actionCloudOnline->isChecked();
@ -597,7 +589,7 @@ void MainWindow::on_actionCloudOnline_triggered()
git_local_only = isOffline; git_local_only = isOffline;
if (!isOffline) { if (!isOffline) {
// User requests to go online. Try to sync cloud storage // User requests to go online. Try to sync cloud storage
if (unsavedChanges()) { if (!Command::isClean()) {
// If there are unsaved changes, ask the user if they want to save them. // If there are unsaved changes, ask the user if they want to save them.
// If they don't, they have to sync manually. // If they don't, they have to sync manually.
if (QMessageBox::warning(this, tr("Save changes?"), if (QMessageBox::warning(this, tr("Save changes?"),
@ -625,7 +617,7 @@ bool MainWindow::okToClose(QString message)
QMessageBox::warning(this, tr("Warning"), message); QMessageBox::warning(this, tr("Warning"), message);
return false; return false;
} }
if (unsavedChanges() && askSaveChanges() == false) if (!Command::isClean() && askSaveChanges() == false)
return false; return false;
return true; return true;
@ -1303,7 +1295,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
return; return;
} }
if (unsavedChanges() && (askSaveChanges() == false)) { if (!Command::isClean() && (askSaveChanges() == false)) {
event->ignore(); event->ignore();
return; return;
} }
@ -1528,7 +1520,7 @@ void MainWindow::setTitle()
return; return;
} }
QString unsaved = (unsavedChanges() ? " *" : ""); QString unsaved = (!Command::isClean() ? " *" : "");
QString shown = QString(" (%1)").arg(DiveFilter::instance()->shownText()); QString shown = QString(" (%1)").arg(DiveFilter::instance()->shownText());
setWindowTitle("Subsurface: " + displayedFilename(existing_filename) + unsaved + shown); setWindowTitle("Subsurface: " + displayedFilename(existing_filename) + unsaved + shown);
} }