architectural changes to tex2lyx

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

diff --git a/src/mathed/math_symbolinset.h b/src/mathed/math_symbolinset.h
index 2f13884b3436dbb49432fa92e9ba2f4756108fbd..0427e4e7d3d39ab9a73f8ca5cc9786c0bc7587e4 100644 (file)
--- a/src/mathed/math_symbolinset.h
+++ b/src/mathed/math_symbolinset.h
@@ -2,31 +2,28 @@
 #ifndef MATH_SYMBOLINSET_H
 #define MATH_SYMBOLINSET_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "math_diminset.h"
+#include "math_inset.h"
 
 struct latexkeys;
 
+
 // "normal" symbols that don't take limits and don't grow in displayed
 // formulae
 
-class MathSymbolInset : public MathDimInset {
+class MathSymbolInset : public MathInset {
 public:
        ///
-       explicit MathSymbolInset(latexkeys const *);
+       explicit MathSymbolInset(latexkeys const * l);
        ///
-       explicit MathSymbolInset(char const *);
+       explicit MathSymbolInset(char const * name);
        ///
-       explicit MathSymbolInset(string const &);
+       explicit MathSymbolInset(string const & name);
        ///
-       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 &, int x, int y) const;
        ///
        bool isRelOp() const;
        /// do we take scripts?
@@ -45,15 +42,15 @@ public:
        ///
        void normalize(NormalStream &) const;
        ///
-       void maplize(MapleStream &) const;
+       void maple(MapleStream &) const;
        ///
-       void maximize(MaximaStream &) 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;
        ///
        void write(WriteStream & os) const;
        ///