X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FMover.cpp;h=a901d98b0fa8fd025f13d26d4b1a93bfb412b5a5;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=28f2ce950a9f25f32e832618f4a4d4b31eb4760a;hpb=d1574fec83fae4979fe31de1de163efb9bc1318a;p=lyx.git diff --git a/src/Mover.cpp b/src/Mover.cpp index 28f2ce950a..a901d98b0f 100644 --- 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 @@ -28,21 +28,21 @@ 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()); } bool Mover::do_copy(FileName const & from, FileName const & to, string const &) const { - return from.copyTo(to, true); + 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()); } @@ -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));