]> git.lyx.org Git - lyx.git/blobdiff - src/Mover.cpp
prepare Qt 5.6 builds
[lyx.git] / src / Mover.cpp
index 990a550cb690083d7be1336274c10ba9697a3fd6..a901d98b0fa8fd025f13d26d4b1a93bfb412b5a5 100644 (file)
@@ -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>
@@ -28,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());
 }
 
 
@@ -42,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());
 }
 
 
@@ -59,7 +59,7 @@ 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));