architectural changes to tex2lyx

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

diff --git a/src/mathed/math_stringinset.h b/src/mathed/math_stringinset.h
index f81d89b07a42c3e1491ece310b1b4118b462e95e..e1f4dbf33cb9310c657673f04927e778b37c6834 100644 (file)
--- a/src/mathed/math_stringinset.h
+++ b/src/mathed/math_stringinset.h
@@ -2,27 +2,26 @@
 #ifndef MATH_STRINGINSET_H
 #define MATH_STRINGINSET_H
 
-#include "math_diminset.h"
+#include "math_inset.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 /** Some collection of chars with similar properties
  *  maily for math-extern
  *  \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS
  */
 
-class MathStringInset : public MathDimInset {
+class MathStringInset : public MathInset {
 public:
        ///
        explicit MathStringInset(string const & s);
        ///
-       MathInset * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       void metrics(MathMetricsInfo & st) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       void draw(MathPainterInfo &, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
        string str() const { return str_; }
        ///
@@ -31,11 +30,11 @@ public:
        ///
        void normalize(NormalStream &) const;
        ///
-       void octavize(OctaveStream &) const;
+       void octave(OctaveStream &) const;
        ///
-       void maplize(MapleStream &) const;
+       void maple(MapleStream &) const;
        ///
-       void mathematicize(MathematicaStream &) const;
+       void mathematica(MathematicaStream &) const;
        ///
        void mathmlize(MathMLStream &) const;
        ///