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

diff --git a/src/mathed/math_arrayinset.h b/src/mathed/math_arrayinset.h
index cf8f4b0a21..dbd9fe3bc0 100644
--- a/src/mathed/math_arrayinset.h
+++ b/src/mathed/math_arrayinset.h
@@ -1,36 +1,38 @@
 // -*- C++ -*-
+/**
+ * \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.
+ */
+
 #ifndef MATH_ARRAYINSET_H
 #define MATH_ARRAYINSET_H
 
 #include "math_gridinset.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-/** 
- * Inset for things like \begin{array}...\end{array}
- *
- * \author André Pönitz
- *
- * Full author contact details are available in file CREDITS
- */
 
+/// 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);
+	///
+	std::auto_ptr<InsetBase> clone() const;
 	///
-	MathInset * clone() const;
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
-	void metrics(MathMetricsInfo & st) const;
+	void draw(PainterInfo & pi, int x, int y) const;
 	///
 	MathArrayInset * asArrayInset() { return this; }
 	///
@@ -39,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 maplize(MapleStream &) const;
+	void maple(MapleStream & os) const;
 
 private:
 	///
-	string name_;
+	std::string name_;
 };
 
 #endif