remove more forms.h cruft

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

diff --git a/src/graphics/GraphicsCache.h b/src/graphics/GraphicsCache.h
index 847eedc7893265dde8ba4d78f9e2f988c54d31a9..9272e58e490cd09b2033d359e8132afdb4da4244 100644 (file)
--- a/src/graphics/GraphicsCache.h
+++ b/src/graphics/GraphicsCache.h
@@ -4,7 +4,7 @@
  * 
  *          LyX, The Document Processor
  *          Copyright 1995 Matthias Ettrich.
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  *          This file Copyright 2000 Baruch Even
  * ================================================= */
@@ -20,7 +20,10 @@
 
 #include "LString.h"
 #include "GraphicsCacheItem.h"
-#include "support/utility.hpp"
+#include <boost/utility.hpp>
+#include <boost/smart_ptr.hpp>
+
+class GraphicsCacheItem;
 
 /** GraphicsCache is the manager of the image cache.
     It is responsible of create the GraphicsCacheItem's and maintain them.
@@ -28,34 +31,33 @@
     GraphicsCache is a singleton class, there should be only one instance of
     it at any moment.
 */
-class GraphicsCache : public noncopyable {
+class GraphicsCache : boost::noncopyable {
 public:
-    /// Get the instance of the class.
-    static GraphicsCache * getInstance();
+       /// Get the instance of the class.
+       static GraphicsCache & getInstance();
+       /// Public destructor due to compiler warnings.
+       ~GraphicsCache();
+
+       typedef boost::shared_ptr<GraphicsCacheItem> shared_ptr_item;
 
-    /// Add a file to the cache.
-    GraphicsCacheItem * addFile(string const & filename);
+       /// Add a file to the cache.
+       shared_ptr_item addFile(string const & filename);
 
 private:
-    /// Remove a cache item if it's count has gone to zero.
-    void removeFile(string const & filename);
-    
-    /// Private c-tor so we can control how many objects are instantiated.
-    GraphicsCache() {}
-
-    /// Private d-tor so that no-one will destroy us.
-    ~GraphicsCache();
-
-    /// Holder of the single instance of the class.
-    static GraphicsCache * singleton;
-    ///
-    typedef std::map<string, GraphicsCacheItem *> CacheType;
-    ///
-    CacheType cache;
-
-       // We need this so that an Item can tell the cache that it should be
-       // deleted. (to call removeFile).
-       // It also helps removing a warning gcc emits.
+       /// Remove a cache item if it's count has gone to zero.
+       void removeFile(string const & filename);
+       
+       /// Private c-tor so we can control how many objects are instantiated.
+       GraphicsCache() {}
+       
+       ///
+       typedef std::map<string, shared_ptr_item> CacheType;
+       ///
+       CacheType cache;
+       
+       /** We need this so that an Item can tell the cache that it should be
+           deleted. (to call removeFile).
+           It also helps removing a warning gcc emits. */
        friend class GraphicsCacheItem;
 };
 #endif