Introduce FileName::changePermission() and fix ConverterCache.

[lyx.git] / src / support / rename.cpp

diff --git a/src/support/rename.cpp b/src/support/rename.cpp
index 45b1b45e861d339d77c4352fc14ae8a5cee69fc9..9a18e58a2dfed3230a29ee215dd90e9ca6ee310b 100644 (file)
--- a/src/support/rename.cpp
+++ b/src/support/rename.cpp
@@ -19,18 +19,14 @@
 namespace lyx {
 namespace support {
 
-
-using std::string;
-
-
 bool rename(FileName const & from, FileName const & to)
 {
-       if (::rename(from.toFilesystemEncoding().c_str(), to.toFilesystemEncoding().c_str()) == -1)
-               if (copy(from, to)) {
-                       unlink(from);
-                       return true;
-               } else
-                       return false;
+       if (::rename(from.toFilesystemEncoding().c_str(),
+                       to.toFilesystemEncoding().c_str()) != -1) 
+               return true;
+       if (!copy(from, to))
+               return false;
+       from.removeFile();
        return true;
 }