#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>
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))
// initialized after all static variables.
cache_dir = FileName(addName(package().user_support().absFilename(), "cache"));
if (!cache_dir.exists())
- if (!cache_dir.createDirectory(0700) != 0) {
+ if (!cache_dir.createDirectory(0700)) {
lyxerr << "Could not create cache directory `"
<< cache_dir << "'." << endl;
exit(EXIT_FAILURE);
return;
}
item->checksum = checksum;
- if (!mover.copy(converted_file, item->cache_name,
- onlyFilename(item->cache_name.absFilename()))) {
+ if (!mover.copy(converted_file, item->cache_name)) {
LYXERR(Debug::FILES, "Could not copy file " << orig_from << " to "
<< item->cache_name);
} else if (!item->cache_name.changePermission(0600)) {
} else {
CacheItem new_item(orig_from, to_format, timestamp,
orig_from.checksum());
- if (mover.copy(converted_file, new_item.cache_name,
- onlyFilename(new_item.cache_name.absFilename()))) {
+ if (mover.copy(converted_file, new_item.cache_name)) {
if (!new_item.cache_name.changePermission(0600)) {
LYXERR(Debug::FILES, "Could not change file mode"
<< new_item.cache_name);
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;
}
}
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()));
+ return mover.copy(item->cache_name, dest);
}
} // namespace lyx