Fix bug 3101 and 3108

[lyx.git] / src / mover.h

diff --git a/src/mover.h b/src/mover.h
index 951636bfdc343e35c9c91b051bfcaefe6fcfbbcc..1e4666ec5329ae9abcbe1b38c92c963967490031 100644 (file)
--- a/src/mover.h
+++ b/src/mover.h
@@ -18,6 +18,8 @@
 
 namespace lyx {
 
+namespace support { class FileName; }
+
 /**
  *  Utility to copy a file of a specified format from one place to another.
  *  This base class simply invokes the command support::copy().
@@ -34,10 +36,8 @@ public:
         *  \returns true if successful.
         */
        bool
-       copy(std::string const & from, std::string const & to) const
-       {
-               return do_copy(from, to, to);
-       }
+       copy(support::FileName const & from, support::FileName const & to,
+            unsigned long int mode = (unsigned long int)-1) const;
 
        /** Copy file @c from to @c to.
         *  \see SpecialisedMover::SpecialisedMover() for an explanation of
@@ -48,10 +48,11 @@ public:
         *  \returns true if successful.
         */
        bool
-       copy(std::string const & from, std::string const & to,
-            std::string const & latex) const
+       copy(support::FileName const & from, support::FileName const & to,
+            std::string const & latex,
+            unsigned long int mode = (unsigned long int)-1) const
        {
-               return do_copy(from, to, latex);
+               return do_copy(from, to, latex, mode);
        }
 
        /** Rename file @c from as @c to.
@@ -61,10 +62,7 @@ public:
         *  \returns true if successful.
         */
        bool
-       rename(std::string const & from, std::string const & to) const
-       {
-               return do_rename(from, to, to);
-       }
+       rename(support::FileName const & from, support::FileName const & to) const;
 
        /** Rename file @c from as @c to.
         *  \see SpecialisedMover::SpecialisedMover() for an explanation of
@@ -75,7 +73,7 @@ public:
         *  \returns true if successful.
         */
        bool
-       rename(std::string const & from, std::string const & to,
+       rename(support::FileName const & from, support::FileName const & to,
               std::string const & latex) const
        {
                return do_rename(from, to, latex);
@@ -83,11 +81,11 @@ public:
 
 protected:
        virtual bool
-       do_copy(std::string const & from, std::string const & to,
-               std::string const &) const;
+       do_copy(support::FileName const & from, support::FileName const & to,
+               std::string const &, unsigned long int mode) const;
 
        virtual bool
-       do_rename(std::string const & from, std::string const & to,
+       do_rename(support::FileName const & from, support::FileName const & to,
                  std::string const &) const;
 };
 
@@ -130,11 +128,11 @@ public:
 
 private:
        virtual bool
-       do_copy(std::string const & from, std::string const & to,
-               std::string const & latex) const;
+       do_copy(support::FileName const & from, support::FileName const & to,
+               std::string const & latex, unsigned long int mode) const;
 
        virtual bool
-       do_rename(std::string const & from, std::string const & to,
+       do_rename(support::FileName const & from, support::FileName const & to,
                  std::string const & latex) const;
 
        std::string command_;