diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2014-05-12 14:22:46 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-05-13 09:24:37 +0900 |
| commit | e0c0ac5d5c7c218011278fbe57da291a7e10c8eb (patch) | |
| tree | 85ad06d20621a0bed01ee4266e5e4f6bbc8e6838 /qt-ui/models.cpp | |
| parent | e1971e9425dfc5266fa1e15579ff36d2b17658da (diff) | |
| download | subsurface-e0c0ac5d5c7c218011278fbe57da291a7e10c8eb.tar.gz | |
Rename getDiveById to get_dive_by_id to keep current c code organized.
This commit renames getDiveById to get_dive_by_id, and it also removes the
Q_ASSERTS and if(!dive) return that the callers of this function were
calling. If it has a Q_ASSERT this means that the dive must exist,
so checking for nullness was bogus too. I've changed the assert (done
in a silly C-Way.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/models.cpp')
| -rw-r--r-- | qt-ui/models.cpp | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 43f08e106..c04b973e5 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1056,7 +1056,7 @@ static int nitrox_sort_value(struct dive *dive) QVariant DiveItem::data(int column, int role) const { QVariant retVal; - struct dive *dive = getDiveById(diveId); + struct dive *dive = get_dive_by_diveid(diveId); switch (role) { case Qt::TextAlignmentRole: @@ -1203,8 +1203,7 @@ bool DiveItem::setData(const QModelIndex &index, const QVariant &value, int role if (d->number == v) return false; } - d = getDiveById(diveId); - Q_ASSERT(d != NULL); + d = get_dive_by_diveid(diveId); d->number = value.toInt(); mark_divelist_changed(true); return true; @@ -1212,8 +1211,7 @@ bool DiveItem::setData(const QModelIndex &index, const QVariant &value, int role QString DiveItem::displayDate() const { - struct dive *dive = getDiveById(diveId); - Q_ASSERT(dive != NULL); + struct dive *dive = get_dive_by_diveid(diveId); return get_dive_date_string(dive->when); } @@ -1221,8 +1219,7 @@ QString DiveItem::displayDepth() const { QString fract, str; const int scale = 1000; - struct dive *dive = getDiveById(diveId); - Q_ASSERT(dive != NULL); + struct dive *dive = get_dive_by_diveid(diveId); if (get_units()->length == units::METERS) { fract = QString::number((unsigned)(dive->maxdepth.mm % scale) / 100); str = QString("%1.%2").arg((unsigned)(dive->maxdepth.mm / scale)).arg(fract, 1, QChar('0')); @@ -1236,8 +1233,7 @@ QString DiveItem::displayDepth() const QString DiveItem::displayDuration() const { int hrs, mins, secs; - struct dive *dive = getDiveById(diveId); - Q_ASSERT(dive != NULL); + struct dive *dive = get_dive_by_diveid(diveId); secs = dive->duration.seconds % 60; mins = dive->duration.seconds / 60; hrs = mins / 60; @@ -1255,8 +1251,7 @@ QString DiveItem::displayDuration() const QString DiveItem::displayTemperature() const { QString str; - struct dive *dive = getDiveById(diveId); - Q_ASSERT(dive != NULL); + struct dive *dive = get_dive_by_diveid(diveId); if (!dive->watertemp.mkelvin) return str; if (get_units()->temperature == units::CELSIUS) @@ -1269,8 +1264,7 @@ QString DiveItem::displayTemperature() const QString DiveItem::displaySac() const { QString str; - struct dive *dive = getDiveById(diveId); - Q_ASSERT(dive != NULL); + struct dive *dive = get_dive_by_diveid(diveId); if (get_units()->volume == units::LITER) str = QString::number(dive->sac / 1000.0, 'f', 1).append(tr(" l/min")); else @@ -1286,8 +1280,7 @@ QString DiveItem::displayWeight() const int DiveItem::weight() const { - struct dive *dive = getDiveById(diveId); - Q_ASSERT(dive != 0); + struct dive *dive = get_dive_by_diveid(diveId); weight_t tw = { total_weight(dive) }; return tw.grams; } @@ -1907,8 +1900,7 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const switch (role) { case Qt::DisplayRole: { - struct dive *dive = getDiveById(diveId); - Q_ASSERT(dive != NULL); + struct dive *dive = get_dive_by_diveid(diveId); struct DiveItem di; di.diveId = diveId; |