sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

utf8 windows test

Browse Source
This commit is contained in:
doitux
2009-04-17 23:38:43 +00:00
parent 3a93336dfa
commit bde28a9f2a
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/styles/carddeckstylereader.cpp
+10
View File
@@ -43,11 +43,21 @@ void CardDeckStyleReader::readStyleFile(QString file) {
//if style file failed --> default style fallback //if style file failed --> default style fallback
if(QFile(file).exists()) { if(QFile(file).exists()) {
currentFileName = QFile(file).fileName(); currentFileName = QFile(file).fileName();
#ifdef _WIN32
tinyFileName = currentFileName.toStdString();
#else
tinyFileName = currentFileName.toUtf8().constData(); tinyFileName = currentFileName.toUtf8().constData();
#endif
} }
else { else {
currentFileName = QFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default/defaultdeckstyle.xml").fileName(); currentFileName = QFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default/defaultdeckstyle.xml").fileName();
#ifdef _WIN32
tinyFileName = currentFileName.toStdString();
#else
tinyFileName = currentFileName.toUtf8().constData(); tinyFileName = currentFileName.toUtf8().constData();
#endif
fallBack = 1; fallBack = 1;
} }
QFileInfo info(currentFileName); QFileInfo info(currentFileName);
src/gui/qt/styles/gametablestylereader.cpp
+10
View File
@@ -81,11 +81,21 @@ void GameTableStyleReader::readStyleFile(QString file) {
//if style file failed --> default style fallback //if style file failed --> default style fallback
if(QFile(file).exists()) { if(QFile(file).exists()) {
currentFileName = QFile(file).fileName(); currentFileName = QFile(file).fileName();
#ifdef _WIN32
tinyFileName = currentFileName.toStdString();
#else
tinyFileName = currentFileName.toUtf8().constData(); tinyFileName = currentFileName.toUtf8().constData();
#endif
} }
else { else {
currentFileName = QFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/default/defaulttablestyle.xml").fileName(); currentFileName = QFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/default/defaulttablestyle.xml").fileName();
#ifdef _WIN32
tinyFileName = currentFileName.toStdString();
#else
tinyFileName = currentFileName.toUtf8().constData(); tinyFileName = currentFileName.toUtf8().constData();
#endif
fallBack = 1; fallBack = 1;
} }
QFileInfo info(currentFileName); QFileInfo info(currentFileName);