Merge namespace signals2 into namespace lyx

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

diff --git a/src/graphics/GraphicsLoader.cpp b/src/graphics/GraphicsLoader.cpp
index f0a09340916f649b2df3e5fe75968d87aa59ab1a..b375c0ec38534e9fd9acd73c24b1e0fb6b2f6ef6 100644 (file)
--- a/src/graphics/GraphicsLoader.cpp
+++ b/src/graphics/GraphicsLoader.cpp
@@ -21,6 +21,7 @@
 #include "support/lassert.h"
 #include "support/Timeout.h"
 
+#include <list>
 #include <queue>
 #include <memory>
 #include <set>
@@ -191,9 +192,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.
-       signals2::signal<void()> signal_;
+       signal<void()> signal_;
        /// The connection of the signal statusChanged
-       signals2::scoped_connection connection_;
+       scoped_connection connection_;
 
        double displayPixelRatio() const
        {
@@ -363,7 +364,7 @@ void Loader::setDisplayPixelRatio(double scale)
 }
 
 
-signals2::connection Loader::connect(slot const & slot) const
+connection Loader::connect(slot const & slot) const
 {
        return pimpl_->signal_.connect(slot);
 }