cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / converter.h

diff --git a/src/converter.h b/src/converter.h
index 3945dd5c3b1a7864a37a6fb706faaf2452a887aa..84841e82a82a8358b3461c65a814d707ac64f4c8 100644 (file)
--- a/src/converter.h
+++ b/src/converter.h
@@ -20,6 +20,7 @@
 
 
 class Buffer;
+class ErrorList;
 class Format;
 class Formats;
 class OutputParams;
@@ -97,7 +98,7 @@ public:
        std::vector<Format const *> const
        getReachable(std::string const & from, bool only_viewable,
                     bool clear_visited);
-       ///
+       /// Does a conversion path from format \p from to format \p to exist?
        bool isReachable(std::string const & from, std::string const & to);
        ///
        Graph::EdgePath const getPath(std::string const & from, std::string const & to);
@@ -107,11 +108,13 @@ public:
        bool convert(Buffer const * buffer,
                     std::string const & from_file, std::string const & to_file_base,
                     std::string const & from_format, std::string const & to_format,
-                    std::string & to_file);
+                    std::string & to_file, ErrorList & errorList,
+                        bool try_default = false);
        ///
        bool convert(Buffer const * buffer,
                     std::string const & from_file, std::string const & to_file_base,
-                    std::string const & from_format, std::string const & to_format);
+                    std::string const & from_format, std::string const & to_format,
+                        ErrorList & errorList, bool try_default = false);
        ///
        void update(Formats const & formats);
        ///
@@ -133,16 +136,19 @@ private:
        intToFormat(std::vector<int> const & input);
        ///
        bool scanLog(Buffer const & buffer, std::string const & command,
-                    std::string const & filename);
+                    std::string const & filename, ErrorList & errorList);
        ///
        bool runLaTeX(Buffer const & buffer, std::string const & command,
-                     OutputParams const &);
+                     OutputParams const &, ErrorList & errorList);
        ///
        ConverterList converterlist_;
        ///
        std::string latex_command_;
-       ///
-       bool move(std::string const & from, std::string const & to, bool copy);
+       /// If \p from = /path/file.ext and \p to = /path2/file2.ext2 then
+       /// this method moves each /path/file*.ext file to /path2/file2*.ext2
+       bool move(std::string const & fmt,
+                 std::string const & from, std::string const & to,
+                 bool copy);
        ///
        Graph G_;
 };