mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: rename variable PrintOptions to printOptions

Browse source 
We're quite inconsistent when it comes to variable naming.
The general usage is camelCase for Qt parts and snake_case
for core code. Virtually nowhere do we start variable names
with a capital letter. Therefore, turn this one weird case
into camelCase.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-04-26 17:51:25 +02:00 • committed by Dirk Hohndel
parent 449dec8269
commit af00361929
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
desktop-widgets/templatelayout.cpp
View file

@ -92,9 +92,9 @@ void copy_bundled_templates(QString src, QString dst, QStringList *templateBacku
} }
} }
TemplateLayout::TemplateLayout(print_options *PrintOptions, template_options *templateOptions) TemplateLayout::TemplateLayout(print_options *printOptions, template_options *templateOptions)
{ {
this->PrintOptions = PrintOptions; this->printOptions = printOptions;
this->templateOptions = templateOptions; this->templateOptions = templateOptions;
} }
@ -134,7 +134,7 @@ static QString preprocessTemplate(const QString &in)
QString TemplateLayout::generate() QString TemplateLayout::generate()
{ {
int progress = 0; int progress = 0;
int totalWork = getTotalWork(PrintOptions); int totalWork = getTotalWork(printOptions);
QString htmlContent; QString htmlContent;
Grantlee::Engine engine(this); Grantlee::Engine engine(this);
@ -152,7 +152,7 @@ QString TemplateLayout::generate()
int i; int i;
for_each_dive (i, dive) { for_each_dive (i, dive) {
//TODO check for exporting selected dives only //TODO check for exporting selected dives only
if (!dive->selected && PrintOptions->print_selected) if (!dive->selected && printOptions->print_selected)
continue; continue;
DiveObjectHelper *d = new DiveObjectHelper(dive); DiveObjectHelper *d = new DiveObjectHelper(dive);
diveList.append(QVariant::fromValue(d)); diveList.append(QVariant::fromValue(d));
@ -163,14 +163,14 @@ QString TemplateLayout::generate()
Grantlee::Context c; Grantlee::Context c;
c.insert("dives", diveList); c.insert("dives", diveList);
c.insert("template_options", QVariant::fromValue(*templateOptions)); c.insert("template_options", QVariant::fromValue(*templateOptions));
c.insert("print_options", QVariant::fromValue(*PrintOptions)); c.insert("print_options", QVariant::fromValue(*printOptions));
/* don't use the Grantlee loader API */ /* don't use the Grantlee loader API */
QString templateContents = readTemplate(PrintOptions->p_template); QString templateContents = readTemplate(printOptions->p_template);
QString preprocessed = preprocessTemplate(templateContents); QString preprocessed = preprocessTemplate(templateContents);
/* create the template from QString; is this thing allocating memory? */ /* create the template from QString; is this thing allocating memory? */
Grantlee::Template t = engine.newTemplate(preprocessed, PrintOptions->p_template); Grantlee::Template t = engine.newTemplate(preprocessed, printOptions->p_template);
if (!t || t->error()) { if (!t || t->error()) {
qDebug() << "Can't load template"; qDebug() << "Can't load template";
return htmlContent; return htmlContent;
@ -212,9 +212,9 @@ QString TemplateLayout::generateStatistics()
Grantlee::Context c; Grantlee::Context c;
c.insert("years", years); c.insert("years", years);
c.insert("template_options", QVariant::fromValue(*templateOptions)); c.insert("template_options", QVariant::fromValue(*templateOptions));
c.insert("print_options", QVariant::fromValue(*PrintOptions)); c.insert("print_options", QVariant::fromValue(*printOptions));
Grantlee::Template t = engine.loadByName(PrintOptions->p_template); Grantlee::Template t = engine.loadByName(printOptions->p_template);
if (!t || t->error()) { if (!t || t->error()) {
qDebug() << "Can't load template"; qDebug() << "Can't load template";
return htmlContent; return htmlContent;

4
desktop-widgets/templatelayout.h
View file

@ -20,14 +20,14 @@ extern QList<QString> grantlee_templates, grantlee_statistics_templates;
class TemplateLayout : public QObject { class TemplateLayout : public QObject {
Q_OBJECT Q_OBJECT
public: public:
TemplateLayout(print_options *PrintOptions, template_options *templateOptions); TemplateLayout(print_options *printOptions, template_options *templateOptions);
QString generate(); QString generate();
QString generateStatistics(); QString generateStatistics();
static QString readTemplate(QString template_name); static QString readTemplate(QString template_name);
static void writeTemplate(QString template_name, QString grantlee_template); static void writeTemplate(QString template_name, QString grantlee_template);
private: private:
print_options *PrintOptions; print_options *printOptions;
template_options *templateOptions; template_options *templateOptions;
signals: signals: