simplify GuiToc / TocWidget interaction. Much can still be simplified...

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

diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index 7787949d019ad6ed08224abcc4ee8b88d31ea710..b107d78abe2e358b11c802827cf5b5bbaa71cf51 100644 (file)
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -12,14 +12,10 @@
 #ifndef MATH_MATHMLSTREAM_H
 #define MATH_MATHMLSTREAM_H
 
+#include "support/strfwd.h"
 
-// Please keep all four streams in one file until the interface has
-// settled.
-
-
+// FIXME: Move to individual insets
 #include "MetricsInfo.h"
-#include "support/docstream.h"
-#include "support/docstring.h"
 
 
 namespace lyx {
@@ -95,21 +91,17 @@ WriteStream & operator<<(WriteStream &, unsigned int);
 class MTag {
 public:
        ///
-       MTag(docstring const tag) : tag_(tag) {}
+       MTag(char const * const tag) : tag_(tag) {}
        ///
-       MTag(char const * const tag) : tag_(from_ascii(tag)) {}
-       ///
-       docstring const tag_;
+       char const * const tag_;
 };
 
 class ETag {
 public:
        ///
-       ETag(docstring const tag) : tag_(tag) {}
-       ///
-       ETag(char const * const tag) : tag_(from_ascii(tag)) {}
+       ETag(char const * const tag) : tag_(tag) {}
        ///
-       docstring const tag_;
+       char const * const tag_;
 };
 
 class MathStream {