Remove unnecessary `c_str`

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

diff --git a/src/graphics/GraphicsCache.cpp b/src/graphics/GraphicsCache.cpp
index 740ca053ce564c3e775f83cc664f2fbc457dc00f..bf1b3fceff8476590772c89246ec0d1625576b4f 100644 (file)
--- a/src/graphics/GraphicsCache.cpp
+++ b/src/graphics/GraphicsCache.cpp
@@ -13,27 +13,27 @@
 
 #include "GraphicsCache.h"
 #include "GraphicsCacheItem.h"
-#include "GraphicsImage.h"
 
-#include "debug.h"
+#include "Format.h"
 
-#include "support/filetools.h"
+#include "frontends/Application.h"
 
-#include <map>
+#include "support/debug.h"
+#include "support/FileName.h"
 
-using std::string;
+#include <map>
 
+using namespace std;
+using namespace lyx::support;
 
 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<FileName, Cache::ItemPtr> CacheType;
+typedef map<FileName, Cache::ItemPtr> CacheType;
 
 class Cache::Impl {
 public:
@@ -61,13 +61,34 @@ Cache::~Cache()
 }
 
 
-std::vector<string> Cache::loadableFormats() const
+vector<string> const & Cache::loadableFormats() const
 {
-       return Image::loadableFormats();
+       static vector<string> fmts;
+
+       if (!fmts.empty())
+               return fmts;
+
+       for (string const & native_extension : frontend::loadableImageFormats()) {
+               for (Format const & format : theFormats()) {
+                       if (format.extension() == native_extension) {
+                               fmts.push_back(format.name());
+                               break;
+                       }
+               }
+       }
+
+       if (lyxerr.debugging()) {
+               LYXERR(Debug::GRAPHICS, "LyX recognises the following image formats:");
+               for (string const & format : fmts) {
+                       LYXERR(Debug::GRAPHICS, format << ',');
+               }
+       }
+
+       return fmts;
 }
 
 
-void Cache::add(FileName const & file) const
+void Cache::add(FileName const & file, FileName const & doc_file) const
 {
        // Is the file in the cache already?
        if (inCache(file)) {
@@ -76,7 +97,7 @@ void Cache::add(FileName const & file) const
                return;
        }
 
-       pimpl_->cache[file] = ItemPtr(new CacheItem(file));
+       pimpl_->cache[file] = ItemPtr(new CacheItem(file, doc_file));
 }