anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Let GuiViewPrivate::autosaveAndDestroy use Buffer::autoSave() and remove the now unneeded parameter filename.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36326 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-11-17 02:23:39 +00:00
parent 208acbc728
commit ae852848fa
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/frontends/qt4/GuiView.cpp
View File

@ -375,7 +375,7 @@ public:
static docstring previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
static docstring exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
static docstring compileAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
static docstring autosaveAndDestroy(Buffer const * orig, Buffer * buffer, FileName const & fname);
static docstring autosaveAndDestroy(Buffer const * orig, Buffer * buffer);
template<class T>
static docstring runAndDestroy(const T& func, Buffer const * orig, Buffer * buffer, string const & format, string const & msg);
@ -1493,23 +1493,15 @@ BufferView const * GuiView::currentBufferView() const
#if (QT_VERSION >= 0x040400)
docstring GuiView::GuiViewPrivate::autosaveAndDestroy(Buffer const * orig, Buffer * buffer, FileName const & fname)
docstring GuiView::GuiViewPrivate::autosaveAndDestroy(
Buffer const * orig, Buffer * buffer)
{
bool failed = true;
FileName const tmp_ret = FileName::tempName("lyxauto");
if (!tmp_ret.empty()) {
if (buffer->writeFile(tmp_ret))
failed = !tmp_ret.moveTo(fname);
}
if (failed) {
// failed to write/rename tmp_ret so try writing direct
failed = buffer->writeFile(fname);
}
bool const success = buffer->autoSave();
delete buffer;
busyBuffers.remove(orig);
return failed
? _("Automatic save failed!")
: _("Automatic save done.");
return success
? _("Automatic save done.")
: _("Automatic save failed!");
}
#endif
@ -1526,7 +1518,7 @@ void GuiView::autoSave()
#if (QT_VERSION >= 0x040400)
GuiViewPrivate::busyBuffers.insert(buffer);
QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::autosaveAndDestroy,
buffer, buffer->clone(), buffer->getAutosaveFileName());
buffer, buffer->clone());
d.autosave_watcher_.setFuture(f);
#else
buffer->autoSave();