replace BufferView::reload() uses with LyXFunc::reloadBuffer().

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16727 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferView.C b/src/BufferView.C
index 92ed1d86399fd8f6f5ca6071ad822b58e58eeacd..a9ec2eb305cab785ed87bcf0086121e3dbe6d2c7 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -278,13 +278,6 @@ bool BufferView::loadLyXFile(FileName const & filename, bool tolastfiles)
 }
 
 
-void BufferView::reload()
-{
-       if (theBufferList().close(buffer_, false))
-               loadLyXFile(FileName(buffer_->fileName()));
-}
-
-
 void BufferView::resize()
 {
        if (!buffer_)

diff --git a/src/BufferView.h b/src/BufferView.h
index 1ccf16ed1ad5d7e8295388134bb1fbe0099c05cc..bceaf1f82fd92d4d6bdffc091c312130802d6bd6 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -93,8 +93,6 @@ public:
        /// resize the BufferView.
        void resize();
 
-       /// redisplay the referenced buffer.
-       void reload();
        /// load a buffer into the view.
        bool loadLyXFile(support::FileName const & name, bool tolastfiles = true);
 

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index ce172b6833b3b4a417e4dcc3edbad462bceb5348..6bea04231801bbc5aa72691266e08322d1c294dc 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -899,7 +899,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                text, 0, 1, _("&Revert"), _("&Cancel"));
 
                        if (ret == 0)
-                               view()->reload();
+                               reloadBuffer();
                        break;
                }
 
@@ -1133,7 +1133,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        if (lyx_view_->buffer()->lyxvc().inUse()
                                        && !lyx_view_->buffer()->isReadonly()) {
                                lyx_view_->buffer()->lyxvc().checkIn();
-                               view()->reload();
+                               reloadBuffer();
                        }
                        break;
 
@@ -1144,20 +1144,20 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        if (lyx_view_->buffer()->lyxvc().inUse()
                                        && lyx_view_->buffer()->isReadonly()) {
                                lyx_view_->buffer()->lyxvc().checkOut();
-                               view()->reload();
+                               reloadBuffer();
                        }
                        break;
 
                case LFUN_VC_REVERT:
                        BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
                        lyx_view_->buffer()->lyxvc().revert();
-                       view()->reload();
+                       reloadBuffer();
                        break;
 
                case LFUN_VC_UNDO_LAST:
                        BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
                        lyx_view_->buffer()->lyxvc().undoLast();
-                       view()->reload();
+                       reloadBuffer();
                        break;
 
                // --- buffers ----------------------------------------