summaryrefslogtreecommitdiffstats
path: root/qt-models/divetripmodel.cpp
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-01-07 15:42:28 +0100
committerGravatar Lubomir I. Ivanov <neolit123@gmail.com>2018-01-11 06:07:13 +0100
commit6a07ccbad273cdcbea3f984c5c2e9d1b272aae05 (patch)
treed389058bb3a66b0cce63331ce325ad34fee6ff22 /qt-models/divetripmodel.cpp
parente85ecdd9254a8bd222ccb2dfed7d3b3bb96c8294 (diff)
downloadsubsurface-6a07ccbad273cdcbea3f984c5c2e9d1b272aae05.tar.gz
Use helper function empty_string() instead of manual checks
For code consistency, substitute boolean expressions: s && *s -> !empty_string(s) s && s[0] -> !empty_string(s) !s || !*s -> empty_string(s) !s || !s[0] -> empty_string(s) Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'qt-models/divetripmodel.cpp')
-rw-r--r--qt-models/divetripmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp
index b2ca11844..63e5f6afd 100644
--- a/qt-models/divetripmodel.cpp
+++ b/qt-models/divetripmodel.cpp
@@ -70,7 +70,7 @@ QVariant TripItem::data(int column, int role) const
}
if (countShown < trip->nrdives)
shownText = tr("(%1 shown)").arg(countShown);
- if (trip->location && *trip->location)
+ if (!empty_string(trip->location))
ret = QString(trip->location) + ", " + get_trip_date_string(trip->when, trip->nrdives, oneDayTrip) + " "+ shownText;
else
ret = get_trip_date_string(trip->when, trip->nrdives, oneDayTrip) + shownText;