#include "support/lyxfunctional.h"
#include "support/LAssert.h"
+#include <boost/bind.hpp>
+#include "BoostFormat.h"
+
#include <cassert>
#include <algorithm>
#include <functional>
void BufferList::emergencyWriteAll()
{
for_each(bstore.begin(), bstore.end(),
- lyx::void_class_fun(*this, &BufferList::emergencyWrite));
+ boost::bind(&BufferList::emergencyWrite, this, _1));
}
if (buf->isClean())
return;
- lyxerr << _("lyx: Attempting to save document ")
- << (buf->isUnnamed() ? OnlyFilename(buf->fileName())
- : buf->fileName())
- << _(" as...") << endl;
+ string const doc = buf->isUnnamed()
+ ? OnlyFilename(buf->fileName()) : buf->fileName();
+#if USE_BOOST_FORMAT
+ lyxerr << boost::format(_("LyX: Attempting to save document %1$s"))
+ % doc
+ << endl;
+#else
+ lyxerr << _("LyX: Attempting to save document ") << doc << endl;
+#endif
// We try to save three places:
// 1) Same place as document. Unless it is an unnamed doc.
// 2) In HOME directory.
string s = AddName(GetEnvPath("HOME"), buf->fileName());
s += ".emergency";
- lyxerr << " " << s << endl;
+ lyxerr << ' ' << s << endl;
if (buf->writeFile(s)) {
buf->markClean();
lyxerr << _(" Save seems successful. Phew.") << endl;
// drive letter on OS/2
s = AddName(MakeAbsPath("/tmp/"), buf->fileName());
s += ".emergency";
- lyxerr << " " << s << endl;
+ lyxerr << ' ' << s << endl;
if (buf->writeFile(s)) {
buf->markClean();
lyxerr << _(" Save seems successful. Phew.") << endl;
// not sure if this is the correct place to begin LyXLex
LyXLex lex(0, 0);
lex.setFile(ts);
- if (b->readFile(lex))
+ if (b->readFile(lex, ts))
return b;
else {
bstore.release(b);
LyXLex lex(0, 0);
lex.setFile(tname);
if (lex.isOK()) {
- if (b->readFile(lex)) {
+ if (b->readFile(lex, tname)) {
templateok = true;
}
}