From 88635c7e77a702b6713e5181267ad2140724dcfa Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Wed, 21 Apr 2010 01:19:33 +0000 Subject: [PATCH] Buffer::getAutosaveFilename -> Buffer::getAutosaveFileName git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34243 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Buffer.cpp | 8 ++++---- src/Buffer.h | 2 +- src/frontends/qt4/GuiView.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index e3e646232c..5ae41d91af 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -3141,7 +3141,7 @@ int AutoSaveBuffer::generateChild() } // namespace anon -FileName Buffer::getAutosaveFilename() const +FileName Buffer::getAutosaveFileName() const { // 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, @@ -3160,7 +3160,7 @@ FileName Buffer::getAutosaveFilename() const void Buffer::removeAutosaveFile() const { - FileName const f = getAutosaveFilename(); + FileName const f = getAutosaveFileName(); if (f.exists()) f.removeFile(); } @@ -3168,7 +3168,7 @@ void Buffer::removeAutosaveFile() const void Buffer::moveAutosaveFile(support::FileName const & oldauto) const { - FileName const newauto = getAutosaveFilename(); + FileName const newauto = getAutosaveFileName(); oldauto.refresh(); if (newauto != oldauto && oldauto.exists()) if (!oldauto.moveTo(newauto)) @@ -3187,7 +3187,7 @@ void Buffer::autoSave() const // emit message signal. message(_("Autosaving current document...")); - AutoSaveBuffer autosave(*this, getAutosaveFilename()); + AutoSaveBuffer autosave(*this, getAutosaveFileName()); autosave.start(); d->bak_clean = true; diff --git a/src/Buffer.h b/src/Buffer.h index 384f34ec98..01537b9b63 100644 --- a/src/Buffer.h +++ b/src/Buffer.h @@ -504,7 +504,7 @@ public: /// void moveAutosaveFile(support::FileName const & old) const; /// - support::FileName getAutosaveFilename() const; + support::FileName getAutosaveFileName() const; /// return the format of the buffer on a string std::string bufferFormat() const; diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 0274edeb03..3f9d8b7f32 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1365,7 +1365,7 @@ void GuiView::autoSave() #if (QT_VERSION >= 0x040400) GuiViewPrivate::busyBuffers.insert(buffer); QFuture f = QtConcurrent::run(GuiViewPrivate::saveAndDestroy, buffer, buffer->clone(), - buffer->getAutosaveFilename()); + buffer->getAutosaveFileName()); d.autosave_watcher_.setFuture(f); #else 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 b.setFileName(fname.absFileName()); @@ -2141,7 +2141,7 @@ bool GuiView::renameBuffer(Buffer & b, docstring const & newname) b.moveAutosaveFile(oldauto); if (!saveBuffer(b)) { - oldauto = b.getAutosaveFilename(); + oldauto = b.getAutosaveFileName(); b.setFileName(oldname.absFileName()); b.setUnnamed(unnamed); b.saveCheckSum(oldname); -- 2.39.2