From: Vincent van Ravesteijn Date: Wed, 17 Nov 2010 02:07:54 +0000 (+0000) Subject: Rename GuiViewPrivate::saveAndDestroy to autosaveAndDestroy (because that's what... X-Git-Tag: 2.0.0~1837 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a0916d4fef9d9c51665973e2bc5589a9eb60b590;p=features.git Rename GuiViewPrivate::saveAndDestroy to autosaveAndDestroy (because that's what it actually does according to the return string). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36324 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 817f577251..249968cdfb 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -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 saveAndDestroy(Buffer const * orig, Buffer * buffer, FileName const & fname); + static docstring autosaveAndDestroy(Buffer const * orig, Buffer * buffer, FileName const & fname); template static docstring runAndDestroy(const T& func, Buffer const * orig, Buffer * buffer, string const & format, string const & msg); @@ -1493,7 +1493,7 @@ BufferView const * GuiView::currentBufferView() const #if (QT_VERSION >= 0x040400) -docstring GuiView::GuiViewPrivate::saveAndDestroy(Buffer const * orig, Buffer * buffer, FileName const & fname) +docstring GuiView::GuiViewPrivate::autosaveAndDestroy(Buffer const * orig, Buffer * buffer, FileName const & fname) { bool failed = true; FileName const tmp_ret = FileName::tempName("lyxauto"); @@ -1525,8 +1525,8 @@ void GuiView::autoSave() #if (QT_VERSION >= 0x040400) GuiViewPrivate::busyBuffers.insert(buffer); - QFuture f = QtConcurrent::run(GuiViewPrivate::saveAndDestroy, buffer, buffer->clone(), - buffer->getAutosaveFileName()); + QFuture f = QtConcurrent::run(GuiViewPrivate::autosaveAndDestroy, + buffer, buffer->clone(), buffer->getAutosaveFileName()); d.autosave_watcher_.setFuture(f); #else buffer->autoSave();