Linus Torvalds 4a550e4d7d Properly handle dive sites loaded from XML ... We used to always create a new dive site structure when loading dive site data from XML. That is completely bogus, because it can (and does) create duplicate dive sites with the same UUID. Which makes the whole UUID pointless. So instead, look up the existing dive site associated with the UUID loaded from the XML, and try to merge the data properly if we already had dive site information for that UUID. Reported-by: Alessandro Volpi <volpial@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2017-02-19 15:23:46 -08:00
..
subsurface-qt	Revert "In statistics, ignore gas use of planned dives"	2017-02-03 07:31:03 -08:00
android.cpp	Same typo, two more times	2017-02-03 15:01:15 -08:00
checkcloudconnection.cpp	Allow the user to give longer cloud timeout on the command line	2016-07-23 12:54:30 +09:00
checkcloudconnection.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
cloudstorage.cpp	Use preferences object to correctly store cloud status	2016-07-23 12:53:37 +09:00
cloudstorage.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
CMakeLists.txt	Revert "Add a simple cp2130 libusb driver"	2016-09-22 14:56:31 -07:00
cochran.c	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
cochran.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
color.cpp	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
color.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
compressibility.r	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
configuredivecomputer.cpp	Rewrite libdivecomputer custom serial code	2016-09-17 15:47:37 -07:00
configuredivecomputer.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
configuredivecomputerthreads.cpp	Use get_descriptor instead of hard-coded switch's	2016-12-28 22:40:18 -08:00
configuredivecomputerthreads.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
datatrak.c	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
datatrak.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
deco.c	Reset VPM-B state between repetitive dives	2017-02-10 06:41:24 -08:00
deco.h	ToolTipItem: show gf line based on correct gradient factor preferences	2016-10-27 20:36:14 -07:00
device.c	Second attempt to fix crash	2016-09-20 09:26:35 -07:00
device.h	Fill in divecomputer serial number and firmware version on loading	2016-08-14 10:22:41 -07:00
devicedetails.cpp	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
devicedetails.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
display.h	Only do 9 minute interval for min/max/avg	2016-04-20 15:55:51 -07:00
dive.c	dive merging: merge water temperature too, not just air temperature	2017-02-19 15:23:46 -08:00
dive.h	Reset VPM-B state between repetitive dives	2017-02-10 06:41:24 -08:00
divecomputer.cpp	Settings update: Remove unused include and add FIXME comment	2016-08-27 11:40:44 -07:00
divecomputer.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
divelist.c	Reset VPM-B state between repetitive dives	2017-02-10 06:41:24 -08:00
divelist.h	Display surface interval in diveplan	2017-01-03 22:28:18 -08:00
divelogexportlogic.cpp	Settings update: Remove uneeded includes	2016-08-27 11:40:45 -07:00
divelogexportlogic.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
divesite.c	Properly handle dive sites loaded from XML	2017-02-19 15:23:46 -08:00
divesite.cpp	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
divesite.h	Properly handle dive sites loaded from XML	2017-02-19 15:23:46 -08:00
divesitehelpers.cpp	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
divesitehelpers.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
equipment.c	Add HP117 to the cylinder list	2016-08-10 15:08:51 -07:00
exif.cpp	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
exif.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
file.c	Clean up some warnings in file.c	2016-11-09 06:33:45 -08:00
file.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
gas-model.c	Use real gas compressibility in planner	2017-01-16 03:17:40 -08:00
gaspressures.c	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
gaspressures.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
gettext.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
gettextfromc.cpp	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
gettextfromc.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
git-access.c	Fix cloud storage authentication attempt counting	2016-08-14 10:22:35 -07:00
git-access.h	git storage: init local repository	2016-04-27 15:05:37 -07:00
gpslocation.cpp	Unify handling of QDateTime time zone information	2016-08-10 15:04:39 -07:00
gpslocation.h	GPS provider: change haveGPS status if GPS source returns error	2016-04-17 22:59:12 -07:00
helpers.h	Settings update: Add "Dive Computer" settings to SettingsObjectWrapper	2016-08-27 11:40:44 -07:00
imagedownloader.cpp	Fix picture hashing logic for pictures on the web.	2016-12-30 19:43:00 +01:00
imagedownloader.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
isocialnetworkintegration.cpp	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
isocialnetworkintegration.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
libdivecomputer.c	Correct: Handle more tanks than gasmixes	2017-02-03 07:43:00 -08:00
libdivecomputer.h	Stop accessing the internals of dc_descriptor_t	2017-01-12 14:15:53 -08:00
linux.c	Fix typo	2017-02-03 09:35:01 -08:00
liquivision.c	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
load-git.c	Merge informational_prefs into git_prefs	2017-02-05 12:29:51 -08:00
macos.c	Same typo, two more times	2017-02-03 15:01:15 -08:00
membuffer.c	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
membuffer.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
metrics.cpp	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
metrics.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
ostctools.c	ostctools: Add support for profile version 0x24	2017-01-12 14:15:53 -08:00
parse-xml.c	Properly handle dive sites loaded from XML	2017-02-19 15:23:46 -08:00
planner.c	Set up gaslist only in the beginning of diveplan	2017-02-11 08:31:42 -08:00
planner.h	Have divedatapoint store cylinder id instead of gasmix	2016-07-09 12:07:25 -07:00
pluginmanager.cpp	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
pluginmanager.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
pref.h	Merge informational_prefs into git_prefs	2017-02-05 12:29:51 -08:00
prefs-macros.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
profile.c	Fix deco_mode confusion	2017-01-06 20:43:23 -08:00
profile.h	Don't calculate the 9 minute average	2016-04-20 16:00:28 -07:00
qt-gui.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
qt-init.cpp	Settings update: Move loadPreferences out of qt-helper.cpp	2016-08-27 11:40:45 -07:00
qthelper.cpp	Prevent crash on Mac when typing comma in GPS coordinates field	2017-01-14 09:09:58 -08:00
qthelper.h	Fix deco_mode confusion	2017-01-06 20:43:23 -08:00
qthelperfromc.h	Fix deco_mode confusion	2017-01-06 20:43:23 -08:00
qtserialbluetooth.cpp	Fix compile error on Windows	2016-09-18 07:41:55 -07:00
save-git.c	Merge informational_prefs into git_prefs	2017-02-05 12:29:51 -08:00
save-html.c	Extend time parsing to before 1970	2016-04-29 09:07:17 -07:00
save-html.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
save-xml.c	Extend time parsing to before 1970	2016-04-29 09:07:17 -07:00
serial_ftdi.c	Fix warning about incompatible pointer	2016-09-18 07:11:45 -07:00
sha1.c	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
sha1.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
statistics.c	Don't do strcmp on NIL pointer	2017-02-03 15:04:51 -08:00
statistics.h	Only consider non-zero average depth for statistics	2016-11-15 03:25:46 -08:00
strndup.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
strtod.c	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
subsurfacestartup.c	Finish removal of informational_prefs	2017-02-05 12:44:11 -08:00
subsurfacestartup.h	Allow switching the user from the command line	2016-04-29 12:14:59 -07:00
subsurfacesysinfo.cpp	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
subsurfacesysinfo.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
taxonomy.c	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
taxonomy.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
time.c	Handle negative dates (before the epoch) better	2017-02-17 15:08:38 -08:00
uemis-downloader.c	Extend time parsing to before 1970	2016-04-29 09:07:17 -07:00
uemis.c	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
uemis.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
units.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
version.c	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
version.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
webservice.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
windows.c	Win32: add the --win32log option to log stdout and stderr to files	2017-02-03 09:24:42 -08:00
windowtitleupdate.cpp	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
windowtitleupdate.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
worldmap-options.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
worldmap-save.c	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00
worldmap-save.h	Move subsurface-core to core and qt-mobile to mobile-widgets	2016-04-04 22:33:58 -07:00