X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderPreview.cpp;h=b0eb1f7838d919f94a51350740ed347e1b47d3cd;hb=f24bb4a91980a17c00c12ec0bbb457e0f182215f;hp=64a5eb58adcc4f7194fbb4320fe26dbc100b485d;hpb=75bfed55079cab6b73fbea6ce4ae3f10d1af3b91;p=lyx.git

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index 64a5eb58ad..b0eb1f7838 100644
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -116,14 +116,14 @@ docstring const statusMessage(BufferView const * bv, string const & snippet)
 	return message;
 }
 
-} // namespace anon
+} // namespace
 
 
 graphics::PreviewImage const *
 RenderPreview::getPreviewImage(Buffer const & buffer) const
 {
 	graphics::PreviewLoader const * loader = buffer.loader();
-	LASSERT(loader, return 0);
+	LASSERT(loader, return nullptr);
 	return loader->preview(snippet_);
 }
 
@@ -145,7 +145,7 @@ void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 
 		FontInfo font(mi.base.font);
 		font.setFamily(SANS_FAMILY);
-		font.setSize(FONT_SIZE_FOOTNOTE);
+		font.setSize(FOOTNOTE_SIZE);
 		docstring const stat = statusMessage(mi.base.bv, snippet_);
 		dim.wid = 15 + theFontMetrics(font).width(stat);
 	}
@@ -154,7 +154,7 @@ void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 }
 
 
-void RenderPreview::draw(PainterInfo & pi, int x, int y) const
+void RenderPreview::draw(PainterInfo & pi, int x, int y, bool const) const
 {
 	LBUFERR(pi.base.bv);
 
@@ -166,7 +166,7 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 		pi.pain.image(x, y - dim_.asc, dim_.wid, dim_.height(),
 			      *image);
 	} else {
-		int const offset = Inset::TEXT_TO_INSET_OFFSET;
+		int const offset = Inset::textOffset(pi.base.bv);
 
 		pi.pain.rectangle(x + offset,
 				  y - dim_.asc,
@@ -176,15 +176,15 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 
 		FontInfo font(pi.base.font);
 		font.setFamily(SANS_FAMILY);
-		font.setSize(FONT_SIZE_FOOTNOTE);
+		font.setSize(FOOTNOTE_SIZE);
 
 		docstring const stat = statusMessage(pi.base.bv, snippet_);
 		pi.pain.text(x + offset + 6,
 			     y - theFontMetrics(font).maxAscent() - 4,
 			     stat, font);
 	}
-	pi.change_.paintCue(pi, x, y - dim_.asc,
-	                    x + dim_.width(), y - dim_.asc + dim_.height());
+	pi.change.paintCue(pi, x, y - dim_.asc,
+	                   x + dim_.width(), y - dim_.asc + dim_.height());
 }
 
 
@@ -280,7 +280,7 @@ void RenderMonitoredPreview::setAbsFile(FileName const & file)
 }
 
 
-void RenderMonitoredPreview::draw(PainterInfo & pi, int x, int y) const
+void RenderMonitoredPreview::draw(PainterInfo & pi, int x, int y, bool const) const
 {
 	RenderPreview::draw(pi, x, y);
 	startMonitoring();
@@ -288,7 +288,7 @@ void RenderMonitoredPreview::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-signals2::connection RenderMonitoredPreview::connect(slot const & slot)
+connection RenderMonitoredPreview::connect(slot const & slot)
 {
 	return changed_.connect(slot);
 }
@@ -304,6 +304,7 @@ void RenderMonitoredPreview::startMonitoring() const
 {
 	if (!monitoring()) {
 		monitor_ = FileSystemWatcher::activeMonitor(filename_);
+		// Disconnected at the same time as this is destroyed.
 		monitor_->connect([this](bool /* exists */){ changed_(); });
 	}
 }