the AM_* flags patch

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

diff --git a/src/graphics/GraphicsCacheItem.h b/src/graphics/GraphicsCacheItem.h
index 7de2af16f01dcb1f54bc34597b7cb51e72b91f34..e55e3885e338833faea17d9070d4f2f06293b89c 100644 (file)
--- a/src/graphics/GraphicsCacheItem.h
+++ b/src/graphics/GraphicsCacheItem.h
@@ -32,9 +32,8 @@
 
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/signals/signal0.hpp>
+#include <boost/signal.hpp>
 
-#include "support/std_string.h"
 
 class InsetGraphics;
 
@@ -48,13 +47,13 @@ class Converter;
 class CacheItem : boost::noncopyable {
 public:
        ///
-       CacheItem(string const & file);
+       CacheItem(std::string const & file);
 
        /// Define an empty d-tor out-of-line to keep boost::scoped_ptr happy.
        ~CacheItem();
 
        ///
-       string const & filename() const;
+       std::string const & filename() const;
 
        /// It's in the cache. Now start the loading process.
        void startLoading() const;
@@ -85,7 +84,8 @@ public:
        /** Connect and you'll be informed when the loading status of the image
         *  changes.
         */
-       typedef boost::signal0<void>::slot_type slot_type;
+       typedef boost::signal<void()> sig_type;
+       typedef sig_type::slot_type slot_type;
        ///
        boost::signals::connection connect(slot_type const &) const;