Remove obsolete (and false) comment.

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

diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp
index 617ce24fd0ae907c2bb15cdd6bbd93c084063238..c38761c85b7d8b95a693b3e95e205c8d17990369 100644 (file)
--- a/src/graphics/GraphicsLoader.cpp
+++ b/src/graphics/GraphicsLoader.cpp
@@ -107,16 +107,17 @@ void LoaderQueue::loadNext()
 
 
 LoaderQueue::LoaderQueue() : timer(s_millisecs_, Timeout::ONETIME),
-                            running_(false)
+                             running_(false)
 {
-       timer.timeout.connect(bind(&LoaderQueue::loadNext, this));
+       // Disconnected when this is destroyed
+       timer.timeout.connect([this](){ loadNext(); });
 }
 
 
 void LoaderQueue::startLoader()
 {
        LYXERR(Debug::GRAPHICS, "LoaderQueue: waking up");
-       running_ = true ;
+       running_ = true;
        timer.setTimeout(s_millisecs_);
        timer.start();
 }
@@ -163,7 +164,7 @@ void LoaderQueue::touch(Cache::ItemPtr const & item)
 
 typedef std::shared_ptr<Image> ImagePtr;
 
-class Loader::Impl : public boost::signals2::trackable {
+class Loader::Impl {
        friend class Loader;
 public:
        ///
@@ -192,9 +193,9 @@ public:
        /// We modify a local copy of the image once it is loaded.
        ImagePtr image_;
        /// This signal is emitted when the image loading status changes.
-       boost::signals2::signal<void()> signal_;
-       /// The connection of the signal StatusChanged  
-       boost::signals2::connection sc_;
+       signals2::signal<void()> signal_;
+       /// The connection of the signal statusChanged
+       signals2::scoped_connection connection_;
 
        double displayPixelRatio() const
        {
@@ -298,13 +299,14 @@ void Loader::reset(Params const & params) const
 
 void Loader::startLoading() const
 {
-       if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_)
+       if (pimpl_->status_ != WaitingToLoad || !pimpl_->cached_item_
+           || pimpl_->cached_item_->status() == Converting)
                return;
        pimpl_->startLoading();
 }
 
 
-void Loader::reload() const 
+void Loader::reload() const
 {
        pimpl_->cached_item_->startLoading();
 }
@@ -328,6 +330,15 @@ bool Loader::monitoring() const
 }
 
 
+void Loader::checkModifiedAsync() const
+{
+       if (!pimpl_->cached_item_)
+               return;
+
+       pimpl_->cached_item_->checkModifiedAsync();
+}
+
+
 FileName const & Loader::filename() const
 {
        static FileName const empty;
@@ -354,7 +365,7 @@ void Loader::setDisplayPixelRatio(double scale)
 }
 
 
-boost::signals2::connection Loader::connect(slot_type const & slot) const
+signals2::connection Loader::connect(slot const & slot) const
 {
        return pimpl_->signal_.connect(slot);
 }
@@ -394,7 +405,12 @@ void Loader::Impl::resetFile(FileName const & file)
                continue_monitoring = cached_item_->monitoring();
                // cached_item_ is going to be reset, so the connected
                // signal needs to be disconnected.
-               sc_.disconnect();
+               try {
+                       // This can in theory throw a BufferException
+                       connection_.disconnect();
+               } catch (...) {
+                       LYXERR(Debug::GRAPHICS, "Unable to disconnect signal.");
+               }
                cached_item_.reset();
                if (status_ != Converting) {
                        Cache::get().remove(old_file);
@@ -420,7 +436,8 @@ void Loader::Impl::resetFile(FileName const & file)
        if (continue_monitoring && !cached_item_->monitoring())
                cached_item_->startMonitoring();
 
-       sc_ = cached_item_->connect(bind(&Impl::statusChanged, this));
+       // This is a scoped connection
+       connection_ = cached_item_->connect([this](){ statusChanged(); });
 }