2 files changed, 83 insertions, 10 deletions

diff --git a/desktop-widgets/templatelayout.cpp b/desktop-widgets/templatelayout.cpp
index 99deeef97..bdcdfbbe9 100644
--- a/desktop-widgets/templatelayout.cpp
+++ b/desktop-widgets/templatelayout.cpp
@@ -134,19 +134,13 @@ QString TemplateLayout::generate()
 	Grantlee::registerMetaType<template_options>();
 	Grantlee::registerMetaType<print_options>();
 	Grantlee::registerMetaType<CylinderObjectHelper>(); // TODO: Remove when grantlee supports Q_GADGET
+	Grantlee::registerMetaType<DiveObjectHelper>(); // 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
-	// and thus invalidate the pointers! std::list<> is used here, because the new elements
-	// can be directly constructed in the list with the emplace_back() call.
-	// Ultimately, the memory management should be fixed.
-	std::list<DiveObjectHelper> diveObjectList;
 	QVariantList diveList;
 
 	struct dive *dive;
 	if (in_planner()) {
-		diveObjectList.emplace_back(&displayed_dive);
-		diveList.append(QVariant::fromValue(&diveObjectList.back()));
+		diveList.append(QVariant::fromValue(DiveObjectHelper(&displayed_dive)));
 		emit progressUpdated(100.0);
 	} else {
 		int i;
@@ -154,8 +148,7 @@ QString TemplateLayout::generate()
 			//TODO check for exporting selected dives only
 			if (!dive->selected && printOptions->print_selected)
 				continue;
-			diveObjectList.emplace_back(dive);
-			diveList.append(QVariant::fromValue(&diveObjectList.back()));
+			diveList.append(QVariant::fromValue(DiveObjectHelper(dive)));
 			progress++;
 			emit progressUpdated(lrint(progress * 100.0 / totalWork));
 		}
@@ -198,6 +191,7 @@ QString TemplateLayout::generateStatistics()
 	Grantlee::registerMetaType<template_options>();
 	Grantlee::registerMetaType<print_options>();
 	Grantlee::registerMetaType<CylinderObjectHelper>(); // TODO: Remove when grantlee supports Q_GADGET
+	Grantlee::registerMetaType<DiveObjectHelper>(); // TODO: Remove when grantlee supports Q_GADGET
 
 	QVariantList years;
 
diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h
index 10c5e96cc..aea44b2b8 100644
--- a/desktop-widgets/templatelayout.h
+++ b/desktop-widgets/templatelayout.h
@@ -139,4 +139,83 @@ if (property == "description") {
 	return object.gasMix;
 }
 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(DiveObjectHelper)
+if (property == "number") {
+	return object.number();
+} else if (property == "id") {
+	return object.id();
+} else if (property == "rating") {
+	return object.rating();
+} else if (property == "visibility") {
+	return object.visibility();
+} else if (property == "date") {
+	return object.date();
+} else if (property == "time") {
+	return object.time();
+} else if (property == "timestamp") {
+	return QVariant::fromValue(object.timestamp());
+} else if (property == "location") {
+	return object.location();
+} else if (property == "gps") {
+	return object.gps();
+} else if (property == "gps_decimal") {
+	return object.gps_decimal();
+} else if (property == "dive_site") {
+	return object.dive_site();
+} else if (property == "duration") {
+	return object.duration();
+} else if (property == "noDive") {
+	return object.noDive();
+} else if (property == "depth") {
+	return object.depth();
+} else if (property == "divemaster") {
+	return object.divemaster();
+} else if (property == "buddy") {
+	return object.buddy();
+} else if (property == "airTemp") {
+	return object.airTemp();
+} else if (property == "waterTemp") {
+	return object.waterTemp();
+} else if (property == "notes") {
+	return object.notes();
+} else if (property == "tags") {
+	return object.tags();
+} else if (property == "gas") {
+	return object.gas();
+} else if (property == "sac") {
+	return object.sac();
+} else if (property == "weightList") {
+	return object.weightList();
+} else if (property == "weights") {
+	return object.weights();
+} else if (property == "singleWeight") {
+	return object.singleWeight();
+} else if (property == "suit") {
+	return object.suit();
+} else if (property == "cylinderList") {
+	return object.cylinderList();
+} else if (property == "cylinders") {
+	return object.cylinders();
+} else if (property == "cylinderObjects") {
+	return QVariant::fromValue(object.cylinderObjects());
+} else if (property == "maxcns") {
+	return object.maxcns();
+} else if (property == "otu") {
+	return object.otu();
+} else if (property == "sumWeight") {
+	return object.sumWeight();
+} else if (property == "getCylinder") {
+	return object.getCylinder();
+} else if (property == "startPressure") {
+	return object.startPressure();
+} else if (property == "endPressure") {
+	return object.endPressure();
+} else if (property == "firstGas") {
+	return object.firstGas();
+}
+GRANTLEE_END_LOOKUP
 #endif