diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-02-25 13:51:41 +0100 |
|---|---|---|
| committer |  Lubomir I. Ivanov <neolit123@gmail.com> | 2018-03-14 13:55:36 +0200 |
| commit | b72cc1f31784346884c8552c22f1e4c3c6d5ed1d (patch) | |
| tree | 00a04967dc56ccdc69ee998058c13911292ecef7 /desktop-widgets/divelogimportdialog.cpp | |
| parent | 4e44fe7598430f9879736ec2d00b99b15dc05451 (diff) | |
| download | subsurface-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/divelogimportdialog.cpp')
| -rw-r--r-- | desktop-widgets/divelogimportdialog.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp index aa1359b9b..091de35e0 100644 --- a/desktop-widgets/divelogimportdialog.cpp +++ b/desktop-widgets/divelogimportdialog.cpp @@ -788,10 +788,10 @@ int DiveLogImportDialog::setup_csv_params(QStringList r, char **params, int pnr) params[pnr++] = intdup(ui->CSVUnits->currentIndex()); if (hw.length()) { params[pnr++] = strdup("hw"); - params[pnr++] = strdup(hw.toUtf8().data()); + params[pnr++] = strdup(qPrintable(hw)); } else if (ui->knownImports->currentText().length() > 0) { params[pnr++] = strdup("hw"); - params[pnr++] = strdup(ui->knownImports->currentText().prepend("\"").append("\"").toUtf8().data()); + params[pnr++] = strdup(qPrintable(ui->knownImports->currentText().prepend("\"").append("\""))); } params[pnr++] = NULL; @@ -850,7 +850,7 @@ void DiveLogImportDialog::on_buttonBox_accepted() for (int i = 0; i < fileNames.size(); ++i) { if (ui->knownImports->currentText() == "Seabear CSV") { - parse_seabear_log(fileNames[i].toUtf8().data()); + parse_seabear_log(qPrintable(fileNames[i])); } else { char *params[49]; @@ -866,8 +866,8 @@ void DiveLogImportDialog::on_buttonBox_accepted() params[pnr++] = strdup("1" + apdRe.cap(2).toLatin1()); } pnr = setup_csv_params(r, params, pnr); - parse_csv_file(fileNames[i].toUtf8().data(), params, pnr - 1, - specialCSV.contains(ui->knownImports->currentIndex()) ? CSVApps[ui->knownImports->currentIndex()].name.toUtf8().data() : "csv"); + parse_csv_file(qPrintable(fileNames[i]), params, pnr - 1, + specialCSV.contains(ui->knownImports->currentIndex()) ? qPrintable(CSVApps[ui->knownImports->currentIndex()].name) : "csv"); } } } else { @@ -927,7 +927,7 @@ void DiveLogImportDialog::on_buttonBox_accepted() params[pnr++] = intdup(r.indexOf(tr("Water temp."))); params[pnr++] = NULL; - parse_manual_file(fileNames[i].toUtf8().data(), params, pnr - 1); + parse_manual_file(qPrintable(fileNames[i]), params, pnr - 1); } else { char *params[51]; int pnr = 0; @@ -942,8 +942,8 @@ void DiveLogImportDialog::on_buttonBox_accepted() params[pnr++] = strdup("1" + apdRe.cap(2).toLatin1()); } pnr = setup_csv_params(r, params, pnr); - parse_csv_file(fileNames[i].toUtf8().data(), params, pnr - 1, - specialCSV.contains(ui->knownImports->currentIndex()) ? CSVApps[ui->knownImports->currentIndex()].name.toUtf8().data() : "csv"); + parse_csv_file(qPrintable(fileNames[i]), params, pnr - 1, + specialCSV.contains(ui->knownImports->currentIndex()) ? qPrintable(CSVApps[ui->knownImports->currentIndex()].name) : "csv"); } } } |