From 1fc54e907f0e273dc3d63f96a2f48e67eb165926 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Wed, 25 Dec 2019 11:56:44 +0100 Subject: testing: prepare diveplannermodel to be used in testing In order to make tests for plannerShared, some qt-models must be linked, and due to the fact that commands are currently not available for mobile (which also makes the tests) and #ifdef must be added. The test version of diveplannermodel will be specially compiled in (SUBSURFACE_TESTING set) in the tests directory. Signed-off-by: Jan Iversen --- qt-models/diveplannermodel.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'qt-models') diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index 629c6458d..56910a507 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -7,9 +7,9 @@ #include "core/device.h" #include "core/qthelper.h" #include "core/settings/qPrefDivePlanner.h" -#ifndef SUBSURFACE_MOBILE +#if not defined(SUBSURFACE_MOBILE) && not defined(SUBSURFACE_TESTING) #include "commands/command.h" -#endif // SUBSURFACE_MOBILE +#endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING #include "core/gettextfromc.h" #include "core/deco.h" #include @@ -1171,20 +1171,20 @@ 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! -#ifndef SUBSURFACE_MOBILE +#if not defined(SUBSURFACE_MOBILE) && not defined(SUBSURFACE_TESTING) Command::addDive(&displayed_dive, autogroup, true); -#endif // SUBSURFACE_MOBILE +#endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING } else 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. -#ifndef SUBSURFACE_MOBILE +#if not defined(SUBSURFACE_MOBILE) && not defined(SUBSURFACE_TESTING) Command::addDive(&displayed_dive, false, false); -#endif // SUBSURFACE_MOBILE +#endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING } else { // we were planning an old dive and rewrite the plan -#ifndef SUBSURFACE_MOBILE +#if not defined(SUBSURFACE_MOBILE) && not defined(SUBSURFACE_TESTING) Command::replanDive(&displayed_dive); -#endif // SUBSURFACE_MOBILE +#endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING } // Remove and clean the diveplan, so we don't delete -- cgit v1.2.3-70-g09d2