architectural changes to tex2lyx

[lyx.git] / src / mathed / math_xarrowinset.C

diff --git a/src/mathed/math_xarrowinset.C b/src/mathed/math_xarrowinset.C
index ed6813ff10c44d71e6ea2267196256deee986087..df92ac6159a74d5582a7080e6c65967a59350369 100644 (file)
--- a/src/mathed/math_xarrowinset.C
+++ b/src/mathed/math_xarrowinset.C
@@ -1,41 +1,43 @@
 #include <config.h>
 
-
 #include "math_xarrowinset.h"
 #include "math_support.h"
 #include "math_parser.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 
+using std::auto_ptr;
+
 
 MathXArrowInset::MathXArrowInset(string const & name)
        : MathFracbaseInset(), name_(name)
 {}
 
 
-MathInset * MathXArrowInset::clone() const
+auto_ptr<InsetBase> MathXArrowInset::clone() const
 {
-       return new MathXArrowInset(*this);
+       return auto_ptr<InsetBase>(new MathXArrowInset(*this));
 }
 
 
-void MathXArrowInset::metrics(MathMetricsInfo & mi) const
+void MathXArrowInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       MathScriptChanger dummy(mi.base);
+       ScriptChanger dummy(mi.base);
        cell(0).metrics(mi);
        cell(1).metrics(mi);
-       dim_.w = std::max(cell(0).width(), cell(1).width()) + 10;
-       dim_.a = cell(0).height() + 10;
-       dim_.d = cell(1).height();
+       dim_.wid = std::max(cell(0).width(), cell(1).width()) + 10;
+       dim_.asc = cell(0).height() + 10;
+       dim_.des = cell(1).height();
+       dim = dim_;
 }
 
 
-void MathXArrowInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathXArrowInset::draw(PainterInfo & pi, int x, int y) const
 {
-       MathScriptChanger dummy(pi.base);
+       ScriptChanger dummy(pi.base);
        cell(0).draw(pi, x + 5, y - 10);
        cell(1).draw(pi, x + 5, y + cell(1).height());
-       mathed_draw_deco(pi, x + 1, y - 7, width() - 2, 5, name_);
+       mathed_draw_deco(pi, x + 1, y - 7, pi.width - 2, 5, name_);
 }