X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMover.cpp;h=a901d98b0fa8fd025f13d26d4b1a93bfb412b5a5;hb=8663a371f31dc7bb888071c15a0b2cd4c3669c60;hp=055c293f1615ba144ded1cad5d5f385622e5c5c2;hpb=4dc976497f7c384b2e399662ae6a9b19bc98d978;p=lyx.git diff --git a/src/Mover.cpp b/src/Mover.cpp index 055c293f16..a901d98b0f 100644 --- a/src/Mover.cpp +++ b/src/Mover.cpp @@ -27,6 +27,13 @@ namespace lyx { bool Mover::copy(FileName const & from, FileName const & to) const +{ + return do_copy(from, to, to.absFileName()); +} + + +bool Mover::do_copy(FileName const & from, FileName const & to, + string const &) const { return from.copyTo(to); } @@ -35,7 +42,7 @@ bool Mover::copy(FileName const & from, FileName const & to) const bool Mover::rename(FileName const & from, FileName const & to) const { - return do_rename(from, to, to.absFilename()); + return do_rename(from, to, to.absFileName()); } @@ -50,9 +57,9 @@ bool SpecialisedMover::do_copy(FileName const & from, FileName const & to, string const & latex) const { if (command_.empty()) - return Mover::copy(from, to); + 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));