summaryrefslogtreecommitdiffstats
path: root/qt-models
diff options
context:
space:
mode:
Diffstat (limited to 'qt-models')
-rw-r--r--qt-models/divelocationmodel.cpp4
-rw-r--r--qt-models/diveplannermodel.cpp4
-rw-r--r--qt-models/weightmodel.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp
index 8cd37a615..3de2c1159 100644
--- a/qt-models/divelocationmodel.cpp
+++ b/qt-models/divelocationmodel.cpp
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include "core/units.h"
#include "qt-models/divelocationmodel.h"
-#include "core/dive.h"
+#include "core/qthelper.h"
#include <QDebug>
#include <QLineEdit>
#include <QIcon>
@@ -149,7 +149,7 @@ bool LocationInformationModel::setData(const QModelIndex &index, const QVariant
struct dive_site *ds = get_dive_site(index.row());
free(ds->name);
- ds->name = copy_string(qPrintable(value.toString()));
+ ds->name = copy_qstring(value.toString());
emit dataChanged(index, index);
return true;
}
diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index 831fe7842..0745c362d 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -160,7 +160,7 @@ void DivePlannerPointsModel::setupCylinders()
}
if (cylinder_none(&displayed_dive.cylinder[0])) {
// roughly an AL80
- displayed_dive.cylinder[0].type.description = strdup(qPrintable(tr("unknown")));
+ displayed_dive.cylinder[0].type.description = copy_qstring(tr("unknown"));
displayed_dive.cylinder[0].type.size.mliter = 11100;
displayed_dive.cylinder[0].type.workingpressure.mbar = 207000;
}
@@ -1123,7 +1123,7 @@ void DivePlannerPointsModel::createPlan(bool replanCopy)
// Deal with line breaks
oldnotes.replace("\n", "<br>");
oldnotes.append(displayed_dive.notes);
- displayed_dive.notes = strdup(qPrintable(oldnotes));
+ displayed_dive.notes = copy_qstring(oldnotes);
// If we save as new create a copy of the dive here
if (replanCopy) {
struct dive *copy = alloc_dive();
diff --git a/qt-models/weightmodel.cpp b/qt-models/weightmodel.cpp
index 0c91c467d..8dd9b0223 100644
--- a/qt-models/weightmodel.cpp
+++ b/qt-models/weightmodel.cpp
@@ -114,7 +114,7 @@ bool WeightModel::setData(const QModelIndex &index, const QVariant &value, int r
}
}
if (ws_info[i].name == NULL) // didn't find a match
- ws->description = strdup(qPrintable(vString));
+ ws->description = copy_qstring(vString);
changed = true;
}
}