From bde28a9f2aa64fadae11689dee340653d819dcba Mon Sep 17 00:00:00 2001 From: doitux Date: Fri, 17 Apr 2009 23:38:43 +0000 Subject: [PATCH] utf8 windows test --- src/gui/qt/styles/carddeckstylereader.cpp | 12 +++++++++++- src/gui/qt/styles/gametablestylereader.cpp | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/gui/qt/styles/carddeckstylereader.cpp b/src/gui/qt/styles/carddeckstylereader.cpp index 496aaa5f..c4a6283c 100644 --- a/src/gui/qt/styles/carddeckstylereader.cpp +++ b/src/gui/qt/styles/carddeckstylereader.cpp @@ -43,11 +43,21 @@ void CardDeckStyleReader::readStyleFile(QString file) { //if style file failed --> default style fallback if(QFile(file).exists()) { currentFileName = QFile(file).fileName(); +#ifdef _WIN32 + tinyFileName = currentFileName.toStdString(); +#else tinyFileName = currentFileName.toUtf8().constData(); +#endif + } else { currentFileName = QFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default/defaultdeckstyle.xml").fileName(); - tinyFileName = currentFileName.toUtf8().constData(); +#ifdef _WIN32 + tinyFileName = currentFileName.toStdString(); +#else + tinyFileName = currentFileName.toUtf8().constData(); +#endif + fallBack = 1; } QFileInfo info(currentFileName); diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp index 5dcf48ff..4d1a6c21 100644 --- a/src/gui/qt/styles/gametablestylereader.cpp +++ b/src/gui/qt/styles/gametablestylereader.cpp @@ -81,11 +81,21 @@ void GameTableStyleReader::readStyleFile(QString file) { //if style file failed --> default style fallback if(QFile(file).exists()) { currentFileName = QFile(file).fileName(); +#ifdef _WIN32 + tinyFileName = currentFileName.toStdString(); +#else tinyFileName = currentFileName.toUtf8().constData(); +#endif + } else { currentFileName = QFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/default/defaulttablestyle.xml").fileName(); - tinyFileName = currentFileName.toUtf8().constData(); +#ifdef _WIN32 + tinyFileName = currentFileName.toStdString(); +#else + tinyFileName = currentFileName.toUtf8().constData(); +#endif + fallBack = 1; } QFileInfo info(currentFileName);