X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=c7d51e92a6e86529d5a2d3ce428772dcb254ddd1;hb=2486c96b8d9086471299bf207b85b1ce848246aa;hp=148f700088a6a36daf14973543597832e16174e3;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 148f700088..c7d51e92a6 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -14,13 +14,13 @@
 #ifndef LATEX_H
 #define LATEX_H
 
-#include "latexrunparams.h"
-#include "support/std_string.h"
-#include <vector>
-#include <set>
+#include "outputparams.h"
 
 #include <boost/utility.hpp>
-#include <boost/signals/signal1.hpp>
+#include <boost/signal.hpp>
+
+#include <vector>
+#include <set>
 
 class DepTable;
 
@@ -28,20 +28,21 @@ class DepTable;
 class TeXErrors {
 private:
 	///
-	struct Error {
+	class Error {
+	public:
 		///
 		Error () : error_in_line(0) {}
 		///
-		Error(int line, string const & desc, string const & text)
+		Error(int line, std::string const & desc, std::string 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
-		string error_desc;
+		std::string error_desc;
 		/// The line/cmd that caused the error.
-		string error_text;
+		std::string error_text;
 	};
 public:
 	///
@@ -51,8 +52,8 @@ public:
 	///
 	Errors::const_iterator end() const { return errors.end(); }
 	///
-	void insertError(int line, string const & error_desc,
-			 string const & error_text);
+	void insertError(int line, std::string const & error_desc,
+			 std::string const & error_text);
 private:
 	///
 	Errors errors;
@@ -64,13 +65,13 @@ public:
 	///
 	Aux_Info() {}
 	///
-	string aux_file;
+	std::string aux_file;
 	///
-	std::set<string> citations;
+	std::set<std::string> citations;
 	///
-	std::set<string> databases;
+	std::set<std::string> databases;
 	///
-	std::set<string> styles;
+	std::set<std::string> styles;
 };
 
 
@@ -125,15 +126,15 @@ public:
 	};
 
 	/// This signal emits an informative message
-	boost::signal1<void, string> message;
+	boost::signal<void(std::string)> message;
 
 
 	/**
 	   cmd = the latex command, file = name of the (temporary) latex file,
 	   path = name of the files original path.
 	*/
-	LaTeX(string const & cmd, LatexRunParams const &,
-	      string const & file, string const & path);
+	LaTeX(std::string const & cmd, OutputParams const &,
+	      std::string const & file, std::string const & path);
 
 	/// runs LaTeX several times
 	int run(TeXErrors &);
@@ -149,22 +150,22 @@ private:
 	int startscript();
 
 	/// The dependency file.
-	string depfile;
+	std::string depfile;
 
 	///
 	void deplog(DepTable & head);
 
 	///
-	bool runMakeIndex(string const &);
+	bool runMakeIndex(std::string const &, OutputParams const &);
 
 	///
-	std::vector<Aux_Info> const scanAuxFiles(string const &);
+	std::vector<Aux_Info> const scanAuxFiles(std::string const &);
 
 	///
-	Aux_Info const scanAuxFile(string const &);
+	Aux_Info const scanAuxFile(std::string const &);
 
 	///
-	void scanAuxFile(string const &, Aux_Info &);
+	void scanAuxFile(std::string const &, Aux_Info &);
 
 	///
 	void updateBibtexDependencies(DepTable &,
@@ -177,22 +178,22 @@ private:
 	void deleteFilesOnError() const;
 
 	///
-	string cmd;
+	std::string cmd;
 
 	///
-	string file;
+	std::string file;
 
 	///
-	string path;
+	std::string path;
 
 	/// used by scanLogFile
 	int num_errors;
 
 	/// The name of the final output file.
-	string output_file;
+	std::string output_file;
 
 	///
-	LatexRunParams runparams;
+	OutputParams runparams;
 };
 
 #endif