From 724055f0af4fb7cdb9f1570967fe4b34797f3419 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 26 Oct 2018 17:03:54 +0200 Subject: Dive site: replace dive->dive_site_uuid by dive_site 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 --- core/subsurface-qt/DiveObjectHelper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/subsurface-qt') diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/DiveObjectHelper.cpp index b1d319c37..a1233c3ea 100644 --- a/core/subsurface-qt/DiveObjectHelper.cpp +++ b/core/subsurface-qt/DiveObjectHelper.cpp @@ -112,7 +112,7 @@ QString DiveObjectHelper::location() const QString DiveObjectHelper::gps() const { - struct dive_site *ds = get_dive_site_by_uuid(m_dive->dive_site_uuid); + struct dive_site *ds = m_dive->dive_site; return ds ? QString(printGPSCoords(&ds->location)) : QString(); } @@ -129,7 +129,7 @@ QString DiveObjectHelper::gps_decimal() const QVariant DiveObjectHelper::dive_site() const { - return QVariant::fromValue((uintptr_t)get_dive_site_by_uuid(m_dive->dive_site_uuid)); + return QVariant::fromValue((uintptr_t)m_dive->dive_site); } QString DiveObjectHelper::duration() const -- cgit v1.2.3-70-g09d2