[PATCH 5/7] Files: prefer toUtf8() over toLocal8Bit()
Lubomir I. Ivanov
neolit123 at gmail.com
Thu Dec 19 05:00:54 UTC 2013
From: "Lubomir I. Ivanov" <neolit123 at gmail.com>
We may want to use toUtf8() for win32 considerations.
Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
---
qt-ui/mainwindow.cpp | 4 ++--
qt-ui/subsurfacewebservices.cpp | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 36fa71d..276f24b 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -825,7 +825,7 @@ void MainWindow::importFiles(const QStringList fileNames)
QByteArray fileNamePtr;
char *error = NULL;
for (int i = 0; i < fileNames.size(); ++i) {
- fileNamePtr = fileNames.at(i).toLocal8Bit();
+ fileNamePtr = fileNames.at(i).toUtf8();
parse_file(fileNamePtr.data(), &error);
if (error != NULL) {
showError(error);
@@ -846,7 +846,7 @@ void MainWindow::loadFiles(const QStringList fileNames)
QByteArray fileNamePtr;
for (int i = 0; i < fileNames.size(); ++i) {
- fileNamePtr = fileNames.at(i).toLocal8Bit();
+ fileNamePtr = fileNames.at(i).toUtf8();
parse_file(fileNamePtr.data(), &error);
set_filename(fileNamePtr.data(), TRUE);
setTitle(MWTF_FILENAME);
diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp
index 096100a..266332f 100644
--- a/qt-ui/subsurfacewebservices.cpp
+++ b/qt-ui/subsurfacewebservices.cpp
@@ -125,7 +125,7 @@ static char *prepare_dives_for_divelogs(const bool selected)
/* generate a random filename and create/open that file with zip_open */
QString tempfileQ = QDir::tempPath() + "/import-" + QString::number(qrand() % 99999999) + ".dld";
- tempfile = strdup(tempfileQ.toLocal8Bit().data());
+ tempfile = strdup(tempfileQ.toUtf8().data());
zip = zip_open(tempfile, ZIP_CREATE, NULL);
if (!zip) {
@@ -759,7 +759,7 @@ void DivelogsDeWebServices::downloadFinished()
if (!zip)
::close(duppedfd);
#else
- struct zip *zip = zip_open(zipFile.fileName().toLocal8Bit().data(), 0, &errorcode);
+ struct zip *zip = zip_open(zipFile.fileName().toUtf8().data(), 0, &errorcode);
#endif
if (!zip) {
char buf[512];
@@ -855,7 +855,7 @@ void DivelogsDeWebServices::buttonClicked(QAbstractButton* button)
}
/* parse file and import dives */
char *error = NULL;
- parse_file(zipFile.fileName().toLocal8Bit().data(), &error);
+ parse_file(zipFile.fileName().toUtf8().data(), &error);
if (error != NULL) {
mainWindow()->showError(error);
free(error);
--
1.7.11.msysgit.0
More information about the subsurface
mailing list