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 5a51d793b213900b6bf76fd1fbdd6aa8b0fe6ffe..b05dca65b45107576de12eb97e1df7bda074d993 100644 (file)
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -13,6 +13,7 @@
 #include "insets/RenderPreview.h"
 #include "insets/Inset.h"
 
+#include "Buffer.h"
 #include "BufferView.h"
 #include "Dimension.h"
 #include "LyX.h"
@@ -24,7 +25,6 @@
 
 #include "graphics/PreviewImage.h"
 #include "graphics/PreviewLoader.h"
-#include "graphics/Previews.h"
 
 #include "support/FileName.h"
 #include "support/gettext.h"
@@ -39,9 +39,33 @@ using namespace lyx::support;
 namespace lyx {
 
 
-LyXRC_PreviewStatus RenderPreview::status()
+bool RenderPreview::previewText()
 {
-       return graphics::Previews::status();
+       // 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)
 {}
@@ -74,19 +98,13 @@ RenderBase * RenderPreview::clone(Inset const * inset) const
 
 namespace {
 
-graphics::PreviewLoader & getPreviewLoader(Buffer const & buffer)
-{
-       return thePreviews().loader(buffer);
-}
-
-
 docstring const statusMessage(BufferView const * bv, string const & snippet)
 {
-       LASSERT(bv, /**/);
+       LASSERT(bv, return docstring());
 
        Buffer const & buffer = bv->buffer();
-       graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
-       graphics::PreviewLoader::Status const status = loader.status(snippet);
+       graphics::PreviewLoader const * loader = buffer.loader();
+       graphics::PreviewLoader::Status const status = loader->status(snippet);
 
        docstring message;
        switch (status) {
@@ -111,14 +129,15 @@ docstring const statusMessage(BufferView const * bv, string const & snippet)
 graphics::PreviewImage const *
 RenderPreview::getPreviewImage(Buffer const & buffer) const
 {
-       graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
-       return loader.preview(snippet_);
+       graphics::PreviewLoader const * loader = buffer.loader();
+       LASSERT(loader, return 0);
+       return loader->preview(snippet_);
 }
 
 
 void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       LASSERT(mi.base.bv, /**/);
+       LBUFERR(mi.base.bv);
 
        graphics::PreviewImage const * const pimage =
                getPreviewImage(mi.base.bv->buffer());
@@ -144,7 +163,7 @@ void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 {
-       LASSERT(pi.base.bv, /**/);
+       LBUFERR(pi.base.bv);
 
        graphics::PreviewImage const * const pimage =
                getPreviewImage(pi.base.bv->buffer());
@@ -153,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;
 
@@ -177,11 +195,12 @@ 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 const & loader = getPreviewLoader(buffer);
-       loader.startLoading(forexport);
+       graphics::PreviewLoader * loader = buffer.loader();
+       LASSERT(loader, return);
+       loader->startLoading(forexport);
 }
 
 
@@ -189,11 +208,12 @@ 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 = getPreviewLoader(buffer);
-       addPreview(latex_snippet, loader, ignore_lyxrc);
+       graphics::PreviewLoader * loader = buffer.loader();
+       LASSERT(loader, return);
+       addPreview(latex_snippet, *loader, ignore_lyxrc);
 }
 
 
@@ -201,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
@@ -230,8 +250,9 @@ void RenderPreview::removePreview(Buffer const & buffer)
        if (snippet_.empty())
                return;
 
-       graphics::PreviewLoader & loader = getPreviewLoader(buffer);
-       loader.remove(snippet_);
+       graphics::PreviewLoader * loader = buffer.loader();
+       LASSERT(loader, return);
+       loader->remove(snippet_);
        snippet_.erase();
 }
 
@@ -263,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);