Remove unused UI file.

[lyx.git] / src / frontends / qt4 / GuiView.cpp

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 32ddfdc2302af260894c5417687e8db6478d0206..c6b8474b9966fd650c31d1e5e79786b494e56f02 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2127,6 +2127,7 @@ bool GuiView::closeWorkArea(GuiWorkArea * wa)
 bool GuiView::closeBuffer()
 {
        GuiWorkArea * wa = currentMainWorkArea();
+       setCurrentWorkArea(wa);
        Buffer & buf = wa->bufferView().buffer();
        return wa && closeWorkArea(wa, !buf.parent());
 }
@@ -2315,7 +2316,7 @@ bool GuiView::saveBufferIfNeeded(Buffer & buf, bool hiding)
                buf.removeAutosaveFile();
                if (hiding)
                        // revert all changes
-                       buf.loadLyXFile(buf.fileName());
+                       buf.reload();
                buf.markClean();
                break;
        case 2:
@@ -2412,35 +2413,7 @@ static bool ensureBufferClean(Buffer * buffer)
 void GuiView::reloadBuffer()
 {
        Buffer * buf = &documentBufferView()->buffer();
-       reloadBuffer(buf);
-}
-
-
-void GuiView::reloadBuffer(Buffer * buf)
-{
-       FileName filename = buf->fileName();
-       // e.g., read-only status could have changed due to version control
-       filename.refresh();
-       Buffer const * parent = buf->parent();
-       // The user has already confirmed that the changes, if any, should
-       // be discarded. So we just release the Buffer and don't call closeBuffer();
-       theBufferList().release(buf);
-       buf = loadDocument(filename);
-       docstring const disp_fn = makeDisplayPath(filename.absFilename());
-       docstring str;
-       if (buf) {
-               // re-allocate master if necessary
-               if (parent && theBufferList().isLoaded(parent)
-                     && buf->parent() != parent)
-                       buf->setParent(parent);
-               buf->updateLabels();
-               setBuffer(buf);
-               buf->errors("Parse");
-               str = bformat(_("Document %1$s reloaded."), disp_fn);
-       } else {
-               str = bformat(_("Could not reload document %1$s"), disp_fn);
-       }
-       message(str);
+       buf->reload();
 }
 
 
@@ -2457,7 +2430,7 @@ void GuiView::checkExternallyModifiedBuffers()
                        int const ret = Alert::prompt(_("Reload externally changed document?"),
                                                text, 0, 1, _("&Reload"), _("&Cancel"));
                        if (!ret)
-                               reloadBuffer(*bit);
+                               (*bit)->reload();
                }
        }
 }
@@ -2485,7 +2458,8 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
                        break;
                if (buffer->lyxvc().inUse() && !buffer->isReadonly()) {
                        msg = buffer->lyxvc().checkIn();
-                       reloadBuffer();
+                       if (!msg.empty())
+                               reloadBuffer();
                }
                break;