Sync with master

[lyx.git] / src / graphics / GraphicsCacheItem.h

diff --git a/src/graphics/GraphicsCacheItem.h b/src/graphics/GraphicsCacheItem.h
index 6f7f968bc6a44086af831849470043faa4053c0e..a018b3931d7f871c0778eaa830a821d1326a4d53 100644 (file)
--- a/src/graphics/GraphicsCacheItem.h
+++ b/src/graphics/GraphicsCacheItem.h
@@ -40,7 +40,6 @@ namespace support { class FileName; }
 namespace graphics {
 
 class Image;
-class Converter;
 
 /// A graphics::Cache item holder.
 class CacheItem {
@@ -82,9 +81,9 @@ public:
        /** Connect and you'll be informed when the loading status of the image
         *  changes.
         */
-       typedef signals2::signal<void()>::slot_type slot_type;
+       typedef signal<void()>::slot_type slot_type;
        ///
-       signals2::connection connect(slot_type const &) const;
+       connection connect(slot_type const &) const;
 
 private:
        /// noncopyable