summaryrefslogtreecommitdiffstats
path: root/qt-models
diff options
context:
space:
mode:
Diffstat (limited to 'qt-models')
-rw-r--r--qt-models/diveplannermodel.cpp3
-rw-r--r--qt-models/divetripmodel.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index 6556db50b..70a7c6f62 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -128,7 +128,8 @@ void DivePlannerPointsModel::setupCylinders()
}
if (!same_string(prefs.default_cylinder, "")) {
fill_default_cylinder(&displayed_dive.cylinder[0]);
- } else {
+ }
+ if (cylinder_none(&displayed_dive.cylinder[0])) {
// roughly an AL80
displayed_dive.cylinder[0].type.description = strdup(tr("unknown").toUtf8().constData());
displayed_dive.cylinder[0].type.size.mliter = 11100;
diff --git a/qt-models/divetripmodel.h b/qt-models/divetripmodel.h
index 63dc806e7..31cee9633 100644
--- a/qt-models/divetripmodel.h
+++ b/qt-models/divetripmodel.h
@@ -5,6 +5,8 @@
#include "dive.h"
struct DiveItem : public TreeItem {
+ Q_DECLARE_TR_FUNCTIONS(TripItem)
+public:
enum Column {
NR,
DATE,
@@ -38,6 +40,8 @@ struct DiveItem : public TreeItem {
};
struct TripItem : public TreeItem {
+ Q_DECLARE_TR_FUNCTIONS(TripItem)
+public:
virtual QVariant data(int column, int role) const;
dive_trip_t *trip;
};