* src/insets/InsetNote.h:

[lyx.git] / src / ConverterCache.cpp

diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp
index 41785be3eed822faff41d18e281cedde74468481..972746df162fb6a433f12a3d7fe0bd05080e88b0 100644 (file)
--- a/src/ConverterCache.cpp
+++ b/src/ConverterCache.cpp
@@ -22,7 +22,6 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/filetools.h"
-#include "support/lyxlib.h"
 #include "support/lyxtime.h"
 #include "support/Package.h"
 
@@ -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();
@@ -240,7 +239,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,21 +248,6 @@ void ConverterCache::init()
 }
 
 
-static bool changeMode(FileName const & fname, unsigned long int mode)
-{
-       if (mode == (unsigned long int)-1)
-               return true;
-
-       ofstream ofs(fname.toFilesystemEncoding().c_str(), ios::binary | ios::out | ios::trunc);
-       if (!ofs)
-               return false;
-       ofs.close();
-       if (!chmod(fname, mode))
-               return false;
-       return true;
-}
-
-
 void ConverterCache::add(FileName const & orig_from, string const & to_format,
                FileName const & converted_file) const
 {
@@ -307,7 +291,7 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format,
                              onlyFilename(item->cache_name.absFilename()))) {
                        LYXERR(Debug::FILES, "Could not copy file " << orig_from << " to "
                                << item->cache_name);
-               } else if (!changeMode(item->cache_name, 0600)) {
+               } else if (!item->cache_name.changePermission(0600)) {
                        LYXERR(Debug::FILES, "Could not change file mode"
                                << item->cache_name);
                }
@@ -316,9 +300,9 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format,
                                orig_from.checksum());
                if (mover.copy(converted_file, new_item.cache_name,
                              onlyFilename(new_item.cache_name.absFilename()))) {
-                       if (!changeMode(new_item.cache_name, 0600)) {
+                       if (!new_item.cache_name.changePermission(0600)) {
                                LYXERR(Debug::FILES, "Could not change file mode"
-                                       << item->cache_name);
+                                       << new_item.cache_name);
                        }
                        FormatCache & format_cache = pimpl_->cache[orig_from];
                        if (format_cache.from_format.empty())