[Eliot-dev] eliot/qt qtcommon.h

[Olivier Teulière]

CVSROOT:        /cvsroot/eliot
Module name:    eliot
Changes by:     Olivier Teulière <ipkiss>       10/01/04 20:19:34

Modified files:
        qt             : qtcommon.h 

Log message:
        Fixed an encoding issue occurring on Windows when Qt is compiled 
without STL compatibility

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/qtcommon.h?cvsroot=eliot&r1=1.7&r2=1.8

Patches:
Index: qtcommon.h
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/qtcommon.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- qtcommon.h  22 Sep 2008 21:21:44 -0000      1.7
+++ qtcommon.h  4 Jan 2010 20:19:34 -0000       1.8
@@ -43,7 +43,7 @@
 // Convert to/from std::wstring
 #ifdef QT_NO_STL
 #   include "encoding.h"
-#   define qfw(s) qfl(convertToMb(s).c_str())
+#   define qfw(s) QString::fromWCharArray(wstring(s).c_str())
 #   define qtw(s) convertToWc(qtl(s))
 #else
 #   define qfw(s) QString::fromStdWString(s)