mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Files: prefer toUtf8() over toLocal8Bit()

Browse source 
We may want to use toUtf8() for win32 considerations.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2013-12-19 15:00:54 +02:00 • committed by Dirk Hohndel
parent 69ed0d8393
commit 1bb7ab30c6
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qt-ui/mainwindow.cpp
View file

@ -825,7 +825,7 @@ void MainWindow::importFiles(const QStringList fileNames)
QByteArray fileNamePtr; QByteArray fileNamePtr;
char *error = NULL; char *error = NULL;
for (int i = 0; i < fileNames.size(); ++i) { for (int i = 0; i < fileNames.size(); ++i) {
fileNamePtr = fileNames.at(i).toLocal8Bit(); fileNamePtr = fileNames.at(i).toUtf8();
parse_file(fileNamePtr.data(), &error); parse_file(fileNamePtr.data(), &error);
if (error != NULL) { if (error != NULL) {
showError(error); showError(error);
@ -846,7 +846,7 @@ void MainWindow::loadFiles(const QStringList fileNames)
QByteArray fileNamePtr; QByteArray fileNamePtr;
for (int i = 0; i < fileNames.size(); ++i) { for (int i = 0; i < fileNames.size(); ++i) {
fileNamePtr = fileNames.at(i).toLocal8Bit(); fileNamePtr = fileNames.at(i).toUtf8();
parse_file(fileNamePtr.data(), &error); parse_file(fileNamePtr.data(), &error);
set_filename(fileNamePtr.data(), TRUE); set_filename(fileNamePtr.data(), TRUE);
setTitle(MWTF_FILENAME); setTitle(MWTF_FILENAME);

6
qt-ui/subsurfacewebservices.cpp
View file

@ -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 */ /* generate a random filename and create/open that file with zip_open */
QString tempfileQ = QDir::tempPath() + "/import-" + QString::number(qrand() % 99999999) + ".dld"; 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); zip = zip_open(tempfile, ZIP_CREATE, NULL);
if (!zip) { if (!zip) {
@ -759,7 +759,7 @@ void DivelogsDeWebServices::downloadFinished()
if (!zip) if (!zip)
::close(duppedfd); ::close(duppedfd);
#else #else
struct zip *zip = zip_open(zipFile.fileName().toLocal8Bit().data(), 0, &errorcode); struct zip *zip = zip_open(zipFile.fileName().toUtf8().data(), 0, &errorcode);
#endif #endif
if (!zip) { if (!zip) {
char buf[512]; char buf[512];
@ -855,7 +855,7 @@ void DivelogsDeWebServices::buttonClicked(QAbstractButton* button)
} }
/* parse file and import dives */ /* parse file and import dives */
char *error = NULL; char *error = NULL;
parse_file(zipFile.fileName().toLocal8Bit().data(), &error); parse_file(zipFile.fileName().toUtf8().data(), &error);
if (error != NULL) { if (error != NULL) {
mainWindow()->showError(error); mainWindow()->showError(error);
free(error); free(error);