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: turn CylinderObjectHelper into value type

Browse source 
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 <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-08-12 18:26:42 +02:00 • committed by Dirk Hohndel
parent 0d045f8c14
commit f25fa2adc5
6 changed files with 54 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

35
core/subsurface-qt/CylinderObjectHelper.h
View file

@ -6,27 +6,24 @@
#include <QObject>
#include <QString>
class CylinderObjectHelper : public QObject {
Q_OBJECT
Q_PROPERTY(QString description READ description CONSTANT)
Q_PROPERTY(QString size READ size CONSTANT)
Q_PROPERTY(QString workingPressure READ workingPressure CONSTANT)
Q_PROPERTY(QString startPressure READ startPressure CONSTANT)
Q_PROPERTY(QString endPressure READ endPressure CONSTANT)
Q_PROPERTY(QString gasMix READ gasMix CONSTANT)
class CylinderObjectHelper {
Q_GADGET
Q_PROPERTY(QString description MEMBER description CONSTANT)
Q_PROPERTY(QString size MEMBER size CONSTANT)
Q_PROPERTY(QString workingPressure MEMBER workingPressure CONSTANT)
Q_PROPERTY(QString startPressure MEMBER startPressure CONSTANT)
Q_PROPERTY(QString endPressure MEMBER endPressure CONSTANT)
Q_PROPERTY(QString gasMix MEMBER gasMix CONSTANT)
public:
CylinderObjectHelper(cylinder_t *cylinder = NULL);
~CylinderObjectHelper();
QString description() const;
QString size() const;
QString workingPressure() const;
QString startPressure() const;
QString endPressure() const;
QString gasMix() const;
private:
cylinder_t *m_cyl;
QString description;
QString size;
QString workingPressure;
QString startPressure;
QString endPressure;
QString gasMix;
};
Q_DECLARE_METATYPE(CylinderObjectHelper *)
Q_DECLARE_METATYPE(CylinderObjectHelper)
#endif