aboutsummaryrefslogtreecommitdiffstats
path: root/desktop-widgets/configuredivecomputerdialog.cpp
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-02-25 13:51:41 +0100
committerGravatar Lubomir I. Ivanov <neolit123@gmail.com>2018-03-14 13:55:36 +0200
commitb72cc1f31784346884c8552c22f1e4c3c6d5ed1d (patch)
tree00a04967dc56ccdc69ee998058c13911292ecef7 /desktop-widgets/configuredivecomputerdialog.cpp
parent4e44fe7598430f9879736ec2d00b99b15dc05451 (diff)
downloadsubsurface-b72cc1f31784346884c8552c22f1e4c3c6d5ed1d.tar.gz
Cleanup: consistently use qPrintable()
Replace constructs of the kind s.toUtf8().data(), s.toUtf8().constData(), s.toLocal8Bit().data(), s.toLocal8Bit.constData() or qUtf8Printable(s) by qPrintable(s). This is concise, consistent and - in principle - more performant than the .data() versions. Sadly, owing to a suboptimal implementation, qPrintable(s) currently is a pessimization compared to s.toUtf8().data(). A fix is scheduled for new Qt versions: https://codereview.qt-project.org/#/c/221331/ Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/configuredivecomputerdialog.cpp')
-rw-r--r--desktop-widgets/configuredivecomputerdialog.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp
index b615b453a..165f4d0d9 100644
--- a/desktop-widgets/configuredivecomputerdialog.cpp
+++ b/desktop-widgets/configuredivecomputerdialog.cpp
@@ -910,9 +910,9 @@ void ConfigureDiveComputerDialog::getDeviceData()
#else
QString device = ui.device->currentText();
#endif
- device_data.devname = strdup(device.toUtf8().data());
- device_data.vendor = strdup(selected_vendor.toUtf8().data());
- device_data.product = strdup(selected_product.toUtf8().data());
+ device_data.devname = strdup(qPrintable(device));
+ device_data.vendor = strdup(qPrintable(selected_vendor));
+ device_data.product = strdup(qPrintable(selected_product));
device_data.descriptor = descriptorLookup.value(selected_vendor + selected_product);
device_data.deviceid = device_data.diveid = 0;
@@ -1479,7 +1479,7 @@ void ConfigureDiveComputerDialog::pickLogFile()
filename, tr("Log files") + " (*.log)");
if (!logFile.isEmpty()) {
free(logfile_name);
- logfile_name = strdup(logFile.toUtf8().data());
+ logfile_name = strdup(qPrintable(logFile));
}
}