subsurface.git/core, branch v4.8.4

Coding style: remove stray ';'

2018-11-13T04:55:41Z

There was a stray semi-colon on the beginning of a line in DiveObjectHelper.cpp. Remove it. Signed-off-by: Berthold Stoeger

Cleanup: remove unsused flags in struct dive_trip

2018-11-13T04:55:41Z

Usage of the flags expanded, selected and fixup was removed some time ago. Remove the flags too. Signed-off-by: Berthold Stoeger

Core: use British translations in South Africa

2018-11-01T16:30:14Z

For unrecognized locales we use en_US by default. It makes much more sense for South Africa to use en_GB. Reported-by: Willem Ferguson Signed-off-by: Dirk Hohndel

Core: Do not crash on save dives with no dive site (git storage)

2018-10-31T14:51:31Z

And fix a crash very similar to the previous commit. When trying to save (to git) with an empty dive site, ssrf crashes. Again, add a simple guard to prevent this. Signed-off-by: Jan Mulder

Fix gasmix for OTU calculation

2018-10-30T14:33:43Z

With the fixed sematics of get_gasmix to return the new gasmix for the time of a gas switch (added comments to make this clear), in the OTU calculation we need the previous gasmix for the interval up to the current time. Signed-off-by: Robert C. Helling

Fixed get_gas_at_time for equal times

2018-10-30T14:33:43Z

This fixes a subtle bug introduced in 5c4569247a31c which unified two functions finding the gasmix at a given time during the dive. There was a slight difference, though: Does a gaschange exactly at that time count or not? For the planner to work, the answer has to be in the affirmative. Signed-off-by: Robert C. Helling

Dive list: don't pass dive_site via uintptr_t through QML

2018-10-29T00:09:31Z

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

Dive site: pass pointer-to-dive_site via QVariant

2018-10-29T00:09:31Z

There was this ugly pattern of passing pointers-to-dive_site via a QVariant of void * type. This is of course inherently unsafe. Pass these pointers using their proper types instead. This makes it necessary to register them in Qt's meta-type system. Doing so, fixes a bug: QML couldn't call into updateDiveSiteCoordinates() because it didn't know the type and thus the coordinates of the moved flag were not reflected in the divesite-dialog. Signed-off-by: Berthold Stoeger

Dive site: replace dive->dive_site_uuid by dive_site

2018-10-29T00:09:31Z

Replace the UUID reference of struct dive by a pointer to dive_site. This commit is rather large in lines, but nevertheless quite simple since most of the UUID->pointer work was done in previous commits. Signed-off-by: Berthold Stoeger

Dive site: use an array of pointers in reloadMapLocations()

2018-10-29T00:09:31Z

MapWidgetHelper::reloadMapLocations() used an array of uuids to add dive sites to the map only once. Replace this by an array of pointers. This is a small piece of a larger effort to remove dive site UUIDs. Signed-off-by: Berthold Stoeger