From f25fa2adc5dd37aca17335d8278fd00e39e9b733 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 12 Aug 2019 18:26:42 +0200 Subject: Cleanup: turn CylinderObjectHelper into value type CylinderObjectHelper is used for structured formatting of cylinder values in grantlee types. Instead of keeping a reference to a cylinder, turn it into a value type containing the formatted strings. This should be distinctly safer, as we don't risk having stale references flying around. Moreover, we don't have to use pointers but can use containers containing plain CylinderObjectHelper. Thus, no explicit memory management is needed, making the code distinctly easier to understand. Sadly, currently grantlee does not support Q_GADGET based Q_PROPERTY. Therefore a GRANTLEE_*_LOOKUP block has to be added. This can be removed in due course, as a patch to remedy this issue is in current grantlee master. Signed-off-by: Berthold Stoeger --- desktop-widgets/templatelayout.cpp | 2 ++ desktop-widgets/templatelayout.h | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) (limited to 'desktop-widgets') diff --git a/desktop-widgets/templatelayout.cpp b/desktop-widgets/templatelayout.cpp index ce70dc44e..99deeef97 100644 --- a/desktop-widgets/templatelayout.cpp +++ b/desktop-widgets/templatelayout.cpp @@ -133,6 +133,7 @@ QString TemplateLayout::generate() Grantlee::Engine engine(this); Grantlee::registerMetaType(); Grantlee::registerMetaType(); + Grantlee::registerMetaType(); // TODO: Remove when grantlee supports Q_GADGET // Note: Currently, this should not be transformed into a QVector<> or std::vector<>, // as diveList contains pointers to elements in this list. But vectors might relocate @@ -196,6 +197,7 @@ QString TemplateLayout::generateStatistics() Grantlee::registerMetaType(); Grantlee::registerMetaType(); Grantlee::registerMetaType(); + Grantlee::registerMetaType(); // TODO: Remove when grantlee supports Q_GADGET QVariantList years; diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h index 49aa51613..10c5e96cc 100644 --- a/desktop-widgets/templatelayout.h +++ b/desktop-widgets/templatelayout.h @@ -9,6 +9,7 @@ #include "core/statistics.h" #include "core/qthelper.h" #include "core/subsurface-qt/DiveObjectHelper.h" +#include "core/subsurface-qt/CylinderObjectHelper.h" // TODO: remove once grantlee supports Q_GADGET objects int getTotalWork(print_options *printOptions); void find_all_templates(); @@ -120,4 +121,22 @@ if (property == "year") { } GRANTLEE_END_LOOKUP +// TODO: This is currently needed because our grantlee version +// doesn't support Q_GADGET based classes. A patch to fix this +// exists. Remove in due course. +GRANTLEE_BEGIN_LOOKUP(CylinderObjectHelper) +if (property == "description") { + return object.description; +} else if (property == "size") { + return object.size; +} else if (property == "workingPressure") { + return object.workingPressure; +} else if (property == "startPressure") { + return object.startPressure; +} else if (property == "endPressure") { + return object.endPressure; +} else if (property == "gasMix") { + return object.gasMix; +} +GRANTLEE_END_LOOKUP #endif -- cgit v1.2.3-70-g09d2