architectural changes to tex2lyx

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

diff --git a/src/mathed/math_arrayinset.h b/src/mathed/math_arrayinset.h
index baad8d81c5d69e9ad20daccd6e0c370a607707c3..642e8bc1027c04ed36cadb25895cd01dee99bfb1 100644 (file)
--- a/src/mathed/math_arrayinset.h
+++ b/src/mathed/math_arrayinset.h
@@ -4,11 +4,8 @@
 
 #include "math_gridinset.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
-/** 
+/**
  * Inset for things like \begin{array}...\end{array}
  *
  * \author André Pönitz
@@ -28,11 +25,11 @@ public:
        /// convienience constructor from whitespace/newline seperated data
        MathArrayInset(string const &, string const & str);
        ///
-       MathInset * clone() const;
+       virtual 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; }
        ///
@@ -41,9 +38,11 @@ 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:
        ///