mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

planner: remove conditional command-calls for mobile

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2020-04-13 18:07:17 +02:00 committed by Robert C. Helling
parent 9bbd8b8169
commit acfcd866bd
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
qt-models/diveplannermodel.cpp
View file

@ -9,9 +9,9 @@
#include "core/qthelper.h" #include "core/qthelper.h"
#include "core/settings/qPrefDivePlanner.h" #include "core/settings/qPrefDivePlanner.h"
#include "core/settings/qPrefUnit.h" #include "core/settings/qPrefUnit.h"
#if not defined(SUBSURFACE_MOBILE) && not defined(SUBSURFACE_TESTING) #if !defined(SUBSURFACE_TESTING)
#include "commands/command.h" #include "commands/command.h"
#endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING #endif // !SUBSURFACE_TESTING
#include "core/gettextfromc.h" #include "core/gettextfromc.h"
#include "core/deco.h" #include "core/deco.h"
#include <QApplication> #include <QApplication>
@ -1244,22 +1244,22 @@ void DivePlannerPointsModel::createPlan(bool replanCopy)
if (!current_dive || displayed_dive.id != current_dive->id) { if (!current_dive || displayed_dive.id != current_dive->id) {
// we were planning a new dive, not re-planning an existing one // we were planning a new dive, not re-planning an existing one
displayed_dive.divetrip = nullptr; // Should not be necessary, just in case! 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); Command::addDive(&displayed_dive, autogroup, true);
#endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING #endif // !SUBSURFACE_TESTING
} else { } else {
copy_events_until(current_dive, &displayed_dive, preserved_until.seconds); copy_events_until(current_dive, &displayed_dive, preserved_until.seconds);
if (replanCopy) { if (replanCopy) {
// we were planning an old dive and save as a new dive // 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. 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); Command::addDive(&displayed_dive, false, false);
#endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING #endif // !SUBSURFACE_TESTING
} else { } else {
// we were planning an old dive and rewrite the plan // 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); Command::replanDive(&displayed_dive);
#endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING #endif // !SUBSURFACE_TESTING
} }
} }