summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-08-21 16:01:02 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-08-21 08:40:56 -0700
commit4d15f8ee33335286c3b55b37119cdef9910ea5a3 (patch)
tree1e02b7b0d0e93a4dafab24b3ff5a184aac457cb6 /core
parent2c878ea6b634e332b2272af9251d5880cac6653f (diff)
downloadsubsurface-4d15f8ee33335286c3b55b37119cdef9910ea5a3.tar.gz
cleanup: remove obsolete logic in getFormattedCylinder()
getFormattedCylinder() is a helper function to format a list of cylinders. It had that weird logic that it would skip cylinders without description unless it is the first, which would instead be written as "unkown". The reason was the old statically sized cylinder array, where it wasn't clear if a cylinder was actually in use. This became obsolete when switching to a variable size cylinder array. Firstly, all cylinders in the array were added by the user. Secondly, we now also support dives without cylinders, i.e. the first cylinder is not any different from the rest. Thus, remove the logic and format any cylinder without description as being of type "unknown". Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
-rw-r--r--core/subsurface-qt/diveobjecthelper.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/subsurface-qt/diveobjecthelper.cpp b/core/subsurface-qt/diveobjecthelper.cpp
index 45cb73868..bbf51ed12 100644
--- a/core/subsurface-qt/diveobjecthelper.cpp
+++ b/core/subsurface-qt/diveobjecthelper.cpp
@@ -35,8 +35,6 @@ static QString getFormattedCylinder(const struct dive *dive, int idx)
{
const cylinder_t *cyl = get_cylinder(dive, idx);
const char *desc = cyl->type.description;
- if (!desc && idx > 0)
- return QString();
QString fmt = desc ? QString(desc) : gettextFromC::tr("unknown");
fmt += ", " + get_volume_string(cyl->type.size, true);
fmt += ", " + get_pressure_string(cyl->type.workingpressure, true);