architectural changes to tex2lyx

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

diff --git a/src/mathed/math_exfuncinset.h b/src/mathed/math_exfuncinset.h
index 7a9d13c945be1ff7211e9f208bfeeceb7fcdc6e0..6422af0f7af502f77030417f8ec237aae502f25f 100644 (file)
--- a/src/mathed/math_exfuncinset.h
+++ b/src/mathed/math_exfuncinset.h
@@ -2,9 +2,6 @@
 #ifndef MATH_EXFUNCINSET_H
 #define MATH_EXFUNCINSET_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 #include "math_nestinset.h"
 
@@ -18,22 +15,24 @@ public:
        ///
        MathExFuncInset(string const & name, MathArray const & ar);
        ///
-       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;
        ///
        string name() const;
 
        ///
-       void maplize(MapleStream &) const;
+       void maple(MapleStream &) const;
+       ///
+       void maxima(MaximaStream &) const;
        ///
-       void mathematicize(MathematicaStream &) const;
+       void mathematica(MathematicaStream &) const;
        ///
        void mathmlize(MathMLStream &) const;
        ///
-       void octavize(OctaveStream &) const;
+       void octave(OctaveStream &) const;
 
 private:
        ///