* src/LaTeX.C

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

diff --git a/src/graphics/GraphicsCache.C b/src/graphics/GraphicsCache.C
index a220462f543ea86f7c89efccd78a16f5be78ded9..7201c7bfbfb6295429ae6f6b503b2273b7d2b572 100644 (file)
--- a/src/graphics/GraphicsCache.C
+++ b/src/graphics/GraphicsCache.C
@@ -19,21 +19,24 @@
 
 #include "support/filetools.h"
 
-#include "frontends/lyx_gui.h"
-
 #include <map>
 
-namespace support = lyx::support;
+using std::string;
+
 
 namespace lyx {
+
+using support::FileName;
+
 namespace graphics {
 
 /** The cache contains one item per file, so use a map to find the
  *  cache item quickly by filename.
  */
-typedef std::map<string, Cache::ItemPtr> CacheType;
+typedef std::map<FileName, Cache::ItemPtr> CacheType;
 
-struct Cache::Impl {
+class Cache::Impl {
+public:
        ///
        CacheType cache;
 };
@@ -48,7 +51,7 @@ Cache & Cache::get()
 
 
 Cache::Cache()
-       : pimpl_(new Impl())
+       : pimpl_(new Impl)
 {}
 
 
@@ -62,15 +65,8 @@ std::vector<string> Cache::loadableFormats() const
 }
 
 
-void Cache::add(string const & file) const
+void Cache::add(FileName const & file) const
 {
-       if (!support::AbsolutePath(file)) {
-               lyxerr << "Cache::add(" << file << "):\n"
-                      << "The file must be have an absolute path."
-                      << std::endl;
-               return;
-       }
-
        // Is the file in the cache already?
        if (inCache(file)) {
                lyxerr[Debug::GRAPHICS] << "Cache::add(" << file << "):\n"
@@ -83,7 +79,7 @@ void Cache::add(string const & file) const
 }
 
 
-void Cache::remove(string const & file) const
+void Cache::remove(FileName const & file) const
 {
        CacheType::iterator it = pimpl_->cache.find(file);
        if (it == pimpl_->cache.end())
@@ -99,13 +95,13 @@ void Cache::remove(string const & file) const
 }
 
 
-bool Cache::inCache(string const & file) const
+bool Cache::inCache(FileName const & file) const
 {
        return pimpl_->cache.find(file) != pimpl_->cache.end();
 }
 
 
-Cache::ItemPtr const Cache::item(string const & file) const
+Cache::ItemPtr const Cache::item(FileName const & file) const
 {
        CacheType::const_iterator it = pimpl_->cache.find(file);
        if (it == pimpl_->cache.end())