Update the MSVC stuff.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9899 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-05-03 13:42:48 +00:00
parent ffe7659ec6
commit 3aee5dfdfd
3 changed files with 22 additions and 59 deletions

View File

@ -62,7 +62,7 @@
/* Define if your C++ compiler puts C library functions in the global
namespace */
/* #undef CXX_GLOBAL_CSTD */
#define CXX_GLOBAL_CSTD
/* Define to 1 if using `alloca.c'. */
/* #undef C_ALLOCA */
@ -133,9 +133,15 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
/* #undef HAVE_DLFCN_H */
/* Define to 1 if you have the `fcntl' function. */
/* #undef HAVE_FCNTL */
/* Define to 1 if you have the <flimage.h> header file. */
/* #undef HAVE_FLIMAGE_H */
/* Define to 1 if you have the `fork' function. */
/* #undef HAVE_FORK */
/* Define to 1 if you have the `fwprintf' function. */
#define HAVE_FWPRINTF 1
@ -231,7 +237,7 @@
/* #define HAVE_MKDIR */
/* Define to 1 if you have the `mkfifo' function. */
#define HAVE_MKFIFO 1
/* #undef HAVE_MKFIFO 1 */
/* Define to 1 if you have the `mkstemp' function. */
/* #undef HAVE_MKSTEMP */
@ -337,7 +343,13 @@
#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/time.h> header file. */
#define HAVE_SYS_TIME_H 1
/* #undef HAVE_SYS_TIME_H */
/* Define to 1 if you have the <sys/utime.h> header file. */
#define HAVE_SYS_UTIME_H 1
/* Define to 1 if you have the <utime.h> header file. */
/* #undef HAVE_UTIME_H */
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
@ -385,7 +397,7 @@
/* #undef HAVE___FSETLOCKING */
/* Define as const if the declaration of iconv() needs const. */
#define ICONV_CONST
#define ICONV_CONST
/* Define if integer division by zero raises signal SIGFPE. */
#define INTDIV0_RAISES_SIGFPE 1
@ -464,6 +476,9 @@
/* Define as 1 if you want to support compressed files. */
/* #undef USE_COMRESSION */
/* Define as 1 to use an external ispell process for spell-checking */
/* #undef USE_ISPELL */
/* Define if you want to be able to load jpeg images natively */
#define USE_JPEG_IMAGE_LOADER 1

View File

@ -125,18 +125,6 @@
<Filter
Name="src"
Filter="">
<File
RelativePath="..\..\src\aspell.C">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\aspell_local.h">
</File>
<File
RelativePath="..\..\src\author.C">
<FileConfiguration
@ -641,18 +629,6 @@
<File
RelativePath="..\..\src\intl.h">
</File>
<File
RelativePath="..\..\src\ispell.C">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\ispell.h">
</File>
<File
RelativePath="..\..\src\kbmap.C">
<FileConfiguration
@ -1211,18 +1187,6 @@
<File
RelativePath="..\..\src\PrinterParams.h">
</File>
<File
RelativePath="..\..\src\pspell.C">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\pspell.h">
</File>
<File
RelativePath="..\..\src\RowList_fwd.h">
</File>
@ -1274,6 +1238,9 @@
<File
RelativePath="..\..\src\Spacing.h">
</File>
<File
RelativePath="..\..\src\SpellBase.C">
</File>
<File
RelativePath="..\..\src\SpellBase.h">
</File>
@ -10517,9 +10484,6 @@
CompileAs="2"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\support\os_win32.h">
</File>
<File
RelativePath="..\..\src\support\package.h">
</File>

View File

@ -1,19 +1,3 @@
Index: src/frontends/qt2/QLyXKeySym.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLyXKeySym.C,v
retrieving revision 1.32
diff -u -a -u -r1.32 QLyXKeySym.C
--- src/frontends/qt2/QLyXKeySym.C 7 Jul 2004 09:32:19 -0000 1.32
+++ src/frontends/qt2/QLyXKeySym.C 18 Apr 2005 17:37:02 -0000
@@ -74,7 +74,7 @@
void initEncodings()
{
// when no document open
- encoding_map[""] = QTextCodec::codecForLocale();
+ encoding_map[std::string()] = QTextCodec::codecForLocale();
encoding_map["iso8859-1"] = QTextCodec::codecForName("ISO 8859-1");
encoding_map["iso8859-2"] = QTextCodec::codecForName("ISO 8859-2");
Index: src/support/filetools.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/support/filetools.C,v