X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=4ac520bac91052cb7ccc77f04461cf4292fec8b2;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=6e2d0c6197be4349ee5efbef320aa510d8634231;hpb=9080c444582799a9967fb27a5eee08931bd3a323;p=lyx.git

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 6e2d0c6197..4ac520bac9 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -24,6 +24,9 @@
 #include <vector>
 #include <set>
 
+
+namespace lyx {
+
 class DepTable;
 
 ///
@@ -35,16 +38,16 @@ private:
 		///
 		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:
 	///
@@ -54,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;
@@ -128,7 +131,7 @@ public:
 	};
 
 	/// This signal emits an informative message
-	boost::signal<void(lyx::docstring)> message;
+	boost::signal<void(docstring)> message;
 
 
 	/**
@@ -158,7 +161,8 @@ private:
 	void deplog(DepTable & head);
 
 	///
-	bool runMakeIndex(std::string const &, OutputParams const &);
+	bool runMakeIndex(std::string const &, OutputParams const &,
+	                  std::string const & = std::string());
 
 	///
 	std::vector<Aux_Info> const scanAuxFiles(std::string const &);
@@ -198,4 +202,7 @@ private:
 	OutputParams runparams;
 };
 
+
+} // namespace lyx
+
 #endif