X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathColor.h;h=01f53298bf3480c08298656c14206ea813a5d307;hb=b9765984c0e2d38b251b765cabfc9d23bf957a7a;hp=68c0f47f588654b94c6f155305d3397b8fc53481;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/mathed/InsetMathColor.h b/src/mathed/InsetMathColor.h
index 68c0f47f58..01f53298bf 100644
--- a/src/mathed/InsetMathColor.h
+++ b/src/mathed/InsetMathColor.h
@@ -12,7 +12,7 @@
 #ifndef MATH_COLORINSET_H
 #define MATH_COLORINSET_H
 
-#include "LColor.h"
+#include "Color.h"
 
 #include "InsetMathNest.h"
 
@@ -25,11 +25,11 @@ class InsetMathColor : public InsetMathNest {
 public:
 	/// Create a color inset from LyX color number
 	explicit InsetMathColor(bool oldstyle,
-		LColor_color const & color = LColor::none);
+		Color_color const & color = Color::none);
 	/// Create a color inset from LaTeX color name
-	explicit InsetMathColor(bool oldstyle, std::string const & color);
+	explicit InsetMathColor(bool oldstyle, docstring const & color);
 	///
-	void metrics(MetricsInfo & mi, Dimension & dim) const;
+	bool metrics(MetricsInfo & mi, Dimension & dim) const;
 	/// we write extra braces in any case...
 	/// FIXME Why? Are they necessary if oldstyle_ == false?
 	bool extraBraces() const { return true; }
@@ -42,15 +42,15 @@ public:
 	/// write normalized content
 	void normalize(NormalStream & ns) const;
 	///
-	void infoize(std::ostream & os) const;
+	void infoize(odocstream & os) const;
 private:
-	virtual std::auto_ptr<InsetBase> doClone() const;
+	virtual std::auto_ptr<Inset> doClone() const;
 	/// width of '[' in current font
 	mutable int w_;
 	///
 	bool oldstyle_;
 	/// Our color. Only valid LaTeX colors are allowed.
-	std::string color_;
+	docstring color_;
 };