architectural changes to tex2lyx

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

diff --git a/src/mathed/math_fontoldinset.C b/src/mathed/math_fontoldinset.C
index cb0e3ba4ee17cc2ff21c56bb5edc685d224aa549..8c603178c846fa3166292c9f1e546636668486f9 100644 (file)
--- a/src/mathed/math_fontoldinset.C
+++ b/src/mathed/math_fontoldinset.C
@@ -10,6 +10,7 @@
 #include "support/LOstream.h"
 #include "frontends/Painter.h"
 
+using std::auto_ptr;
 
 
 MathFontOldInset::MathFontOldInset(latexkeys const * key)
@@ -19,31 +20,32 @@ MathFontOldInset::MathFontOldInset(latexkeys const * key)
 }
 
 
-MathInset * MathFontOldInset::clone() const
+auto_ptr<InsetBase> MathFontOldInset::clone() const
 {
-       return new MathFontOldInset(*this);
+       return auto_ptr<InsetBase>(new MathFontOldInset(*this));
 }
 
 
-void MathFontOldInset::metrics(MathMetricsInfo & mi) const
+void MathFontOldInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       MathFontSetChanger dummy(mi.base, key_->name.c_str());
-       dim_ = cell(0).metrics(mi);
-       metricsMarkers();
+       FontSetChanger dummy(mi.base, key_->name.c_str());
+       cell(0).metrics(mi, dim_);
+       metricsMarkers(1);
+       dim = dim_;
 }
 
 
-void MathFontOldInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathFontOldInset::draw(PainterInfo & pi, int x, int y) const
 {
-       MathFontSetChanger dummy(pi.base, key_->name.c_str());
+       FontSetChanger dummy(pi.base, key_->name.c_str());
        cell(0).draw(pi, x + 1, y);
        drawMarkers(pi, x, y);
 }
 
 
-void MathFontOldInset::metricsT(TextMetricsInfo const & mi) const
+void MathFontOldInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
 {
-       dim_ = cell(0).metricsT(mi);
+       cell(0).metricsT(mi, dim);
 }