Get package things working with modules prior to UI patch.

[lyx.git] / src / mathed / InsetMathXYArrow.cpp

diff --git a/src/mathed/InsetMathXYArrow.cpp b/src/mathed/InsetMathXYArrow.cpp
index fb0f30252dc4067fe46c7286297d76f56fd94379..3449271568c848eda98c56995d22f1ab1facf3dd 100644 (file)
--- a/src/mathed/InsetMathXYArrow.cpp
+++ b/src/mathed/InsetMathXYArrow.cpp
@@ -28,9 +28,9 @@ InsetMathXYArrow::InsetMathXYArrow()
 {}
 
 
-std::auto_ptr<InsetBase> InsetMathXYArrow::clone() const
+std::auto_ptr<Inset> InsetMathXYArrow::clone() const
 {
-       return std::auto_ptr<InsetBase>(new InsetMathXYArrow(*this));
+       return std::auto_ptr<Inset>(new InsetMathXYArrow(*this));
 }
 
 
@@ -40,14 +40,14 @@ InsetMathXYMatrix const * InsetMathXYArrow::targetMatrix() const
 }
 
 
-MathArray const & InsetMathXYArrow::targetCell() const
+MathData const & InsetMathXYArrow::targetCell() const
 {
 #if 0
        InsetMathXYMatrix const * p = targetMatrix();
        int x = 0;
        int y = 0;
-       MathArray const & t = cell(0);
-       for (MathArray::const_iterator it = t.begin(); it != t.end(); ++it) {
+       MathData const & t = cell(0);
+       for (MathData::const_iterator it = t.begin(); it != t.end(); ++it) {
                switch ((*it)->getChar()) {
                        case 'l': --x; break;
                        case 'r': ++x; break;
@@ -64,18 +64,18 @@ MathArray const & InsetMathXYArrow::targetCell() const
        }
        return p->cell(n);
 #else
-       static MathArray dummy;
+       static MathData dummy;
        return dummy;
 #endif
 }
 
 
-MathArray const & InsetMathXYArrow::sourceCell() const
+MathData const & InsetMathXYArrow::sourceCell() const
 {
 #if 0
        return targetMatrix()->cell(mi_.idx);
 #else
-       static MathArray dummy;
+       static MathData dummy;
        return dummy;
 #endif
 }
@@ -131,9 +131,9 @@ void InsetMathXYArrow::draw(PainterInfo & pi, int x, int y) const
        } else {
 
                pi.pain.text(x, y, "X");
-               MathArray const & s = sourceCell();
-               MathArray const & t = targetCell();
-               pi.pain.line(s.xm(), s.ym(), t.xm(), t.ym(), LColor::math);
+               MathData const & s = sourceCell();
+               MathData const & t = targetCell();
+               pi.pain.line(s.xm(), s.ym(), t.xm(), t.ym(), Color::math);
                cell(1).draw(pi, (s.xm() + t.xm())/2, (s.ym() + t.ym())/2);
 
        }