X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMover.cpp;h=a901d98b0fa8fd025f13d26d4b1a93bfb412b5a5;hb=890fb133b1b2349588705d32fe0c9b95eb50503a;hp=bdcf4e04bbf6afa394cd6faf00c0c80a2aa7249d;hpb=01865146313ef24a9d36ee39d1212655bfed637b;p=lyx.git

diff --git a/src/Mover.cpp b/src/Mover.cpp
index bdcf4e04bb..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 <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,14 +42,14 @@ 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());
 }
 
 
 bool Mover::do_rename(FileName const & from, FileName const & to,
 		      string const &) const
 {
-	return from.renameTo(to);
+	return from.moveTo(to);
 }
 
 
@@ -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));