From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Fri, 29 Oct 2010 18:50:48 +0000 (+0000)
Subject: Pass the Buffer to GuiView::reloadBuffer. We always know which buffer we want to... 
X-Git-Tag: 2.0.0~2182
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e82cd410c15de3caf559b2034e89cc566b29defd;p=features.git

Pass the Buffer to GuiView::reloadBuffer. We always know which buffer we want to reload, so don't ask the documentBufferView again.

Besides, now we can always call GuiView::reloadBuffer instead of calling Buffer::reload directly. This means we don't have to do the error handling each time over and over again.

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

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 6dc35a72df..81463d9d0e 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2522,7 +2522,7 @@ bool GuiView::saveBufferIfNeeded(Buffer & buf, bool hiding)
 		// buf.removeAutosaveFile();
 		if (hiding)
 			// revert all changes
-			buf.reload();
+			reloadBuffer(buf);
 		buf.markClean();
 		break;
 	case 2:
@@ -2616,14 +2616,10 @@ static bool ensureBufferClean(Buffer * buffer)
 }
 
 
-bool GuiView::reloadBuffer()
+bool GuiView::reloadBuffer(Buffer & buf)
 {
-	BufferView * view = documentBufferView();
-	if (view) {
-		Buffer::ReadStatus status = view->buffer().reload();
-		return status == Buffer::ReadSuccess;
-	}
-	return false;
+	Buffer::ReadStatus status = buf.reload();
+	return status == Buffer::ReadSuccess;
 }
 
 
@@ -2632,15 +2628,16 @@ void GuiView::checkExternallyModifiedBuffers()
 	BufferList::iterator bit = theBufferList().begin();
 	BufferList::iterator const bend = theBufferList().end();
 	for (; bit != bend; ++bit) {
-		if ((*bit)->fileName().exists()
-			&& (*bit)->isExternallyModified(Buffer::checksum_method)) {
+		Buffer * buf = *bit;
+		if (buf->fileName().exists()
+			&& buf->isExternallyModified(Buffer::checksum_method)) {
 			docstring text = bformat(_("Document \n%1$s\n has been externally modified."
 					" Reload now? Any local changes will be lost."),
-					from_utf8((*bit)->absFileName()));
+					from_utf8(buf->absFileName()));
 			int const ret = Alert::prompt(_("Reload externally changed document?"),
 						text, 0, 1, _("&Reload"), _("&Cancel"));
 			if (!ret)
-				(*bit)->reload();
+				reloadBuffer(*buf);
 		}
 	}
 }
@@ -2657,7 +2654,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd, DispatchResult & dr)
 			break;
 		if (!buffer->lyxvc().inUse()) {
 			if (buffer->lyxvc().registrer()) {
-				reloadBuffer();
+				reloadBuffer(*buffer);
 				dr.suppressMessageUpdate();
 			}
 		}
@@ -2669,7 +2666,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd, DispatchResult & dr)
 		if (buffer->lyxvc().inUse() && !buffer->isReadonly()) {
 			dr.setMessage(buffer->lyxvc().checkIn());
 			if (!dr.message().empty())
-				reloadBuffer();
+				reloadBuffer(*buffer);
 		}
 		break;
 
@@ -2678,7 +2675,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd, DispatchResult & dr)
 			break;
 		if (buffer->lyxvc().inUse()) {
 			dr.setMessage(buffer->lyxvc().checkOut());
-			reloadBuffer();
+			reloadBuffer(*buffer);
 		}
 		break;
 
@@ -2693,7 +2690,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd, DispatchResult & dr)
 				_("Error when setting the locking property."));
 			} else {
 				dr.setMessage(res);
-				reloadBuffer();
+				reloadBuffer(*buffer);
 			}
 		}
 		break;
@@ -2701,14 +2698,14 @@ void GuiView::dispatchVC(FuncRequest const & cmd, DispatchResult & dr)
 	case LFUN_VC_REVERT:
 		LASSERT(buffer, return);
 		buffer->lyxvc().revert();
-		reloadBuffer();
+		reloadBuffer(*buffer);
 		dr.suppressMessageUpdate();
 		break;
 
 	case LFUN_VC_UNDO_LAST:
 		LASSERT(buffer, return);
 		buffer->lyxvc().undoLast();
-		reloadBuffer();
+		reloadBuffer(*buffer);
 		dr.suppressMessageUpdate();
 		break;
 
@@ -2757,7 +2754,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd, DispatchResult & dr)
 		if (contains(flag, 'I'))
 			buffer->markDirty();
 		if (contains(flag, 'R'))
-			reloadBuffer();
+			reloadBuffer(*buffer);
 
 		break;
 		}
@@ -3167,7 +3164,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 
 			if (ret == 0) {
 				doc_buffer->markClean();
-				reloadBuffer();
+				reloadBuffer(*doc_buffer);
 				dr.forceBufferUpdate();
 			}
 			break;
diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h
index 80bfc6d057..4e2a429ac1 100644
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -404,7 +404,7 @@ private:
 	///
 	Dialog * build(std::string const & name);
 	///
-	bool reloadBuffer();
+	bool reloadBuffer(Buffer & buffer);
 	///
 	void dispatchVC(FuncRequest const & cmd, DispatchResult & dr);
 	///