summaryrefslogtreecommitdiffstats
path: root/qt-ui/models.cpp
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-02-13 23:52:41 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-02-13 23:52:41 -0800
commit56de6b73f67d5ddeec74153303a27866e39279c7 (patch)
tree45040e1fb23c26e12b3002e9381f13717a9eb78d /qt-ui/models.cpp
parent2843dc38c9e64e87ac1ee84e2cb0147f630ab117 (diff)
parentf81e2c111d9c563a78e62c3bae64bec07c052ec0 (diff)
downloadsubsurface-56de6b73f67d5ddeec74153303a27866e39279c7.tar.gz
Merge branch 'divesites'
This brings in the dive site infrastructure and initial UI work
Diffstat (limited to 'qt-ui/models.cpp')
-rw-r--r--qt-ui/models.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp
index ac2f7d899..19f0d12c0 100644
--- a/qt-ui/models.cpp
+++ b/qt-ui/models.cpp
@@ -1191,7 +1191,7 @@ QVariant DiveItem::data(int column, int role) const
retVal = dive->maxcns;
break;
case LOCATION:
- retVal = QString(dive->location);
+ retVal = QString(get_dive_location(dive));
break;
}
break;
@@ -1232,7 +1232,7 @@ QVariant DiveItem::data(int column, int role) const
retVal = dive->maxcns;
break;
case LOCATION:
- retVal = QString(dive->location);
+ retVal = QString(get_dive_location(dive));
break;
case GAS:
const char *gas_string = get_dive_gas_string(dive);
@@ -2110,7 +2110,7 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const
}
if (row == 1) {
if (col == 0)
- return QString(dive->location);
+ return QString(get_dive_location(dive));
if (col == 3)
return QString(tr("Duration: %1 min")).arg(di.displayDuration());
}