architectural changes to tex2lyx

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

diff --git a/src/mathed/math_xyarrowinset.h b/src/mathed/math_xyarrowinset.h
index ecdfd3e2470d6d6002a661b9e820bfaddb0e3b47..5bff4211f09c99a4b6c58ceddadaee1c0a5de766 100644 (file)
--- a/src/mathed/math_xyarrowinset.h
+++ b/src/mathed/math_xyarrowinset.h
@@ -3,10 +3,8 @@
 #define MATH_ARROWINSET_H
 
 #include "math_nestinset.h"
+#include "metricsinfo.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 // for the \ar stuff in \xymatrix
 
@@ -17,11 +15,11 @@ public:
        ///
        MathXYArrowInset();
        ///
-       MathInset * clone() const;
+       InsetBase * clone() const;
        ///
-       void metrics(MathMetricsInfo & st) const;
+       void metrics(MetricsInfo & mi) const;
        ///
-       void draw(MathPainterInfo & pain, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
        MathXYArrowInset * asXYArrowInset() { return this; }
 
@@ -36,14 +34,14 @@ public:
        ///
        MathXYMatrixInset const * targetMatrix() const;
        ///
-       MathXArray const & targetCell() const;
+       MathArray const & targetCell() const;
        ///
-       MathXArray const & sourceCell() const;
+       MathArray const & sourceCell() const;
 
        ///
        bool up_;
        ///
-       mutable MathMetricsInfo mi_;
+       mutable MetricsInfo mi_;
        ///
        mutable LyXFont font_;
        ///