Remove all uses of Q_WS_* macros

[lyx.git] / src / Mover.cpp

diff --git a/src/Mover.cpp b/src/Mover.cpp
index 9f1f0a06a12d5cc2b363f2a5302eb11c63283f77..16d225bfa700333441fa647aace9c3872aa27eb8 100644 (file)
--- a/src/Mover.cpp
+++ b/src/Mover.cpp
@@ -12,6 +12,7 @@
 
 #include "Mover.h"
 
+#include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/Systemcall.h"
@@ -27,7 +28,7 @@ namespace lyx {
 
 bool Mover::copy(FileName const & from, FileName const & to) const
 {
-       return do_copy(from, to, to.absFilename());
+       return do_copy(from, to, to.absFileName());
 }
 
 
@@ -41,7 +42,7 @@ bool Mover::do_copy(FileName const & from, FileName const & 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());
 }
 
 
@@ -58,10 +59,11 @@ bool SpecialisedMover::do_copy(FileName const & from, FileName const & to,
        if (command_.empty())
                return Mover::do_copy(from, to, latex);
 
-       string command = libScriptSearch(command_);
+       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;