Remove obsolete (and false) comment.

[lyx.git] / src / graphics / PreviewLoader.cpp

diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index 93ea6b79b652bb7d8a3d39ad560d3d26f32d3376..d9133d9a7dc09763938061fd92963d71d839aa59 100644 (file)
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -38,7 +38,6 @@
 #include "support/ForkedCalls.h"
 #include "support/lstrings.h"
 
-#include "support/bind.h"
 #include "support/TempFile.h"
 
 #include <atomic>
@@ -161,14 +160,13 @@ typedef map<pid_t, InProgress>  InProgressProcesses;
 
 typedef InProgressProcesses::value_type InProgressProcess;
 
-} // namespace anon
-
+} // namespace
 
 
 namespace lyx {
 namespace graphics {
 
-class PreviewLoader::Impl : public boost::signals2::trackable {
+class PreviewLoader::Impl {
 public:
        ///
        Impl(PreviewLoader & p, Buffer const & b);
@@ -189,7 +187,7 @@ public:
        void refreshPreviews();
 
        /// Emit this signal when an image is ready for display.
-       boost::signals2::signal<void(PreviewImage const &)> imageReady;
+       signals2::signal<void(PreviewImage const &)> imageReady;
 
        Buffer const & buffer() const { return buffer_; }
 
@@ -219,7 +217,6 @@ private:
 
        /** in_progress_ stores all forked processes so that we can proceed
         *  thereafter.
-           The map uses the conversion commands as its identifiers.
         */
        InProgressProcesses in_progress_;
 
@@ -240,6 +237,8 @@ private:
 
        /// We don't own this
        static lyx::Converter const * pconverter_;
+
+       Trackable trackable_;
 };
 
 
@@ -297,7 +296,7 @@ void PreviewLoader::refreshPreviews()
 }
 
 
-boost::signals2::connection PreviewLoader::connect(slot_type const & slot) const
+signals2::connection PreviewLoader::connect(slot const & slot) const
 {
        return pimpl_->imageReady.connect(slot);
 }
@@ -378,7 +377,7 @@ void InProgress::stop() const
        }
 }
 
-} // namespace anon
+} // namespace
 
 
 namespace lyx {
@@ -506,7 +505,7 @@ private:
        string const snippet_;
 };
 
-} // namespace anon
+} // namespace
 
 PreviewLoader::Status
 PreviewLoader::Impl::status(string const & latex_snippet) const
@@ -568,7 +567,7 @@ private:
        string const & snippet_;
 };
 
-} // namespace anon
+} // namespace
 
 
 void PreviewLoader::Impl::remove(string const & latex_snippet)
@@ -708,12 +707,12 @@ void PreviewLoader::Impl::startLoading(bool wait)
           << " " << quoteName(latexfile.toFilesystemEncoding())
           << " --dpi " << font_scaling_factor_;
 
-       // FIXME XHTML 
+       // FIXME XHTML
        // The colors should be customizable.
        if (!buffer_.isExporting()) {
                ColorCode const fg = PreviewLoader::foregroundColor();
                ColorCode const bg = PreviewLoader::backgroundColor();
-               cs << " --fg " << theApp()->hexName(fg) 
+               cs << " --fg " << theApp()->hexName(fg)
                   << " --bg " << theApp()->hexName(bg);
        }
 
@@ -727,7 +726,8 @@ void PreviewLoader::Impl::startLoading(bool wait)
        if (wait) {
                ForkedCall call(buffer_.filePath(), buffer_.layoutPos());
                int ret = call.startScript(ForkedProcess::Wait, command);
-               static atomic_int fake((2^20) + 1);
+               // PID_MAX_LIMIT is 2^22 so we start one after that
+               static atomic_int fake((1 << 22) + 1);
                int pid = fake++;
                inprogress.pid = pid;
                inprogress.command = command;
@@ -737,9 +737,10 @@ void PreviewLoader::Impl::startLoading(bool wait)
        }
 
        // Initiate the conversion from LaTeX to bitmap images files.
-       ForkedCall::SignalTypePtr
-               convert_ptr(new ForkedCall::SignalType);
-       convert_ptr->connect(bind(&Impl::finishedGenerating, this, _1, _2));
+       ForkedCall::sigPtr convert_ptr = make_shared<ForkedCall::sig>();
+       convert_ptr->connect(ForkedProcess::slot([this](pid_t pid, int retval){
+                               finishedGenerating(pid, retval);
+                       }).track_foreign(trackable_.p()));
 
        ForkedCall call(buffer_.filePath());
        int ret = call.startScript(command, convert_ptr);