Minor cleanup of constructors and one accessor for DiveItem

Suggested-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-04-25 08:38:58 -07:00
parent 8a884d2cf7
commit 98027be1c1

View file

@ -294,9 +294,9 @@ void TankInfoModel::update()
class DiveItem class DiveItem
{ {
public: public:
explicit DiveItem(): dive() { parentItem = 0; } DiveItem(): dive(NULL), parentItem(NULL) {}
explicit DiveItem(struct dive *d, DiveItem *parent = 0); DiveItem(struct dive *d, DiveItem *parent = NULL);
~DiveItem() { qDeleteAll(childlist); } ~DiveItem() { qDeleteAll(childlist); }
@ -319,7 +319,7 @@ public:
QString displayTemperature() const; QString displayTemperature() const;
QString displayWeight() const; QString displayWeight() const;
QString displaySac() const; QString displaySac() const;
const QString diveLocation() const { return dive->location; } const QString diveLocation() const { return QString::fromUtf8(dive->location); }
const QString diveSuit() const { return dive->suit; } const QString diveSuit() const { return dive->suit; }
DiveItem *parent() const { return parentItem; } DiveItem *parent() const { return parentItem; }
const QList<DiveItem *>& children() const { return childlist; } const QList<DiveItem *>& children() const { return childlist; }