mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Dive list: don't pass dive_site via uintptr_t through QML
Now that struct dive_site * is a proper Q_METATYPE it is not necessary anymore to pass dive-sites as opaque uintptr_t types. Simply pass a QVariants or directly via dive_site *. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
c980216dc0
commit
a0cc02dfe8
3 changed files with 5 additions and 21 deletions
|
@ -129,7 +129,7 @@ QString DiveObjectHelper::gps_decimal() const
|
|||
|
||||
QVariant DiveObjectHelper::dive_site() const
|
||||
{
|
||||
return QVariant::fromValue((uintptr_t)m_dive->dive_site);
|
||||
return QVariant::fromValue(m_dive->dive_site);
|
||||
}
|
||||
|
||||
QString DiveObjectHelper::duration() const
|
||||
|
|
|
@ -20,12 +20,7 @@ QVariant MapLocation::getRole(int role) const
|
|||
{
|
||||
switch (role) {
|
||||
case Roles::RoleDivesite:
|
||||
// To pass the dive site as an opaque object to QML, we convert it to uintptr_t.
|
||||
// This type is guaranteed to hold a full pointer, therefore false equivalence
|
||||
// owing to truncation can happen. The more logical type would of course be void *,
|
||||
// but in tests all QVariant<void *> compared equal. It is unclear whether this is
|
||||
// a bug in a certain version of QML or QML is inredibly broken by design.
|
||||
return QVariant::fromValue((uintptr_t)m_ds);
|
||||
return QVariant::fromValue((dive_site *)m_ds);
|
||||
case Roles::RoleCoordinate:
|
||||
return QVariant::fromValue(m_coordinate);
|
||||
case Roles::RoleName:
|
||||
|
@ -58,8 +53,7 @@ struct dive_site *MapLocation::divesite()
|
|||
|
||||
QVariant MapLocation::divesiteVariant()
|
||||
{
|
||||
// See comment on uintptr_t above
|
||||
return QVariant::fromValue((uintptr_t)m_ds);
|
||||
return QVariant::fromValue(m_ds);
|
||||
}
|
||||
|
||||
MapLocationModel::MapLocationModel(QObject *parent) : QAbstractListModel(parent),
|
||||
|
@ -139,18 +133,9 @@ void MapLocationModel::setSelected(struct dive_site *ds, bool fromClick)
|
|||
emit selectedLocationChanged(getMapLocation(m_selectedDs));
|
||||
}
|
||||
|
||||
void MapLocationModel::setSelected(QVariant divesite, QVariant fromClick)
|
||||
{
|
||||
// See comment on uintptr_t above
|
||||
struct dive_site *ds = (struct dive_site *)qvariant_cast<uintptr_t>(divesite);
|
||||
const bool fromClickBool = qvariant_cast<bool>(fromClick);
|
||||
setSelected(ds, fromClickBool);
|
||||
}
|
||||
|
||||
QVariant MapLocationModel::selectedDs()
|
||||
{
|
||||
// See comment on uintptr_t above
|
||||
return QVariant::fromValue((uintptr_t)m_selectedDs);
|
||||
return QVariant::fromValue(m_selectedDs);
|
||||
}
|
||||
|
||||
MapLocation *MapLocationModel::getMapLocation(const struct dive_site *ds)
|
||||
|
|
|
@ -65,8 +65,7 @@ public:
|
|||
void clear();
|
||||
MapLocation *getMapLocation(const struct dive_site *ds);
|
||||
void updateMapLocationCoordinates(const struct dive_site *ds, QGeoCoordinate coord);
|
||||
void setSelected(struct dive_site *ds, bool fromClick = true);
|
||||
Q_INVOKABLE void setSelected(QVariant divesite, QVariant fromClick = true);
|
||||
Q_INVOKABLE void setSelected(struct dive_site *ds, bool fromClick = true);
|
||||
QVariant selectedDs();
|
||||
|
||||
protected:
|
||||
|
|
Loading…
Add table
Reference in a new issue