X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverterCache.cpp;h=2373b84d2fb06f2fe1ea6ef781aac02fbdef97bc;hb=98621be1ba2a00a931e89020a164b4b8b54c597f;hp=1451f6e714f6b3cd7356d26c3fe744d6dd3e2afd;hpb=065db6806771190d12d37d64c4c86f9c5ebaf225;p=lyx.git

diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp
index 1451f6e714..2373b84d2f 100644
--- a/src/ConverterCache.cpp
+++ b/src/ConverterCache.cpp
@@ -56,7 +56,7 @@ static FileName cache_dir;
 
 class CacheItem {
 public:
-	CacheItem() {}
+	CacheItem() : timestamp(0), checksum(0) {}
 	CacheItem(FileName const & orig_from, string const & to_format,
 		  time_t t, unsigned long c)
 		: timestamp(t), checksum(c)
@@ -76,7 +76,7 @@ public:
 	unsigned long checksum;
 };
 
-}
+} // namespace
 
 
 /** The cache contains one item per orig file and target format, so use a
@@ -159,7 +159,11 @@ void ConverterCache::Impl::readIndex()
 		FormatCache & format_cache = cache[orig_from_name];
 		if (format_cache.from_format.empty())
 			format_cache.from_format =
-				formats.getFormatFromFile(orig_from_name);
+				// FIXME perf: This very expensive function is called on all
+				// cached files on opening. This slows LyX startup a lot. It
+				// would be better if this information was retrieved in a
+				// delayed fashion.
+				theFormats().getFormatFromFile(orig_from_name);
 		format_cache.cache[to_format] = item;
 	}
 	is.close();
@@ -250,7 +254,7 @@ void ConverterCache::init()
 
 void ConverterCache::writeIndex() const
 {
-	if (!lyxrc.use_converter_cache 
+	if (!lyxrc.use_converter_cache
 		  || cache_dir.empty())
 		return;
 	pimpl_->writeIndex();
@@ -316,7 +320,7 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format,
 			FormatCache & format_cache = pimpl_->cache[orig_from];
 			if (format_cache.from_format.empty())
 				format_cache.from_format =
-					formats.getFormatFromFile(orig_from);
+					theFormats().getFormatFromFile(orig_from);
 			format_cache.cache[to_format] = new_item;
 		} else
 			LYXERR(Debug::FILES, "ConverterCache::add(" << orig_from << "):\n"