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: remove UUIDs from LocationInformationModel

Browse source 
Replace UUIDs from LocationInformationModel and fix the fallout.
Notably, replace the UUID "column" by a DIVESITE "column".
Getting pointers through Qt's QVariant is horrible, we'll have
to think about a better solution.

RECENTLY_ADDED_DIVESITE now defines to a special pointer to
struct dive_site (defined as ~0).

This fixes an interesting logic bug:
The old code checked the uuid of the LocationInformationModel (currUuid)
for the value "1", which corresponded to RECENTLY_ADDED_DIVESITE.
If equal, currType would be set to NEW_DIVE_SITE. Later, _currType_
was compared against _RECENTLY_ADDED_DIVESITE_. This would only work
because NEW_DIVE_SITE and RECENTLY_ADDED_DIVESITE both were defined
as 1.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-25 08:02:06 +02:00 • committed by Dirk Hohndel
parent 6f98dca26e
commit b9b1b3146b
8 changed files with 64 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

6
desktop-widgets/locationinformation.h
View file

@ -96,9 +96,9 @@ public:
bool eventFilter(QObject*, QEvent*);
void itemActivated(const QModelIndex& index);
DiveSiteType currDiveSiteType() const;
uint32_t currDiveSiteUuid() const;
struct dive_site *currDiveSite() const;
void fixPopupPosition();
void setCurrentDiveSiteUuid(uint32_t uuid);
void setCurrentDiveSite(struct dive_site *ds);
signals:
void diveSiteSelected();
@ -116,7 +116,7 @@ private:
DiveLocationModel *model;
DiveLocationListView *view;
DiveSiteType currType;
uint32_t currUuid;
struct dive_site *currDs;
};
#endif