Berthold Stoeger 0618aa737f Core: unify insert_trip() and insert_trip_dont_merge() ... There were two versions of the insert_trip() function: one would merge trips if a trip with the same date already existed, the other wouldn't. The latter was introduced with the dive-list undo work. The problem is that the "date" of a trip (i.e. the first dive) seems ill-defined as this is a volatile value. Moreover in the context of making dive-import undoable this is a very dangerous notion, as the caller needs control over when the dives are added to a trip. Therefore, unify these two functions and never merge trips. The decision on merging dives now has to made by the caller. This will be implemented in a future commit. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>		2018-11-18 16:50:09 -08:00
..
qml	delete-copy-paste buttons layed out properly	2018-11-18 06:31:44 +08:00
qmlmanager.cpp	Core: unify insert_trip() and insert_trip_dont_merge()	2018-11-18 16:50:09 -08:00
qmlmanager.h	Verify that copy is done	2018-11-18 06:31:44 +08:00
qmlprefs.cpp	Mobile: set units system in "No cloud mode"	2018-09-19 14:41:11 -07:00
qmlprefs.h	mobile-widgets: replace qmlprefs::theme with qPrefDisplay::theme	2018-09-12 20:18:32 -07:00