1 Index: src/frontends/qt2/QLyXKeySym.C
2 ===================================================================
3 RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLyXKeySym.C,v
4 retrieving revision 1.32
5 diff -u -a -u -r1.32 QLyXKeySym.C
6 --- src/frontends/qt2/QLyXKeySym.C 7 Jul 2004 09:32:19 -0000 1.32
7 +++ src/frontends/qt2/QLyXKeySym.C 18 Apr 2005 17:37:02 -0000
11 // when no document open
12 - encoding_map[""] = QTextCodec::codecForLocale();
13 + encoding_map[std::string()] = QTextCodec::codecForLocale();
15 encoding_map["iso8859-1"] = QTextCodec::codecForName("ISO 8859-1");
16 encoding_map["iso8859-2"] = QTextCodec::codecForName("ISO 8859-2");
17 Index: src/support/filetools.C
18 ===================================================================
19 RCS file: /cvs/lyx/lyx-devel/src/support/filetools.C,v
20 retrieving revision 1.209
21 diff -u -r1.209 filetools.C
22 --- src/support/filetools.C 2005/04/21 14:03:30 1.209
23 +++ src/support/filetools.C 2005/04/26 15:43:13
24 @@ -1051,6 +1051,11 @@
26 cmd_ret const RunCommand(string const & cmd)
29 + // TODO: Implement this, or merge it into forkedcall.
30 + // Used for lyx2lyx in buffer.C, echo in math_extern and kpse in this file
31 + return make_pair(-1, string());
33 // FIXME: replace all calls to RunCommand with ForkedCall
34 // (if the output is not needed) or the code in ispell.C
35 // (if the output is needed).
37 perror("RunCommand:: could not terminate child process");
39 return make_pair(pret, ret);
44 Index: src/support/tempname.C
45 ===================================================================
46 RCS file: /cvs/lyx/lyx-devel/src/support/tempname.C,v
47 retrieving revision 1.26
48 diff -u -r1.26 tempname.C
49 --- src/support/tempname.C 2005/04/26 10:30:24 1.26
50 +++ src/support/tempname.C 2005/04/26 15:51:22
59 using boost::scoped_array;
64 #if defined(HAVE_MKSTEMP)
65 return ::mkstemp(templ);
66 +#elif defined(_WIN32)
68 + return (int) ::fopen(templ, "w");
69 #elif defined(HAVE_MKTEMP)
70 // This probably just barely works...
74 string const tmpdir(dir.empty() ? package().temp_dir() : dir);
75 string tmpfl(AddName(tmpdir, mask));
77 tmpfl += convert<string>(getpid());
81 // The supposedly safe mkstemp version
83 int const tmpf = make_tempfile(tmpl.get());
85 string const t(tmpl.get());
87 + ::fclose((FILE *) tmpf);
91 lyxerr[Debug::FILES] << "Temporary file `" << t
92 << "' created." << endl;