X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsCache.h;h=0fd1dd0102a1945eb990c32140f79d7a4c2a2018;hb=48a065e89effb4029c779328498f62f751c4b12d;hp=478e7a83e8c688110e6481354568895f572aee6e;hpb=8e6e970d7ba017dba14bdb821f4c4489665d947c;p=lyx.git

diff --git a/src/graphics/GraphicsCache.h b/src/graphics/GraphicsCache.h
index 478e7a83e8..0fd1dd0102 100644
--- a/src/graphics/GraphicsCache.h
+++ b/src/graphics/GraphicsCache.h
@@ -20,12 +20,9 @@
 #ifndef GRAPHICSCACHE_H
 #define GRAPHICSCACHE_H
 
-#include <boost/utility.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-
-#include <vector>
+#include <memory>
 #include <string>
+#include <vector>
 
 
 namespace lyx {
@@ -36,7 +33,7 @@ namespace graphics {
 
 class CacheItem;
 
-class Cache : boost::noncopyable {
+class Cache {
 public:
 
 	/// This is a singleton class. Get the instance.
@@ -46,10 +43,10 @@ public:
 	 *  Other formats can be loaded if a converter to a loadable format
 	 *  can be defined.
 	 */
-	std::vector<std::string> loadableFormats() const;
+	std::vector<std::string> const & loadableFormats() const;
 
 	/// Add a graphics file to the cache.
-	void add(support::FileName const & file) const;
+	void add(support::FileName const & file, support::FileName const & doc_file) const;
 
 	/// Remove a file from the cache.
 	void remove(support::FileName const & file) const;
@@ -61,17 +58,21 @@ public:
 	 *  Returns an empty container if there is no such item.
 	 *
 	 *  IMPORTANT: whatever uses an image must make a local copy of this
-	 *  ItemPtr. The boost::shared_ptr<>::use_count() function is
+	 *  ItemPtr. The shared_ptr<>::use_count() function is
 	 *  used to ascertain whether or not to remove the item from the cache
 	 *  when remove(file) is called.
 	 *
 	 *  You have been warned!
 	 */
-	typedef boost::shared_ptr<CacheItem> ItemPtr;
+	typedef std::shared_ptr<CacheItem> ItemPtr;
 	///
 	ItemPtr const item(support::FileName const & file) const;
 
 private:
+	/// noncopyable
+	Cache(Cache const &);
+	void operator=(Cache const &);
+
 	/** Make the c-tor, d-tor private so we can control how many objects
 	 *  are instantiated.
 	 */
@@ -82,7 +83,7 @@ private:
 	/// Use the Pimpl idiom to hide the internals.
 	class Impl;
 	/// The pointer never changes although *pimpl_'s contents may.
-	boost::scoped_ptr<Impl> const pimpl_;
+	Impl * const pimpl_;
 };
 
 } // namespace graphics