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

DiveObjectHelper: Turn DiveObjectHelper into Q_GADGET based object

Browse source 
DiveObjectHelper is a tiny wrapper around dive * to allow access
to dive data from QML and grantlee. It doesn't have to be a
full-fledged QObject with support for signals, etc. Therefore,
turn it into a Q_GADGET based object. This allows us passing the
object around as object, not as pointer to DiveObjectHelper.
This makes memory-management distinctly easier.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-08-13 07:28:24 +02:00 • committed by bstoeger
parent a79c45e401
commit be763452ad
5 changed files with 101 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
desktop-widgets/templatelayout.cpp
View file

@ -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;