Remove code references to Grantlee

These are no longer needed. What is still missing is removing Grantlee from the
various build systems.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

2 files changed, 0 insertions, 236 deletions

diff --git a/desktop-widgets/templatelayout.cpp b/desktop-widgets/templatelayout.cpp
index b9cd5545e..045c33188 100644
--- a/desktop-widgets/templatelayout.cpp
+++ b/desktop-widgets/templatelayout.cpp
@@ -131,11 +131,6 @@ QString TemplateLayout::generate()
 	int totalWork = getTotalWork(printOptions);
 
 	QString htmlContent;
-	Grantlee::Engine engine(this);
-	Grantlee::registerMetaType<template_options>();
-	Grantlee::registerMetaType<print_options>();
-	Grantlee::registerMetaType<CylinderObjectHelper>(); // TODO: Remove when grantlee supports Q_GADGET
-	Grantlee::registerMetaType<DiveObjectHelperGrantlee>(); // TODO: Remove when grantlee supports Q_GADGET
 
 	QVariantList diveList;
 
@@ -154,12 +149,7 @@ QString TemplateLayout::generate()
 			emit progressUpdated(lrint(progress * 100.0 / totalWork));
 		}
 	}
-	Grantlee::Context c;
-	c.insert("dives", diveList);
-	c.insert("template_options", QVariant::fromValue(*templateOptions));
-	c.insert("print_options", QVariant::fromValue(*printOptions));
 
-	/* don't use the Grantlee loader API */
 	QString templateContents = readTemplate(printOptions->p_template);
 
 	QHash<QString, QVariant> options;
@@ -173,40 +163,11 @@ QString TemplateLayout::generate()
 	parser(tokens, pos, out, options);
 	htmlContent = out.readAll();
 	return htmlContent;
-
-	QString preprocessed = preprocessTemplate(templateContents);
-
-	/* create the template from QString; is this thing allocating memory? */
-	Grantlee::Template t = engine.newTemplate(preprocessed, printOptions->p_template);
-	if (!t || t->error()) {
-		qDebug() << "Can't load template";
-		return htmlContent;
-	}
-
-	htmlContent = t->render(&c);
-
-	if (t->error()) {
-		qDebug() << "Can't render template";
-	}
-	return htmlContent;
 }
 
 QString TemplateLayout::generateStatistics()
 {
 	QString htmlContent;
-	Grantlee::Engine engine(this);
-
-	QSharedPointer<Grantlee::FileSystemTemplateLoader> m_templateLoader =
-		QSharedPointer<Grantlee::FileSystemTemplateLoader>(new Grantlee::FileSystemTemplateLoader());
-	m_templateLoader->setTemplateDirs(QStringList() << getPrintingTemplatePathUser() + QDir::separator() + QString("statistics"));
-	engine.addTemplateLoader(m_templateLoader);
-
-	Grantlee::registerMetaType<YearInfo>();
-	Grantlee::registerMetaType<template_options>();
-	Grantlee::registerMetaType<print_options>();
-	Grantlee::registerMetaType<CylinderObjectHelper>(); // TODO: Remove when grantlee supports Q_GADGET
-	Grantlee::registerMetaType<DiveObjectHelperGrantlee>(); // TODO: Remove when grantlee supports Q_GADGET
-
 	QVariantList years;
 
 	int i = 0;
@@ -218,16 +179,6 @@ QString TemplateLayout::generateStatistics()
 		i++;
 	}
 
-	Grantlee::Context c;
-	c.insert("years", years);
-	c.insert("template_options", QVariant::fromValue(*templateOptions));
-	c.insert("print_options", QVariant::fromValue(*printOptions));
-
-	Grantlee::Template t = engine.loadByName(printOptions->p_template);
-	if (!t || t->error()) {
-		qDebug() << "Can't load template";
-		return htmlContent;
-	}
 	QString templateFile = QString("statistics") + QDir::separator() + printOptions->p_template;
 	QString templateContents = readTemplate(templateFile);
 
@@ -242,17 +193,6 @@ QString TemplateLayout::generateStatistics()
 	parser(tokens, pos, out, options);
 	htmlContent = out.readAll();
 	return htmlContent;
-
-
-	htmlContent = t->render(&c);
-
-	if (t->error()) {
-		qDebug() << "Can't render template";
-		return htmlContent;
-	}
-
-	emit progressUpdated(100);
-	return htmlContent;
 }
 
 QString TemplateLayout::readTemplate(QString template_name)
diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h
index 102e48661..cf295e5ed 100644
--- a/desktop-widgets/templatelayout.h
+++ b/desktop-widgets/templatelayout.h
@@ -3,7 +3,6 @@
 #define TEMPLATELAYOUT_H
 
 #include <QStringList>
-#include <grantlee_templates.h>
 #include "mainwindow.h"
 #include "printoptions.h"
 #include "core/statistics.h"
@@ -56,179 +55,4 @@ Q_DECLARE_METATYPE(template_options)
 Q_DECLARE_METATYPE(print_options)
 Q_DECLARE_METATYPE(YearInfo)
 
-GRANTLEE_BEGIN_LOOKUP(template_options)
-if (property == "font") {
-	switch (object.font_index) {
-	case 0:
-		return "Arial, Helvetica, sans-serif";
-	case 1:
-		return "Impact, Charcoal, sans-serif";
-	case 2:
-		return "Georgia, serif";
-	case 3:
-		return "Courier, monospace";
-	case 4:
-		return "Verdana, Geneva, sans-serif";
-	}
-} else if (property == "borderwidth") {
-	return object.border_width;
-} else if (property == "font_size") {
-	return object.font_size / 9.0;
-} else if (property == "line_spacing") {
-	return object.line_spacing;
-} else if (property == "color1") {
-	return object.color_palette.color1.name();
-} else if (property == "color2") {
-	return object.color_palette.color2.name();
-} else if (property == "color3") {
-	return object.color_palette.color3.name();
-} else if (property == "color4") {
-	return object.color_palette.color4.name();
-} else if (property == "color5") {
-	return object.color_palette.color5.name();
-} else if (property == "color6") {
-	return object.color_palette.color6.name();
-}
-GRANTLEE_END_LOOKUP
-
-GRANTLEE_BEGIN_LOOKUP(print_options)
-if (property == "grayscale") {
-	if (object.color_selected) {
-		return "";
-	} else {
-		return "-webkit-filter: grayscale(100%)";
-	}
-}
-GRANTLEE_END_LOOKUP
-
-GRANTLEE_BEGIN_LOOKUP(YearInfo)
-if (property == "year") {
-	return object.year->period;
-} else if (property == "dives") {
-	return object.year->selection_size;
-} else if (property == "min_temp") {
-	return object.year->min_temp.mkelvin == 0 ? "0" : get_temperature_string(object.year->min_temp, true);
-} else if (property == "max_temp") {
-	return object.year->max_temp.mkelvin == 0 ? "0" : get_temperature_string(object.year->max_temp, true);
-} else if (property == "total_time") {
-	return get_dive_duration_string(object.year->total_time.seconds, gettextFromC::tr("h"),
-									gettextFromC::tr("min"), gettextFromC::tr("sec"), " ");
-} else if (property == "avg_time") {
-	return get_minutes(object.year->total_time.seconds / object.year->selection_size);
-} else if (property == "shortest_time") {
-	return get_minutes(object.year->shortest_time.seconds);
-} else if (property == "longest_time") {
-	return get_minutes(object.year->longest_time.seconds);
-} else if (property == "avg_depth") {
-	return get_depth_string(object.year->avg_depth);
-} else if (property == "min_depth") {
-	return get_depth_string(object.year->min_depth);
-} else if (property == "max_depth") {
-	return get_depth_string(object.year->max_depth);
-} else if (property == "avg_sac") {
-	return get_volume_string(object.year->avg_sac);
-} else if (property == "min_sac") {
-	return get_volume_string(object.year->min_sac);
-} else if (property == "max_sac") {
-	return get_volume_string(object.year->max_sac);
-}
-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
-
-// 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(DiveObjectHelperGrantlee)
-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