X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathArray.h;h=f59d9e7304a9090cbad15a03722009359ed071d5;hb=137158532b1ac0cde1557226ee486b3fda39b545;hp=c104287e63d6cfb76abe44c382e63259b04ad8ed;hpb=e89625ef28143545a511cdabc67dee8b7be1b216;p=lyx.git

diff --git a/src/mathed/InsetMathArray.h b/src/mathed/InsetMathArray.h
index c104287e63..f59d9e7304 100644
--- a/src/mathed/InsetMathArray.h
+++ b/src/mathed/InsetMathArray.h
@@ -15,21 +15,26 @@
 #include "InsetMathGrid.h"
 
 
+namespace lyx {
+
+
 /// Inset for things like \begin{array}...\end{array}
 class InsetMathArray : public InsetMathGrid {
 public:
 	///
-	InsetMathArray(std::string const &, int m, int n);
+	InsetMathArray(docstring const &, int m, int n);
 	///
-	InsetMathArray(std::string const &, int m, int n,
-		char valign, std::string const & halign);
+	InsetMathArray(docstring const &, int m, int n,
+		char valign, docstring const & halign);
 	///
-	InsetMathArray(std::string const &, char valign, std::string const & halign);
+	InsetMathArray(docstring const &, char valign, docstring const & halign);
 	/// convenience constructor from whitespace/newline separated data
-	InsetMathArray(std::string const &, std::string const & str);
+	InsetMathArray(docstring const &, docstring const & str);
 	///
 	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
+	Dimension const dimension(BufferView const &) const;
+	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
 	InsetMathArray * asArrayInset() { return this; }
@@ -39,7 +44,7 @@ public:
 	///
 	void write(WriteStream & os) const;
 	///
-	void infoize(std::ostream & os) const;
+	void infoize(odocstream & os) const;
 	///
 	void normalize(NormalStream & os) const;
 	///
@@ -47,9 +52,12 @@ public:
 	///
 	void validate(LaTeXFeatures & features) const;
 private:
-	virtual std::auto_ptr<InsetBase> doClone() const;
+	virtual Inset * clone() const;
 	///
-	std::string name_;
+	docstring name_;
 };
 
+
+} // namespace lyx
+
 #endif