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

Use QFile::{encode,decode}Name for file names

Browse source 
And make them use UTF-8 on Windows instead of the local 8 bit encoding.
This will also get us the proper NFD encoding on OS X.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Thiago Macieira 2013-12-19 17:02:34 -08:00 • committed by Dirk Hohndel
parent dbdf50d03c
commit 8eb6dfdb02
4 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
qt-gui.cpp
View file

@ -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");