LFUN_UNICODE_INSERT - unicode-insert

[lyx.git] / src / LaTeX.h

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 2c358795a7d9db0de106b8ce30a4eb14a49aacf3..eae822d8e6b2a4cea437bb2b3c1804ab9bf1a910 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -14,21 +14,27 @@
 #ifndef LATEX_H
 #define LATEX_H
 
-#include "latexrunparams.h"
+#include "outputparams.h"
+
+#include "support/docstring.h"
 
 #include <boost/utility.hpp>
-#include <boost/signals/signal1.hpp>
+#include <boost/signal.hpp>
 
 #include <vector>
 #include <set>
 
+
+namespace lyx {
+
 class DepTable;
 
 ///
 class TeXErrors {
 private:
        ///
-       struct Error {
+       class Error {
+       public:
                ///
                Error () : error_in_line(0) {}
                ///
@@ -125,14 +131,14 @@ public:
        };
 
        /// This signal emits an informative message
-       boost::signal1<void, std::string> message;
+       boost::signal<void(docstring)> message;
 
 
        /**
           cmd = the latex command, file = name of the (temporary) latex file,
           path = name of the files original path.
        */
-       LaTeX(std::string const & cmd, LatexRunParams const &,
+       LaTeX(std::string const & cmd, OutputParams const &,
              std::string const & file, std::string const & path);
 
        /// runs LaTeX several times
@@ -155,7 +161,7 @@ private:
        void deplog(DepTable & head);
 
        ///
-       bool runMakeIndex(std::string const &);
+       bool runMakeIndex(std::string const &, OutputParams const &);
 
        ///
        std::vector<Aux_Info> const scanAuxFiles(std::string const &);
@@ -192,7 +198,10 @@ private:
        std::string output_file;
 
        ///
-       LatexRunParams runparams;
+       OutputParams runparams;
 };
 
+
+} // namespace lyx
+
 #endif