architectural changes to tex2lyx

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

diff --git a/src/mathed/math_charinset.h b/src/mathed/math_charinset.h
index 3673ba15c58cf67d9583a0257ff08c5a9184a8e1..eaeb117caec6eca87021beed4ad6aec25c8d8dd7 100644 (file)
--- a/src/mathed/math_charinset.h
+++ b/src/mathed/math_charinset.h
@@ -2,7 +2,7 @@
 #ifndef MATH_CHARINSET_H
 #define MATH_CHARINSET_H
 
-#include "math_diminset.h"
+#include "math_inset.h"
 
 
 /** The base character inset.
@@ -11,18 +11,18 @@
  * Full author contact details are available in file CREDITS
  */
 
-class MathCharInset : public MathDimInset {
+class MathCharInset : public MathInset {
 public:
        ///
        explicit MathCharInset(char c);
        ///
-       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;
        ///
-       void metricsT(TextMetricsInfo const & st) const;
+       void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
        ///
        void drawT(TextPainter &, int x, int y) const;
        ///