diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-04-13 18:07:17 +0200 |
|---|---|---|
| committer |  Robert C. Helling <helling@atdotde.de> | 2020-05-04 10:42:07 +0200 |
| commit | acfcd866bdc76a727a3ff10c6d71727379881a64 (patch) | |
| tree | 4d96de61ee0d22d1177762f20d356422ea0ae20b | |
| parent | 9bbd8b8169480f124d81b9cd4d05064ac664ae0d (diff) | |
| download | subsurface-acfcd866bdc76a727a3ff10c6d71727379881a64.tar.gz | |
planner: remove conditional command-calls for mobile
In the planner the undo commands for adding / editing dives were
only called if not on mobile. This is from days were mobile didn't
have undo commands. We can remove these now.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
| -rw-r--r-- | qt-models/diveplannermodel.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index ea24c3a73..d0b919a61 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -9,9 +9,9 @@ #include "core/qthelper.h" #include "core/settings/qPrefDivePlanner.h" #include "core/settings/qPrefUnit.h" -#if not defined(SUBSURFACE_MOBILE) && not defined(SUBSURFACE_TESTING) +#if !defined(SUBSURFACE_TESTING) #include "commands/command.h" -#endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING +#endif // !SUBSURFACE_TESTING #include "core/gettextfromc.h" #include "core/deco.h" #include <QApplication> @@ -1244,22 +1244,22 @@ void DivePlannerPointsModel::createPlan(bool replanCopy) if (!current_dive || displayed_dive.id != current_dive->id) { // we were planning a new dive, not re-planning an existing one displayed_dive.divetrip = nullptr; // Should not be necessary, just in case! -#if not defined(SUBSURFACE_MOBILE) && not defined(SUBSURFACE_TESTING) +#if !defined(SUBSURFACE_TESTING) Command::addDive(&displayed_dive, autogroup, true); -#endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING +#endif // !SUBSURFACE_TESTING } else { copy_events_until(current_dive, &displayed_dive, preserved_until.seconds); if (replanCopy) { // we were planning an old dive and save as a new dive displayed_dive.id = dive_getUniqID(); // Things will break horribly if we create dives with the same id. -#if not defined(SUBSURFACE_MOBILE) && not defined(SUBSURFACE_TESTING) +#if !defined(SUBSURFACE_TESTING) Command::addDive(&displayed_dive, false, false); -#endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING +#endif // !SUBSURFACE_TESTING } else { // we were planning an old dive and rewrite the plan -#if not defined(SUBSURFACE_MOBILE) && not defined(SUBSURFACE_TESTING) +#if !defined(SUBSURFACE_TESTING) Command::replanDive(&displayed_dive); -#endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING +#endif // !SUBSURFACE_TESTING } } |