X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverterCache.cpp;h=bee02536524e2d13de84a30d9ea25b7f691d7bfe;hb=1bd49f9c39b103b2d8bbe079bc603cfa47509ae5;hp=7590336411548428ea2f8020ecd85026a49af5bb;hpb=0a8b7f6a5740f4b4f976eb308841ad3b98166015;p=lyx.git

diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp
index 7590336411..bee0253652 100644
--- a/src/ConverterCache.cpp
+++ b/src/ConverterCache.cpp
@@ -76,7 +76,7 @@ public:
 	unsigned long checksum;
 };
 
-}
+} // namespace
 
 
 /** The cache contains one item per orig file and target format, so use a
@@ -163,7 +163,7 @@ void ConverterCache::Impl::readIndex()
 				// cached files on opening. This slows LyX startup a lot. It
 				// would be better if this information was retrieved in a
 				// delayed fashion.
-				formats.getFormatFromFile(orig_from_name);
+				theFormats().getFormatFromFile(orig_from_name);
 		format_cache.cache[to_format] = item;
 	}
 	is.close();
@@ -198,14 +198,14 @@ CacheItem * ConverterCache::Impl::find(FileName const & from,
 		string const & format)
 {
 	if (!lyxrc.use_converter_cache)
-		return 0;
+		return nullptr;
 	CacheType::iterator const it1 = cache.find(from);
 	if (it1 == cache.end())
-		return 0;
+		return nullptr;
 	FormatCacheType & format_cache = it1->second.cache;
 	FormatCacheType::iterator const it2 = format_cache.find(format);
 	if (it2 == format_cache.end())
-		return 0;
+		return nullptr;
 	return &(it2->second);
 }
 
@@ -244,6 +244,8 @@ void ConverterCache::init()
 	cache_dir = FileName(addName(package().user_support().absFileName(), "cache"));
 	if (!cache_dir.exists())
 		if (!cache_dir.createDirectory(0700)) {
+			// FIXME This should really be displayed as a message. But the GUI
+			// does not exist yet.
 			lyxerr << "Could not create cache directory `"
 			       << cache_dir << "'." << endl;
 			exit(EXIT_FAILURE);
@@ -254,7 +256,7 @@ void ConverterCache::init()
 
 void ConverterCache::writeIndex() const
 {
-	if (!lyxrc.use_converter_cache 
+	if (!lyxrc.use_converter_cache
 		  || cache_dir.empty())
 		return;
 	pimpl_->writeIndex();
@@ -320,7 +322,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"