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

Dive site: replace UUID_ROLE by DIVESITE_ROLE

Browse source 
Access to dive-sites in the LocationInformationModel was via UUID.
Replace this by a direct access to the struct dive_site pointer.
Accordingly, rename the UUID_ROLE to DIVESITE_ROLE.

This is a small step in replacing dive-site UUIDs by pointers
throughout the code base.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-24 16:34:43 +02:00 • committed by Dirk Hohndel
parent d674c5028f
commit ab29f6416b
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop-widgets/locationinformation.cpp
View file

@ -84,7 +84,7 @@ void LocationInformationWidget::mergeSelectedDiveSites()
std::vector<struct dive_site *> selected_dive_sites; std::vector<struct dive_site *> selected_dive_sites;
selected_dive_sites.reserve(selection.count()); selected_dive_sites.reserve(selection.count());
Q_FOREACH (const QModelIndex &idx, selection) { Q_FOREACH (const QModelIndex &idx, selection) {
struct dive_site *ds = get_dive_site_by_uuid(idx.data(LocationInformationModel::UUID_ROLE).toUInt()); struct dive_site *ds = (struct dive_site *)idx.data(LocationInformationModel::DIVESITE_ROLE).value<void *>();
if (ds) if (ds)
selected_dive_sites.push_back(ds); selected_dive_sites.push_back(ds);
} }

4
qt-models/divelocationmodel.cpp
View file

@ -59,8 +59,8 @@ QVariant LocationInformationModel::getDiveSiteData(const struct dive_site *ds, i
else else
return QVariant(); return QVariant();
} }
case UUID_ROLE: case DIVESITE_ROLE:
return ds->uuid; return QVariant::fromValue<void *>((void *)ds); // Not nice: casting away const
} }
return QVariant(); return QVariant();
} }

2
qt-models/divelocationmodel.h
View file

@ -16,7 +16,7 @@ public:
// Common columns, roles and accessor function for all dive-site models. // Common columns, roles and accessor function for all dive-site models.
// Thus, different views can connect to different models. // Thus, different views can connect to different models.
enum Columns { UUID, NAME, LATITUDE, LONGITUDE, COORDS, DESCRIPTION, NOTES, TAXONOMY_1, TAXONOMY_2, TAXONOMY_3, COLUMNS}; enum Columns { UUID, NAME, LATITUDE, LONGITUDE, COORDS, DESCRIPTION, NOTES, TAXONOMY_1, TAXONOMY_2, TAXONOMY_3, COLUMNS};
enum Roles { UUID_ROLE = Qt::UserRole + 1 }; enum Roles { DIVESITE_ROLE = Qt::UserRole + 1 };
static QVariant getDiveSiteData(const struct dive_site *ds, int column, int role); static QVariant getDiveSiteData(const struct dive_site *ds, int column, int role);
LocationInformationModel(QObject *obj = 0); LocationInformationModel(QObject *obj = 0);