]> git.lyx.org Git - lyx.git/commitdiff
Rename GuiViewPrivate::saveAndDestroy to autosaveAndDestroy (because that's what...
authorVincent van Ravesteijn <vfr@lyx.org>
Wed, 17 Nov 2010 02:07:54 +0000 (02:07 +0000)
committerVincent van Ravesteijn <vfr@lyx.org>
Wed, 17 Nov 2010 02:07:54 +0000 (02:07 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36324 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt4/GuiView.cpp

index 817f5772519f0ae794315cfdedb33fd3f828a2d4..249968cdfb40cebb01cf681cb70558633f12073d 100644 (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 saveAndDestroy(Buffer const * orig, Buffer * buffer, FileName const & fname);
+       static docstring autosaveAndDestroy(Buffer const * orig, Buffer * buffer, FileName const & fname);
 
        template<class T>
        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<docstring> f = QtConcurrent::run(GuiViewPrivate::saveAndDestroy, buffer, buffer->clone(),
-               buffer->getAutosaveFileName());
+       QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::autosaveAndDestroy,
+               buffer, buffer->clone(), buffer->getAutosaveFileName());
        d.autosave_watcher_.setFuture(f);
 #else
        buffer->autoSave();