Add test-refstyle-references to cmake. Also added missing file test-refstyle-referenc...

[lyx.git] / src / ConverterCache.cpp

diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp
index 4cf1821df5f927761a640eeef8b142c7ca536ca6..61df9d062dbb8e136d1154cb7b2e4d592c264100 100644 (file)
--- a/src/ConverterCache.cpp
+++ b/src/ConverterCache.cpp
@@ -54,7 +54,8 @@ static FileName cache_dir;
 
 class CacheItem {
 public:
-       CacheItem() {}
+       CacheItem()
+       {}
        CacheItem(FileName const & orig_from, string const & to_format,
                  time_t t, unsigned long c)
                : timestamp(t), checksum(c)
@@ -67,7 +68,8 @@ public:
                                     << ' ' << to_format << ' ' << cache_name
                                     << ' ' << long(timestamp) << ' ' << checksum << '.');
        }
-       ~CacheItem() {}
+       ~CacheItem()
+       {}
        FileName cache_name;
        time_t timestamp;
        unsigned long checksum;
@@ -294,7 +296,7 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format,
                }
                item->checksum = checksum;
                if (!mover.copy(converted_file, item->cache_name,
-                             onlyFilename(item->cache_name.absFileName()))) {
+                             onlyFileName(item->cache_name.absFileName()))) {
                        LYXERR(Debug::FILES, "Could not copy file " << orig_from << " to "
                                << item->cache_name);
                } else if (!item->cache_name.changePermission(0600)) {
@@ -305,7 +307,7 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format,
                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()))) {
+                             onlyFileName(new_item.cache_name.absFileName()))) {
                        if (!new_item.cache_name.changePermission(0600)) {
                                LYXERR(Debug::FILES, "Could not change file mode"
                                        << new_item.cache_name);
@@ -442,7 +444,7 @@ bool ConverterCache::copy(FileName const & orig_from, string const & to_format,
        LASSERT(item, /**/);
        Mover const & mover = getMover(to_format);
        return mover.copy(item->cache_name, dest,
-                         onlyFilename(dest.absFileName()));
+                         onlyFileName(dest.absFileName()));
 }
 
 } // namespace lyx