X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finsets%2FRenderPreview.cpp;h=b05dca65b45107576de12eb97e1df7bda074d993;hb=2047ea5eb436d98d485bed672ed218f9bd708ce6;hp=d9946e838d807a1cc44320d55c0e29736eac4ad9;hpb=1d9d51c4b3f955937622efe95764b9f9198d8c19;p=lyx.git

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index d9946e838d..b05dca65b4 100644
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -39,9 +39,33 @@ using namespace lyx::support;
 namespace lyx {
 
 
-LyXRC_PreviewStatus RenderPreview::status()
+bool RenderPreview::previewText()
 {
-	return lyxrc.preview;
+	// Use a switch to trigger a warning if the enum is changed.
+	switch(lyxrc.preview) {
+	case LyXRC::PREVIEW_ON:
+	case LyXRC::PREVIEW_NO_MATH:
+		return true;
+	case LyXRC::PREVIEW_OFF:
+		break;
+	}
+
+	return false;
+}
+
+
+bool RenderPreview::previewMath()
+{
+	// Use a switch to trigger a warning if the enum is changed.
+	switch(lyxrc.preview) {
+	case LyXRC::PREVIEW_ON:
+		return true;
+	case LyXRC::PREVIEW_NO_MATH:
+	case LyXRC::PREVIEW_OFF:
+		break;
+	}
+
+	return false;
 }
 
 
@@ -53,7 +77,7 @@ RenderPreview::RenderPreview(Inset const * inset)
 RenderPreview::RenderPreview(RenderPreview const & other,
 			     Inset const * inset)
 	: RenderBase(other),
-	  boost::signals::trackable(),
+	  boost::signals2::trackable(),
 	  snippet_(other.snippet_),
 	  parent_(inset)
 {}
@@ -171,7 +195,7 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 
 void RenderPreview::startLoading(Buffer const & buffer, bool forexport) const
 {
-	if (!forexport && (status() == LyXRC::PREVIEW_OFF || snippet_.empty()))
+	if (!forexport && (lyxrc.preview == LyXRC::PREVIEW_OFF || snippet_.empty()))
 		return;
 
 	graphics::PreviewLoader * loader = buffer.loader();
@@ -184,7 +208,7 @@ void RenderPreview::addPreview(docstring const & latex_snippet,
                                Buffer const & buffer, 
                                bool ignore_lyxrc)
 {
-	if (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
+	if (lyxrc.preview == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
 		return;
 
 	graphics::PreviewLoader * loader = buffer.loader();
@@ -197,7 +221,7 @@ void RenderPreview::addPreview(docstring const & latex_snippet,
                                graphics::PreviewLoader & ploader, 
                                bool ignore_lyxrc)
 {
-	if (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
+	if (lyxrc.preview == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
 		return;
 
 	// FIXME UNICODE
@@ -260,7 +284,7 @@ void RenderMonitoredPreview::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-boost::signals::connection
+boost::signals2::connection
 RenderMonitoredPreview::fileChanged(slot_type const & slot)
 {
 	return monitor_.connect(slot);