aboutsummaryrefslogtreecommitdiffstats
path: root/desktop-widgets/divelogimportdialog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'desktop-widgets/divelogimportdialog.cpp')
-rw-r--r--desktop-widgets/divelogimportdialog.cpp16
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");
}
}
}