Make members of FuncRequest private, per the FIXME there. Again, this is

[lyx.git] / src / mathed / MathStream.h

diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index cf08afe23c5890405a6664fb4ce4617a7bbacf2d..40b06a0ef0561d401c52840bd699a543e8043275 100644 (file)
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -335,14 +335,14 @@ MathStream & operator<<(MathStream &, ETag const &);
 class SetMode {
 public:
        ///
-       explicit SetMode(MathStream & os, bool text, docstring attrs);
+       explicit SetMode(MathStream & os, bool text, std::string const & attrs);
        ///
        explicit SetMode(MathStream & os, bool text);
        ///
        ~SetMode();
 private:
        ///
-       void init(bool, docstring);
+       void init(bool, std::string const &);
        ///
        MathStream & os_;
        ///
@@ -392,7 +392,7 @@ private:
        ///
        odocstringstream deferred_;
        ///
-       friend class SetMode;
+       friend class SetHTMLMode;
 };
 
 ///
@@ -413,6 +413,26 @@ HtmlStream & operator<<(HtmlStream &, MTag const &);
 HtmlStream & operator<<(HtmlStream &, ETag const &);
 
 
+class SetHTMLMode {
+public:
+       ///
+       explicit SetHTMLMode(HtmlStream & os, bool text, std::string attrs);
+       ///
+       explicit SetHTMLMode(HtmlStream & os, bool text);
+       ///
+       ~SetHTMLMode();
+private:
+       ///
+       void init(bool, std::string const &);
+       ///
+       HtmlStream & os_;
+       ///
+       bool opened_;
+       ///
+       bool was_text_;
+};
+
+
 //
 // Debugging
 //