anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

small simplification

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20688 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-10-03 09:21:15 +00:00
parent b06228b35e
commit 97770c4332
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/LyXFunc.cpp
View File

@ -1096,7 +1096,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
}
// Push directory path.
string const path(buffer->temppath());
string const path = buffer->temppath();
// Prevent the compiler from optimizing away p
FileName pp(path);
support::Path p(pp);

29
src/callback.cpp
View File

@ -214,8 +214,8 @@ namespace {
class AutoSaveBuffer : public ForkedProcess {
public:
///
AutoSaveBuffer(BufferView & bv, FileName const & fname)
: bv_(bv), fname_(fname) {}
AutoSaveBuffer(Buffer & buffer, FileName const & fname)
: buffer_(buffer), fname_(fname) {}
///
virtual shared_ptr<ForkedProcess> clone() const
{
@ -227,7 +227,7 @@ private:
///
virtual int generateChild();
///
BufferView & bv_;
Buffer & buffer_;
FileName fname_;
};
@ -255,7 +255,7 @@ int AutoSaveBuffer::generateChild()
FileName const tmp_ret(tempName(FileName(), "lyxauto"));
if (!tmp_ret.empty()) {
bv_.buffer().writeFile(tmp_ret);
buffer_.writeFile(tmp_ret);
// assume successful write of tmp_ret
if (!rename(tmp_ret, fname_)) {
failed = true;
@ -271,11 +271,11 @@ int AutoSaveBuffer::generateChild()
if (failed) {
// failed to write/rename tmp_ret so try writing direct
if (!bv_.buffer().writeFile(fname_)) {
if (!buffer_.writeFile(fname_)) {
// It is dangerous to do this in the child,
// but safe in the parent, so...
if (pid == -1) // emit message signal.
bv_.buffer().message(_("Autosave failed!"));
buffer_.message(_("Autosave failed!"));
}
}
if (pid == 0) { // we are the child so...
@ -292,26 +292,27 @@ void autoSave(BufferView * bv)
// should probably be moved into BufferList (Lgb)
// Perfect target for a thread...
{
if (bv->buffer().isBakClean() || bv->buffer().isReadonly()) {
Buffer & buf = bv->buffer();
if (buf.isBakClean() || buf.isReadonly()) {
// We don't save now, but we'll try again later
bv->buffer().resetAutosaveTimers();
buf.resetAutosaveTimers();
return;
}
// emit message signal.
bv->buffer().message(_("Autosaving current document..."));
buf.message(_("Autosaving current document..."));
// create autosave filename
string fname = bv->buffer().filePath();
string fname = buf.filePath();
fname += '#';
fname += onlyFilename(bv->buffer().fileName());
fname += onlyFilename(buf.fileName());
fname += '#';
AutoSaveBuffer autosave(*bv, FileName(fname));
AutoSaveBuffer autosave(buf, FileName(fname));
autosave.start();
bv->buffer().markBakClean();
bv->buffer().resetAutosaveTimers();
buf.markBakClean();
buf.resetAutosaveTimers();
}