anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Buffer::getAutosaveFilename -> Buffer::getAutosaveFileName

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34243 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-04-21 01:19:33 +00:00
parent bb59d0fd0a
commit 88635c7e77
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Buffer.cpp
View File

@ -3141,7 +3141,7 @@ int AutoSaveBuffer::generateChild()
} // namespace anon } // namespace anon
FileName Buffer::getAutosaveFilename() const FileName Buffer::getAutosaveFileName() const
{ {
// if the document is unnamed try to save in the backup dir, else // if the document is unnamed try to save in the backup dir, else
// in the default document path, and as a last try in the filePath, // in the default document path, and as a last try in the filePath,
@ -3160,7 +3160,7 @@ FileName Buffer::getAutosaveFilename() const
void Buffer::removeAutosaveFile() const void Buffer::removeAutosaveFile() const
{ {
FileName const f = getAutosaveFilename(); FileName const f = getAutosaveFileName();
if (f.exists()) if (f.exists())
f.removeFile(); f.removeFile();
} }
@ -3168,7 +3168,7 @@ void Buffer::removeAutosaveFile() const
void Buffer::moveAutosaveFile(support::FileName const & oldauto) const void Buffer::moveAutosaveFile(support::FileName const & oldauto) const
{ {
FileName const newauto = getAutosaveFilename(); FileName const newauto = getAutosaveFileName();
oldauto.refresh(); oldauto.refresh();
if (newauto != oldauto && oldauto.exists()) if (newauto != oldauto && oldauto.exists())
if (!oldauto.moveTo(newauto)) if (!oldauto.moveTo(newauto))
@ -3187,7 +3187,7 @@ void Buffer::autoSave() const
// emit message signal. // emit message signal.
message(_("Autosaving current document...")); message(_("Autosaving current document..."));
AutoSaveBuffer autosave(*this, getAutosaveFilename()); AutoSaveBuffer autosave(*this, getAutosaveFileName());
autosave.start(); autosave.start();
d->bak_clean = true; d->bak_clean = true;

2
src/Buffer.h
View File

@ -504,7 +504,7 @@ public:
/// ///
void moveAutosaveFile(support::FileName const & old) const; void moveAutosaveFile(support::FileName const & old) const;
/// ///
support::FileName getAutosaveFilename() const; support::FileName getAutosaveFileName() const;
/// return the format of the buffer on a string /// return the format of the buffer on a string
std::string bufferFormat() const; std::string bufferFormat() const;

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

@ -1365,7 +1365,7 @@ void GuiView::autoSave()
#if (QT_VERSION >= 0x040400) #if (QT_VERSION >= 0x040400)
GuiViewPrivate::busyBuffers.insert(buffer); GuiViewPrivate::busyBuffers.insert(buffer);
QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::saveAndDestroy, buffer, buffer->clone(), QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::saveAndDestroy, buffer, buffer->clone(),
buffer->getAutosaveFilename()); buffer->getAutosaveFileName());
d.autosave_watcher_.setFuture(f); d.autosave_watcher_.setFuture(f);
#else #else
buffer->autoSave(); buffer->autoSave();
@ -2128,7 +2128,7 @@ bool GuiView::renameBuffer(Buffer & b, docstring const & newname)
} }
} }
FileName oldauto = b.getAutosaveFilename(); FileName oldauto = b.getAutosaveFileName();
// Ok, change the name of the buffer // Ok, change the name of the buffer
b.setFileName(fname.absFileName()); b.setFileName(fname.absFileName());
@ -2141,7 +2141,7 @@ bool GuiView::renameBuffer(Buffer & b, docstring const & newname)
b.moveAutosaveFile(oldauto); b.moveAutosaveFile(oldauto);
if (!saveBuffer(b)) { if (!saveBuffer(b)) {
oldauto = b.getAutosaveFilename(); oldauto = b.getAutosaveFileName();
b.setFileName(oldname.absFileName()); b.setFileName(oldname.absFileName());
b.setUnnamed(unnamed); b.setUnnamed(unnamed);
b.saveCheckSum(oldname); b.saveCheckSum(oldname);