X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverterCache.cpp;h=56a39c775d76da772180919699623742d7a34c99;hb=14001c49fe0fb3d95a0f69f63344e7ae59d28180;hp=972746df162fb6a433f12a3d7fe0bd05080e88b0;hpb=2012beb58e62d04b9c2fc2bc0bc3d60fa095e03e;p=lyx.git

diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp
index 972746df16..56a39c775d 100644
--- a/src/ConverterCache.cpp
+++ b/src/ConverterCache.cpp
@@ -25,7 +25,7 @@
 #include "support/lyxtime.h"
 #include "support/Package.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 #include <boost/crc.hpp>
 
 #include <algorithm>
@@ -107,7 +107,7 @@ void ConverterCache::Impl::readIndex()
 	time_t const now = current_time();
 	FileName const index(addName(cache_dir.absFilename(), "index"));
 	ifstream is(index.toFilesystemEncoding().c_str());
-	Lexer lex(0, 0);
+	Lexer lex;
 	lex.setStream(is);
 	while (lex.isOK()) {
 		if (!lex.next(true))
@@ -216,9 +216,6 @@ ConverterCache::ConverterCache()
 
 ConverterCache::~ConverterCache()
 {
-	if (!lyxrc.use_converter_cache)
-		return;
-	pimpl_->writeIndex();
 	delete pimpl_;
 }
 
@@ -248,6 +245,12 @@ void ConverterCache::init()
 }
 
 
+void ConverterCache::writeIndex() const
+{
+	pimpl_->writeIndex();
+}
+
+
 void ConverterCache::add(FileName const & orig_from, string const & to_format,
 		FileName const & converted_file) const
 {
@@ -409,7 +412,7 @@ FileName const & ConverterCache::cacheName(FileName const & orig_from,
 	LYXERR(Debug::FILES, orig_from << ' ' << to_format);
 
 	CacheItem * const item = pimpl_->find(orig_from, to_format);
-	BOOST_ASSERT(item);
+	LASSERT(item, /**/);
 	return item->cache_name;
 }
 
@@ -433,7 +436,7 @@ bool ConverterCache::copy(FileName const & orig_from, string const & to_format,
 	}
 
 	CacheItem * const item = pimpl_->find(orig_from, to_format);
-	BOOST_ASSERT(item);
+	LASSERT(item, /**/);
 	Mover const & mover = getMover(to_format);
 	return mover.copy(item->cache_name, dest,
 	                  onlyFilename(dest.absFilename()));