X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_arrayinset.h;h=dbd9fe3bc035b5aa70429a703d351c8c8375ef49;hb=b447408de232872fef1537fca542abc23702d572;hp=10fe6146c504d353decdbeb433e7a6558d0ba78c;hpb=c9e78a825bd659ddb7b4b55a6adfa7f0a1a98dd6;p=lyx.git

diff --git a/src/mathed/math_arrayinset.h b/src/mathed/math_arrayinset.h
index 10fe6146c5..dbd9fe3bc0 100644
--- a/src/mathed/math_arrayinset.h
+++ b/src/mathed/math_arrayinset.h
@@ -1,35 +1,38 @@
 // -*- C++ -*-
-#ifndef MATH_ARRAYINSET_H
-#define MATH_ARRAYINSET_H
-
-#include "math_gridinset.h"
-
-
 /**
- * Inset for things like \begin{array}...\end{array}
+ * \file math_arrayinset.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author André Pönitz
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
+#ifndef MATH_ARRAYINSET_H
+#define MATH_ARRAYINSET_H
+
+#include "math_gridinset.h"
+
+
+/// Inset for things like \begin{array}...\end{array}
 class MathArrayInset : public MathGridInset {
 public:
 	///
-	MathArrayInset(string const &, int m, int n);
+	MathArrayInset(std::string const &, int m, int n);
 	///
-	MathArrayInset(string const &, int m, int n,
-		char valign, string const & halign);
+	MathArrayInset(std::string const &, int m, int n,
+		char valign, std::string const & halign);
 	///
-	MathArrayInset(string const &, char valign, string const & halign);
+	MathArrayInset(std::string const &, char valign, std::string const & halign);
 	/// convienience constructor from whitespace/newline seperated data
-	MathArrayInset(string const &, string const & str);
+	MathArrayInset(std::string const &, std::string const & str);
 	///
-	MathInset * clone() const;
+	std::auto_ptr<InsetBase> clone() const;
 	///
-	void metrics(MathMetricsInfo & mi) const;
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
-	void draw(MathPainterInfo & pi, int x, int y) const;
+	void draw(PainterInfo & pi, int x, int y) const;
 	///
 	MathArrayInset * asArrayInset() { return this; }
 	///
@@ -38,13 +41,15 @@ public:
 	///
 	void write(WriteStream & os) const;
 	///
-	void normalize(NormalStream &) const;
+	void infoize(std::ostream & os) const;
+	///
+	void normalize(NormalStream & os) const;
 	///
-	void maple(MapleStream &) const;
+	void maple(MapleStream & os) const;
 
 private:
 	///
-	string name_;
+	std::string name_;
 };
 
 #endif