diff options
| -rw-r--r-- | qt-gui.cpp | 16 | ||||
| -rw-r--r-- | qt-ui/divelistview.cpp | 2 | ||||
| -rw-r--r-- | qt-ui/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | qt-ui/subsurfacewebservices.cpp | 4 |
4 files changed, 21 insertions, 5 deletions
diff --git a/qt-gui.cpp b/qt-gui.cpp index 84e79a99f..fe2068ab0 100644 --- a/qt-gui.cpp +++ b/qt-gui.cpp @@ -66,6 +66,18 @@ const char *getSetting(QSettings &s, QString name) return NULL; } +#ifdef Q_OS_WIN +static QByteArray encodeUtf8(const QString &fname) +{ + return fname.toUtf8(); +} + +static QString decodeUtf8(const QByteArray &fname) +{ + return QString::fromUtf8(fname); +} +#endif + void init_ui(int *argcp, char ***argvp) { QVariant v; @@ -82,6 +94,10 @@ void init_ui(int *argcp, char ***argvp) // 106 is "UTF-8", this is faster than lookup by name // [http://www.iana.org/assignments/character-sets/character-sets.xml] QTextCodec::setCodecForCStrings(QTextCodec::codecForMib(106)); +# ifdef Q_OS_WIN + QFile::setDecodingFunction(decodeUtf8); + QFile::setEncodingFunction(encodeUtf8); +# endif #endif QCoreApplication::setOrganizationName("Subsurface"); QCoreApplication::setOrganizationDomain("subsurface.hohndel.org"); diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp index 2090f61a5..11d7124bc 100644 --- a/qt-ui/divelistview.cpp +++ b/qt-ui/divelistview.cpp @@ -765,7 +765,7 @@ void DiveListView::saveSelectedDivesAs() settings.setValue("LastDir",fileInfo.dir().path()); settings.endGroup(); - QByteArray bt = fileName.toLocal8Bit(); + QByteArray bt = QFile::encodeName(fileName); save_dives_logic(bt.data(), TRUE); } diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 276f24ba9..5f410ff3c 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).toUtf8(); + fileNamePtr = QFile::encodeName(fileNames.at(i)); 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).toUtf8(); + fileNamePtr = QFile::encodeName(fileNames.at(i)); 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 20e5707ea..ef3c9ffce 100644 --- a/qt-ui/subsurfacewebservices.cpp +++ b/qt-ui/subsurfacewebservices.cpp @@ -759,7 +759,7 @@ void DivelogsDeWebServices::downloadFinished() if (!zip) ::close(duppedfd); #else - struct zip *zip = zip_open(zipFile.fileName().toUtf8().data(), 0, &errorcode); + struct zip *zip = zip_open(QFile::encodeName(zipFile.fileName()), 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().toUtf8().data(), &error); + parse_file(QFile::encodeName(zipFile.fileName()), &error); if (error != NULL) { mainWindow()->showError(error); free(error); |