aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-02-27 20:55:56 +0100
committerGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-04-07 00:13:35 +0200
commitee64a85d2e97c7f3d20de364ac908ac16fbfbc7a (patch)
tree08cbacc4a05f59ad52132f63c2ae931dff34cb94
parentd597b6dca543f1f43d3921e001f45b76975b36f2 (diff)
downloadsubsurface-ee64a85d2e97c7f3d20de364ac908ac16fbfbc7a.tar.gz
cleanup: remove cylinders_equal check in MainTab::rejectChanges()
This check make no more sense since cylinder editing is now treated by undo commands. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
-rw-r--r--desktop-widgets/tab-widgets/maintab.cpp24
1 files changed, 1 insertions, 23 deletions
diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp
index ea20219ce..bd3919b24 100644
--- a/desktop-widgets/tab-widgets/maintab.cpp
+++ b/desktop-widgets/tab-widgets/maintab.cpp
@@ -556,33 +556,11 @@ void MainTab::acceptChanges()
editMode = NONE;
}
-bool weightsystems_equal(const dive *d1, const dive *d2)
-{
- if (d1->weightsystems.nr != d2->weightsystems.nr)
- return false;
- for (int i = 0; i < d1->weightsystems.nr; ++i) {
- if (!same_weightsystem(d1->weightsystems.weightsystems[i], d2->weightsystems.weightsystems[i]))
- return false;
- }
- return true;
-}
-
-bool cylinders_equal(const dive *d1, const dive *d2)
-{
- if (d1->cylinders.nr != d2->cylinders.nr)
- return false;
- for (int i = 0; i < d1->cylinders.nr; ++i) {
- if (!same_cylinder(*get_cylinder(d1, i), *get_cylinder(d2, i)))
- return false;
- }
- return true;
-}
-
void MainTab::rejectChanges()
{
EditMode lastMode = editMode;
- if (lastMode != NONE && current_dive && !cylinders_equal(current_dive, &displayed_dive)) {
+ if (lastMode != NONE && current_dive) {
if (QMessageBox::warning(MainWindow::instance(), TITLE_OR_TEXT(tr("Discard the changes?"),
tr("You are about to discard your changes.")),
QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard) != QMessageBox::Discard) {