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 QMLProfile::diveId from QString to int

Browse source 
This property is used to render the profile of a given dive.
Weirdly, even though the diveId is an integer, it was stored
as a string. It is not clear why that is the case. Therefore,
turn into the more natural int and avoid unnecessary conversion.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-12-23 20:52:41 +01:00 • committed by Dirk Hohndel
parent 967f0e56d7
commit 19b8c9a33a
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
profile-widget/qmlprofile.cpp
View file

@ -80,17 +80,17 @@ void QMLProfile::setMargin(int margin)
m_margin = margin; m_margin = margin;
} }
QString QMLProfile::diveId() const int QMLProfile::diveId() const
{ {
return m_diveId; return m_diveId;
} }
void QMLProfile::setDiveId(const QString &diveId) void QMLProfile::setDiveId(int diveId)
{ {
m_diveId = diveId; m_diveId = diveId;
struct dive *d = get_dive_by_uniq_id(m_diveId.toInt()); if (m_diveId < 0)
if (m_diveId.toInt() < 1)
return; return;
struct dive *d = get_dive_by_uniq_id(diveId);
if (!d) if (!d)
return; return;
if (verbose) if (verbose)

8
profile-widget/qmlprofile.h
View file

@ -8,7 +8,7 @@
class QMLProfile : public QQuickPaintedItem class QMLProfile : public QQuickPaintedItem
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString diveId MEMBER m_diveId WRITE setDiveId) Q_PROPERTY(int diveId MEMBER m_diveId WRITE setDiveId)
Q_PROPERTY(qreal devicePixelRatio READ devicePixelRatio WRITE setDevicePixelRatio NOTIFY devicePixelRatioChanged) Q_PROPERTY(qreal devicePixelRatio READ devicePixelRatio WRITE setDevicePixelRatio NOTIFY devicePixelRatioChanged)
public: public:
@ -16,8 +16,8 @@ public:
void paint(QPainter *painter); void paint(QPainter *painter);
QString diveId() const; int diveId() const;
void setDiveId(const QString &diveId); void setDiveId(int diveId);
qreal devicePixelRatio() const; qreal devicePixelRatio() const;
void setDevicePixelRatio(qreal dpr); void setDevicePixelRatio(qreal dpr);
@ -25,7 +25,7 @@ public slots:
void setMargin(int margin); void setMargin(int margin);
void screenChanged(QScreen *screen); void screenChanged(QScreen *screen);
private: private:
QString m_diveId; int m_diveId;
qreal m_devicePixelRatio; qreal m_devicePixelRatio;
int m_margin; int m_margin;
QScopedPointer<ProfileWidget2> m_profileWidget; QScopedPointer<ProfileWidget2> m_profileWidget;