Fix up the InsetMathGrid output: detect better if we have a table, and

[lyx.git] / src / ConverterCache.cpp

diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp
index d1d16c058c66db81336cbb8cbc952fe870cad8aa..56a39c775d76da772180919699623742d7a34c99 100644 (file)
--- a/src/ConverterCache.cpp
+++ b/src/ConverterCache.cpp
@@ -22,11 +22,10 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/filetools.h"
-#include "support/lyxlib.h"
 #include "support/lyxtime.h"
 #include "support/Package.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 #include <boost/crc.hpp>
 
 #include <algorithm>
@@ -108,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))
@@ -169,7 +168,7 @@ void ConverterCache::Impl::writeIndex()
        FileName const index(addName(cache_dir.absFilename(), "index"));
        ofstream os(index.toFilesystemEncoding().c_str());
        os.close();
-       if (!chmod(index, 0600))
+       if (!index.changePermission(0600))
                return;
        os.open(index.toFilesystemEncoding().c_str());
        CacheType::iterator it1 = cache.begin();
@@ -217,9 +216,6 @@ ConverterCache::ConverterCache()
 
 ConverterCache::~ConverterCache()
 {
-       if (!lyxrc.use_converter_cache)
-               return;
-       pimpl_->writeIndex();
        delete pimpl_;
 }
 
@@ -240,7 +236,7 @@ void ConverterCache::init()
        // initialized after all static variables.
        cache_dir = FileName(addName(package().user_support().absFilename(), "cache"));
        if (!cache_dir.exists())
-               if (support::mkdir(cache_dir, 0700) != 0) {
+               if (!cache_dir.createDirectory(0700)) {
                        lyxerr << "Could not create cache directory `"
                               << cache_dir << "'." << endl;
                        exit(EXIT_FAILURE);
@@ -249,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
 {
@@ -410,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;
 }
 
@@ -434,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()));