diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-21 11:29:21 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-05-21 11:29:21 -0700 |
| commit | 19586081ed57c28aed9a649f08db4d415e72dca6 (patch) | |
| tree | 02ac1d95cbeff9383ae7ff0736e098b2ce34b2f1 /qt-ui | |
| parent | e7b84233af14723814f1340010bb86c6801f1e06 (diff) | |
| download | subsurface-19586081ed57c28aed9a649f08db4d415e72dca6.tar.gz | |
Correctly use the weightsystem_none / cylinder_none helpers
Plus a couple of minor formatting changes
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/models.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 04f7256e6..e1ac597c0 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -136,10 +136,10 @@ void CylindersModel::setDive(dive* d) if (current) clear(); - int amount = 0; + int amount = MAX_CYLINDERS; for(int i = 0; i < MAX_CYLINDERS; i++){ - cylinder_t& cylinder = d->cylinder[i]; - if (!cylinder.type.description){ + cylinder_t *cylinder = &d->cylinder[i]; + if (cylinder_none(cylinder)) { amount = i; break; } @@ -217,9 +217,8 @@ QVariant WeightModel::headerData(int section, Qt::Orientation orientation, int r void WeightModel::add(weightsystem_t* weight) { - if (rows >= MAX_WEIGHTSYSTEMS) { + if (rows >= MAX_WEIGHTSYSTEMS) return; - } int row = rows; @@ -243,10 +242,10 @@ void WeightModel::setDive(dive* d) if (current) clear(); - int amount = 0; - for(int i = 0; i < MAX_WEIGHTSYSTEMS; i++){ - weightsystem_t& weightsystem = d->weightsystem[i]; - if (!weightsystem.description){ + int amount = MAX_WEIGHTSYSTEMS; + for(int i = 0; i < MAX_WEIGHTSYSTEMS; i++) { + weightsystem_t *weightsystem = &d->weightsystem[i]; + if (weightsystem_none(weightsystem)) { amount = i; break; } @@ -528,13 +527,11 @@ QVariant DiveItem::data(int column, int role) const break; } - if(role == STAR_ROLE){ + if (role == STAR_ROLE) retVal = dive->rating; - } - if(role == DIVE_ROLE){ + if (role == DIVE_ROLE) retVal = QVariant::fromValue<void*>(dive); - } return retVal; } @@ -663,7 +660,7 @@ Qt::ItemFlags DiveTripModel::flags(const QModelIndex& index) const } QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, - int role) const + int role) const { if (orientation == Qt::Horizontal && role == Qt::DisplayRole) return rootItem->data(section, role); |