Another (IMHO false) fall-through warning silenced

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

diff --git a/src/insets/RenderPreview.h b/src/insets/RenderPreview.h
index 83febb3bb981218ffe599bbe7cac644fb3ac1181..2f83aff5dc17d2eea2b03dd4777d2ca9a33d9145 100644 (file)
--- a/src/insets/RenderPreview.h
+++ b/src/insets/RenderPreview.h
@@ -20,10 +20,9 @@
 
 #include "support/docstring.h"
 #include "support/FileMonitor.h"
+#include "support/FileName.h"
+#include "support/signals.h"
 
-#include <boost/signal.hpp>
-#include <boost/signals/trackable.hpp>
-#include <boost/signals/connection.hpp>
 
 namespace lyx {
 
@@ -31,8 +30,6 @@ class Buffer;
 class MetricsInfo;
 class PainterInfo;
 
-namespace support { class FileName; }
-
 namespace graphics {
 
 class PreviewImage;
@@ -41,7 +38,7 @@ class PreviewLoader;
 } // namespace graphics
 
 
-class RenderPreview : public RenderBase, public boost::signals::trackable {
+class RenderPreview : public RenderBase {
 public:
        /// Return true if preview is enabled in text (from LyXRC::preview)
        static bool previewText();
@@ -50,7 +47,6 @@ public:
 
        RenderPreview(Inset const *);
        RenderPreview(RenderPreview const &, Inset const *);
-       ~RenderPreview();
        RenderBase * clone(Inset const *) const;
 
        /// Compute the size of the object, returned in dim
@@ -105,7 +101,7 @@ private:
        /** Store the connection to the preview loader so that we connect
         *  only once.
         */
-       boost::signals::connection ploader_connection_;
+       signals2::scoped_connection ploader_connection_;
 
        /// Inform the core that the inset has changed.
        Inset const * parent_;
@@ -120,22 +116,30 @@ public:
        ///
        void setAbsFile(support::FileName const & file);
        ///
-       bool monitoring() const { return monitor_.monitoring(); }
-       void startMonitoring() const { monitor_.start(); }
-       void stopMonitoring() const { monitor_.stop(); }
+       bool monitoring() const;
+       void startMonitoring() const;
+       void stopMonitoring() const;
 
        /// Connect and you'll be informed when the file changes.
-       typedef support::FileMonitor::slot_type slot_type;
-       boost::signals::connection fileChanged(slot_type const &);
+       /// Do not forget to track objects used by the slot.
+       typedef signals2::signal<void()> sig;
+       typedef sig::slot_type slot;
+       signals2::connection connect(slot const & slot);
 
        /// equivalent to dynamic_cast
        virtual RenderMonitoredPreview * asMonitoredPreview() { return this; }
 
 private:
+       /// This signal is emitted if the file is modified
+       sig changed_;
+       ///
+       mutable support::ActiveFileMonitorPtr monitor_;
        ///
-       mutable support::FileMonitor monitor_;
+       support::FileName filename_;
 };
 
+
+
 } // namespace lyx
 
 #endif // RENDERPREVIEW_H