diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-02-26 22:53:36 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-02-27 14:49:01 -0800 |
| commit | e3950df86473dc45c1e7aa730a0e19cc51d4a41c (patch) | |
| tree | 8340036b136310f90e1002c779be2c9f4cc8f364 | |
| parent | 0306109e952c46d182f78e14a0259f56cce87928 (diff) | |
| download | subsurface-e3950df86473dc45c1e7aa730a0e19cc51d4a41c.tar.gz | |
cleanup: remove weightsystems_equal function
This was used to test whether the "really discard changes?"
message should be shown. However, we now edit weightsystems
directly with undo commands. Therefore, the check is unnecessary
and the whole function can be removed.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
| -rw-r--r-- | desktop-widgets/tab-widgets/TabDiveEquipment.cpp | 3 | ||||
| -rw-r--r-- | desktop-widgets/tab-widgets/maintab.cpp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/desktop-widgets/tab-widgets/TabDiveEquipment.cpp b/desktop-widgets/tab-widgets/TabDiveEquipment.cpp index 0a5786e50..33a8e5a3c 100644 --- a/desktop-widgets/tab-widgets/TabDiveEquipment.cpp +++ b/desktop-widgets/tab-widgets/TabDiveEquipment.cpp @@ -210,9 +210,8 @@ static QVector<dive *> getSelectedDivesCurrentLast() return res; } -// TODO: This are only temporary functions until undo of weightsystems and cylinders is implemented. +// TODO: This is a temporary functions until undo of cylinders is implemented. // Therefore it is not worth putting it in a header. -extern bool weightsystems_equal(const dive *d1, const dive *d2); extern bool cylinders_equal(const dive *d1, const dive *d2); void TabDiveEquipment::acceptChanges() diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index 006603388..9bdf4d35d 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -589,9 +589,7 @@ void MainTab::rejectChanges() { EditMode lastMode = editMode; - if (lastMode != NONE && current_dive && - (!cylinders_equal(current_dive, &displayed_dive) || - !weightsystems_equal(current_dive, &displayed_dive))) { + if (lastMode != NONE && current_dive && !cylinders_equal(current_dive, &displayed_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) { |