Remove all uses of Q_WS_* macros

[lyx.git] / src / Mover.cpp

diff --git a/src/Mover.cpp b/src/Mover.cpp
index bf089be2947036e2b6590bd9fb05312ae83bbab9..16d225bfa700333441fa647aace9c3872aa27eb8 100644 (file)
--- a/src/Mover.cpp
+++ b/src/Mover.cpp
@@ -12,9 +12,9 @@
 
 #include "Mover.h"
 
+#include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
 #include "support/Systemcall.h"
 
 #include <fstream>
@@ -26,53 +26,44 @@ using namespace lyx::support;
 namespace lyx {
 
 
-bool Mover::copy(FileName const & from, FileName const & to,
-                unsigned long int mode) const
+bool Mover::copy(FileName const & from, FileName const & to) const
 {
-       return do_copy(from, to, to.absFilename(), mode);
+       return do_copy(from, to, to.absFileName());
 }
 
 
 bool Mover::do_copy(FileName const & from, FileName const & to,
-                   string const &, unsigned long int mode) const
+                   string const &) const
 {
-       return support::copy(from, to, mode);
+       return from.copyTo(to);
 }
 
 
 bool Mover::rename(FileName const & from,
                   FileName const & to) const
 {
-       return do_rename(from, to, to.absFilename());
+       return do_rename(from, to, to.absFileName());
 }
 
 
 bool Mover::do_rename(FileName const & from, FileName const & to,
                      string const &) const
 {
-       return rename(from, to);
+       return from.moveTo(to);
 }
 
 
 bool SpecialisedMover::do_copy(FileName const & from, FileName const & to,
-                              string const & latex, unsigned long int mode) const
+                              string const & latex) const
 {
        if (command_.empty())
-               return Mover::do_copy(from, to, latex, mode);
-
-       if (mode != (unsigned long int)-1) {
-               ofstream ofs(to.toFilesystemEncoding().c_str(), ios::binary | ios::out | ios::trunc);
-               if (!ofs)
-                       return false;
-               ofs.close();
-               if (!chmod(to, mode))
-                       return false;
-       }
-
-       string command = libScriptSearch(command_);
+               return Mover::do_copy(from, to, latex);
+
+       string command = command_;
        command = subst(command, "$$i", quoteName(from.toFilesystemEncoding()));
        command = subst(command, "$$o", quoteName(to.toFilesystemEncoding()));
        command = subst(command, "$$l", quoteName(latex));
+       command = subst(command, "$${python}", os::python());
 
        Systemcall one;
        return one.startscript(Systemcall::Wait, command) == 0;
@@ -85,7 +76,7 @@ bool SpecialisedMover::do_rename(FileName const & from, FileName const & to,
        if (command_.empty())
                return Mover::do_rename(from, to, latex);
 
-       if (!do_copy(from, to, latex, (unsigned long int)-1))
+       if (!do_copy(from, to, latex))
                return false;
        return from.removeFile();
 }