From ed97f9f3158fbf90f241fad8418de138bd242ef2 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 11 Jan 2016 15:02:13 -0200 Subject: Simplify: QML code handling series The connection between the C++ core and the QML code leaves a lot of room for improvement; the following series will do small but important updates on the code regarding QML and QtWidget coexistence and behavior. First: simplify wrapper class, removing uneeded variable. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- subsurface-core/subsurface-qt/DiveObjectHelper.cpp | 4 ++-- subsurface-core/subsurface-qt/DiveObjectHelper.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp b/subsurface-core/subsurface-qt/DiveObjectHelper.cpp index 7db882da2..94ba93726 100644 --- a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp +++ b/subsurface-core/subsurface-qt/DiveObjectHelper.cpp @@ -33,7 +33,7 @@ static QString getFormattedCylinder(struct dive *dive, unsigned int idx) return fmt; } -DiveObjectHelper::DiveObjectHelper(struct dive *d) : m_number(d->number), +DiveObjectHelper::DiveObjectHelper(struct dive *d) : m_id(d->id), m_rating(d->rating), m_timestamp(d->when), @@ -128,7 +128,7 @@ DiveObjectHelper::~DiveObjectHelper() int DiveObjectHelper::number() const { - return m_number; + return m_dive->number; } int DiveObjectHelper::id() const diff --git a/subsurface-core/subsurface-qt/DiveObjectHelper.h b/subsurface-core/subsurface-qt/DiveObjectHelper.h index 5f6cdf60b..ee51b0ee3 100644 --- a/subsurface-core/subsurface-qt/DiveObjectHelper.h +++ b/subsurface-core/subsurface-qt/DiveObjectHelper.h @@ -62,7 +62,6 @@ public: QString otu() const; private: - int m_number; int m_id; int m_rating; QString m_date; -- cgit v1.2.3-70-g09d2