Replace Boost.Signals with Boost.Signals2

[lyx.git] / src / insets / RenderPreview.cpp

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index 92363d435d2a6e111e341d09b5b715d38072533c..b05dca65b45107576de12eb97e1df7bda074d993 100644 (file)
--- 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)
 {}
@@ -148,7 +172,6 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
        if (image) {
                pi.pain.image(x, y - dim_.asc, dim_.wid, dim_.height(),
                              *image);
-
        } else {
                int const offset = Inset::TEXT_TO_INSET_OFFSET;
 
@@ -172,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();
@@ -185,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();
@@ -198,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
@@ -261,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);