header cleanup.

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

diff --git a/src/graphics/GraphicsCacheItem.h b/src/graphics/GraphicsCacheItem.h
index bdc606966a131213ba1bba30d330006e19b878c2..298ef172fa1fa3b96d5be37ff21e7a9032df0602 100644 (file)
--- a/src/graphics/GraphicsCacheItem.h
+++ b/src/graphics/GraphicsCacheItem.h
@@ -7,7 +7,7 @@
  * \author Baruch Even
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
  * The graphics cache is a container of lyx::graphics::CacheItems.
  * Each lyx::graphics::CacheItem, defined here represents a separate image file.
@@ -29,15 +29,16 @@
 #define GRAPHICSCACHEITEM_H
 
 #include "GraphicsTypes.h"
-#include "LString.h"
 
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/signals/signal0.hpp>
+#include <boost/signal.hpp>
 
-class InsetGraphics;
 
 namespace lyx {
+
+namespace support { class FileName; }
+
 namespace graphics {
 
 class Image;
@@ -47,13 +48,13 @@ class Converter;
 class CacheItem : boost::noncopyable {
 public:
        ///
-       CacheItem(string const & file);
+       CacheItem(support::FileName const & file);
 
        /// Define an empty d-tor out-of-line to keep boost::scoped_ptr happy.
        ~CacheItem();
 
        ///
-       string const & filename() const;
+       support::FileName const & filename() const;
 
        /// It's in the cache. Now start the loading process.
        void startLoading() const;
@@ -84,7 +85,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;