diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-02-28 23:37:09 +0100 |
---|---|---|
committer | Lubomir I. Ivanov <neolit123@gmail.com> | 2018-03-14 13:55:36 +0200 |
commit | d1572a8d9574e80955796b8667317c8dbd376081 (patch) | |
tree | ab58f9920a20b5c55bd54474f2edcfdc4eb2b904 /desktop-widgets/configuredivecomputerdialog.cpp | |
parent | b72cc1f31784346884c8552c22f1e4c3c6d5ed1d (diff) | |
download | subsurface-d1572a8d9574e80955796b8667317c8dbd376081.tar.gz |
Cleanup: introduce copy_qstring() function
strdup(qPrintable(s)) and copy_string(qPrintable(s)) were such common
occurrences that they seem worthy of a short helper-function.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/configuredivecomputerdialog.cpp')
-rw-r--r-- | desktop-widgets/configuredivecomputerdialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp index 165f4d0d9..bf6b9cc34 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(qPrintable(device)); - device_data.vendor = strdup(qPrintable(selected_vendor)); - device_data.product = strdup(qPrintable(selected_product)); + device_data.devname = copy_qstring(device); + device_data.vendor = copy_qstring(selected_vendor); + device_data.product = copy_qstring(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(qPrintable(logFile)); + logfile_name = copy_qstring(logFile); } } |