X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderPreview.cpp;h=df0ac64d7e8bd67be8bd99fc68e262c63a5e8bc3;hb=cf6ff2cac79d09adafa63e3a1ec02dfb09f707b9;hp=99abca9f3c5800d0e18591155043ccd8bc4c8ae2;hpb=a4fae021f23aa38382673d014cea839aaa9cb812;p=lyx.git

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index 99abca9f3c..df0ac64d7e 100644
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -31,8 +31,6 @@
 #include "support/lassert.h"
 #include "support/lstrings.h"
 
-#include "support/bind.h"
-
 using namespace std;
 using namespace lyx::support;
 
@@ -77,19 +75,11 @@ RenderPreview::RenderPreview(Inset const * inset)
 RenderPreview::RenderPreview(RenderPreview const & other,
 			     Inset const * inset)
 	: RenderBase(other),
-	  boost::signals2::trackable(),
 	  snippet_(other.snippet_),
 	  parent_(inset)
 {}
 
 
-RenderPreview::~RenderPreview()
-{
-	if (ploader_connection_.connected())
-		ploader_connection_.disconnect();
-}
-
-
 RenderBase * RenderPreview::clone(Inset const * inset) const
 {
 	return new RenderPreview(*this, inset);
@@ -126,7 +116,7 @@ docstring const statusMessage(BufferView const * bv, string const & snippet)
 	return message;
 }
 
-} // namespace anon
+} // namespace
 
 
 graphics::PreviewImage const *
@@ -210,7 +200,7 @@ void RenderPreview::startLoading(Buffer const & buffer, bool forexport) const
 
 
 void RenderPreview::addPreview(docstring const & latex_snippet,
-                               Buffer const & buffer, 
+                               Buffer const & buffer,
                                bool ignore_lyxrc)
 {
 	if (lyxrc.preview == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
@@ -223,7 +213,7 @@ void RenderPreview::addPreview(docstring const & latex_snippet,
 
 
 void RenderPreview::addPreview(docstring const & latex_snippet,
-                               graphics::PreviewLoader & ploader, 
+                               graphics::PreviewLoader & ploader,
                                bool ignore_lyxrc)
 {
 	if (lyxrc.preview == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
@@ -241,10 +231,12 @@ void RenderPreview::addPreview(docstring const & latex_snippet,
 	// If this is the first time of calling, connect to the
 	// PreviewLoader signal that'll inform us when the preview image
 	// is ready for loading.
-	if (!ploader_connection_.connected()) {
-		ploader_connection_ = ploader.connect(
-			bind(&RenderPreview::imageReady, this, _1));
-	}
+	if (!ploader_connection_.connected())
+		// This is a scoped connection.
+		ploader_connection_ =
+			ploader.connect([this](graphics::PreviewImage const & pi){
+				imageReady(pi);
+			});
 
 	ploader.add(snippet_);
 }
@@ -292,11 +284,11 @@ void RenderMonitoredPreview::draw(PainterInfo & pi, int x, int y) const
 {
 	RenderPreview::draw(pi, x, y);
 	startMonitoring();
+	monitor_->checkModifiedAsync();
 }
 
 
-boost::signals2::connection
-RenderMonitoredPreview::connect(ChangedSig::slot_type const & slot)
+signals2::connection RenderMonitoredPreview::connect(slot const & slot)
 {
 	return changed_.connect(slot);
 }
@@ -311,8 +303,8 @@ bool RenderMonitoredPreview::monitoring() const
 void RenderMonitoredPreview::startMonitoring() const
 {
 	if (!monitoring()) {
-		monitor_ = FileSystemWatcher::monitor(filename_);
-		monitor_->connect(changed_);
+		monitor_ = FileSystemWatcher::activeMonitor(filename_);
+		monitor_->connect([this](bool /* exists */){ changed_(); });
 	}
 }