hopefully fix tex2lyx linking.

[lyx.git] / src / LaTeX.h

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 2860e68d6c805bfefc54d48c47557178d03be383..4ac520bac91052cb7ccc77f04461cf4292fec8b2 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -16,12 +16,17 @@
 
 #include "outputparams.h"
 
+#include "support/docstring.h"
+
 #include <boost/utility.hpp>
 #include <boost/signal.hpp>
 
 #include <vector>
 #include <set>
 
+
+namespace lyx {
+
 class DepTable;
 
 ///
@@ -33,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:
        ///
@@ -52,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;
@@ -126,7 +131,7 @@ public:
        };
 
        /// This signal emits an informative message
-       boost::signal<void(lyx::docstring)> message;
+       boost::signal<void(docstring)> message;
 
 
        /**
@@ -156,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 &);
@@ -196,4 +202,7 @@ private:
        OutputParams runparams;
 };
 
+
+} // namespace lyx
+
 #endif