UNICODE Express beta1 + 40809

[Peter Kuemmel]

The newest msvc 8 compiler is more restrictive(!!),
the ( TCHAR * ) is new:




Index: qfont_win.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/Attic/qfont_win.cpp,v
retrieving revision 1.1.2.17
diff -u -b -B -r1.1.2.17 qfont_win.cpp
--- qfont_win.cpp	6 Sep 2004 03:20:57 -0000	1.1.2.17
+++ qfont_win.cpp	6 Sep 2004 13:10:27 -0000
@@ -1034,19 +1034,19 @@
      if ( request.family )
  #if UNICODE

-        wcsncpy( ( LPTSTR ) lf.lfFaceName, subFamily.ucs2(), 32 );
+        wcsncpy( ( LPTSTR ) lf.lfFaceName, ( TCHAR * ) subFamily.ucs2(), 32 );
  #else

-        strncpy( ( LPTSTR ) lf.lfFaceName, subFamily.latin1(), 32 );
+        strncpy( ( LPTSTR ) lf.lfFaceName, ( TCHAR * ) subFamily.latin1(), 32 );
  #endif

      else        // FIXME: What to set in case of no valid substitutions (Ha)
  #if UNICODE

-        wcsncpy( ( LPTSTR ) lf.lfFaceName, QString( "Default Font" ).ucs2(), 32 );
+        wcsncpy( ( LPTSTR ) lf.lfFaceName, ( TCHAR * )QString( "Default Font" ).ucs2(), 32 );
  #else

-        strncpy( ( LPTSTR ) lf.lfFaceName, QString( "Default Font" ).latin1(), 32 );
+        strncpy( ( LPTSTR ) lf.lfFaceName, ( TCHAR * ) QString( "Default Font" ).latin1(), 32 );
  #endif