Properly track the lifetime of signals2::slots (#8261)

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

diff --git a/src/graphics/GraphicsCache.h b/src/graphics/GraphicsCache.h
index f0ea832f3d2d2311f8effb5ca84e352122e94122..0fd1dd0102a1945eb990c32140f79d7a4c2a2018 100644 (file)
--- a/src/graphics/GraphicsCache.h
+++ b/src/graphics/GraphicsCache.h
@@ -20,9 +20,9 @@
 #ifndef GRAPHICSCACHE_H
 #define GRAPHICSCACHE_H
 
-#include <tr1/memory>
-#include <vector>
+#include <memory>
 #include <string>
+#include <vector>
 
 
 namespace lyx {
@@ -33,8 +33,7 @@ namespace graphics {
 
 class CacheItem;
 
-class Cache
-{
+class Cache {
 public:
 
        /// This is a singleton class. Get the instance.
@@ -47,7 +46,7 @@ public:
        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;
@@ -59,13 +58,13 @@ 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 tr1::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 std::tr1::shared_ptr<CacheItem> ItemPtr;
+       typedef std::shared_ptr<CacheItem> ItemPtr;
        ///
        ItemPtr const item(support::FileName const & file) const;