diff options
Diffstat (limited to 'qt-models')
| -rw-r--r-- | qt-models/maplocationmodel.cpp | 21 | ||||
| -rw-r--r-- | qt-models/maplocationmodel.h | 3 |
2 files changed, 4 insertions, 20 deletions
diff --git a/qt-models/maplocationmodel.cpp b/qt-models/maplocationmodel.cpp index ab34a7b16..960636260 100644 --- a/qt-models/maplocationmodel.cpp +++ b/qt-models/maplocationmodel.cpp @@ -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) diff --git a/qt-models/maplocationmodel.h b/qt-models/maplocationmodel.h index 33a22366f..70f247f33 100644 --- a/qt-models/maplocationmodel.h +++ b/qt-models/maplocationmodel.h @@ -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: |