X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=4ac520bac91052cb7ccc77f04461cf4292fec8b2;hb=7b3e212744e532ce0fab58c7e6bc7e3fd180d79a;hp=2c358795a7d9db0de106b8ce30a4eb14a49aacf3;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 2c358795a7..4ac520bac9 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -14,34 +14,40 @@
 #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) {}
 		///
-		Error(int line, std::string const & desc, std::string const & text)
+		Error(int line, docstring const & desc, docstring const & text)
 			: error_in_line(line),
 			  error_desc(desc),
 			  error_text(text) {}
 		/// what line in the TeX file the error occured in
 		int error_in_line;
 		/// The kind of error
-		std::string error_desc;
+		docstring error_desc;
 		/// The line/cmd that caused the error.
-		std::string error_text;
+		docstring error_text;
 	};
 public:
 	///
@@ -51,8 +57,8 @@ public:
 	///
 	Errors::const_iterator end() const { return errors.end(); }
 	///
-	void insertError(int line, std::string const & error_desc,
-			 std::string const & error_text);
+	void insertError(int line, docstring const & error_desc,
+			 docstring const & error_text);
 private:
 	///
 	Errors errors;
@@ -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,8 @@ private:
 	void deplog(DepTable & head);
 
 	///
-	bool runMakeIndex(std::string const &);
+	bool runMakeIndex(std::string const &, OutputParams const &,
+	                  std::string const & = std::string());
 
 	///
 	std::vector<Aux_Info> const scanAuxFiles(std::string const &);
@@ -192,7 +199,10 @@ private:
 	std::string output_file;
 
 	///
-	LatexRunParams runparams;
+	OutputParams runparams;
 };
 
+
+} // namespace lyx
+
 #endif