* Painter.h:

[lyx.git] / src / mover.h

diff --git a/src/mover.h b/src/mover.h
index 153a20ba89f8871407340f862913524c1758e7ea..951636bfdc343e35c9c91b051bfcaefe6fcfbbcc 100644 (file)
--- a/src/mover.h
+++ b/src/mover.h
@@ -15,6 +15,9 @@
 #include <map>
 #include <string>
 
+
+namespace lyx {
+
 /**
  *  Utility to copy a file of a specified format from one place to another.
  *  This base class simply invokes the command support::copy().
@@ -81,11 +84,11 @@ public:
 protected:
        virtual bool
        do_copy(std::string const & from, std::string const & to,
-               std::string const &) const;
+               std::string const &) const;
 
        virtual bool
        do_rename(std::string const & from, std::string const & to,
-                 std::string const &) const;
+                 std::string const &) const;
 };
 
 
@@ -98,15 +101,16 @@ protected:
  *  copied .fig file will require a transformation of the picture file
  *  reference if it is to be found by XFig.
  */
-struct SpecialisedMover : public Mover
+class SpecialisedMover : public Mover
 {
+public:
        SpecialisedMover() {}
 
        /** @c command should be of the form
         *  <code>
-        *      sh $$s/copy_fig.sh $$i $$o $$l
+        *      python $$s/scripts/fig_copy.py $$i $$o $$l
         *  </code>
-        *  where $$s is a placeholder for the lyx script directory,
+        *  where $$s is a placeholder for the lyx support directory,
         *        $$i is a placeholder for the name of the file to be moved,
         *        $$o is a placeholder for the name of the file after moving,
         *        $$l is a placeholder for the name of the file after moving,
@@ -127,11 +131,11 @@ struct SpecialisedMover : public Mover
 private:
        virtual bool
        do_copy(std::string const & from, std::string const & to,
-               std::string const & latex) const;
+               std::string const & latex) const;
 
        virtual bool
        do_rename(std::string const & from, std::string const & to,
-                 std::string const & latex) const;
+                 std::string const & latex) const;
 
        std::string command_;
 };
@@ -173,4 +177,7 @@ private:
 extern Movers movers;
 extern Movers system_movers;
 
+
+} // namespace lyx
+
 #endif // MOVER_H