diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-06-13 19:56:36 +0200 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-06-13 19:56:36 +0200 |
| commit | e34da61362c0a64b8fd932c3363421c766595d4a (patch) | |
| tree | a1e71824e9e94eafd791c0c005b78371fa7dc1e5 /qt-ui/models.cpp | |
| parent | 863c48593949e91beb6b7ff02a1385b9977182f5 (diff) | |
| parent | 7e9d6e28297432d4a15721a49a9dd0c0d067ce7e (diff) | |
| download | subsurface-e34da61362c0a64b8fd932c3363421c766595d4a.tar.gz | |
Merge branch 'linusDiveList' of https://github.com/tcanabrava/subsurface
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/models.cpp')
| -rw-r--r-- | qt-ui/models.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 23f0758ce..1cc9ab869 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -785,11 +785,8 @@ QVariant TripItem::data(int column, int role) const if (role == Qt::DisplayRole) { switch (column) { - case LOCATION: - ret = QString(trip->location); - break; - case DATE: - ret = QString(get_trip_date_string(trip->when, trip->nrdives)); + case NR: + ret = QString(trip->location) + QString(get_trip_date_string(trip->when, trip->nrdives)); break; } } |