architectural changes to tex2lyx

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

diff --git a/src/mathed/math_stringinset.C b/src/mathed/math_stringinset.C
index 005eecf4e96c87ef52ea331007eac19a9aa1a7dd..b1dcddae5c0cf01e33e3cbc51a0412cb8451f7ba 100644 (file)
--- a/src/mathed/math_stringinset.C
+++ b/src/mathed/math_stringinset.C
@@ -7,25 +7,27 @@
 #include "math_support.h"
 #include "debug.h"
 
+using std::auto_ptr;
+
 
 MathStringInset::MathStringInset(string const & s)
        : str_(s)
 {}
 
 
-MathInset * MathStringInset::clone() const
+auto_ptr<InsetBase> MathStringInset::clone() const
 {
-       return new MathStringInset(*this);
+       return auto_ptr<InsetBase>(new MathStringInset(*this));
 }
 
 
-void MathStringInset::metrics(MathMetricsInfo & mi) const
+void MathStringInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       mathed_string_dim(mi.base.font, str_, dim_);
+       mathed_string_dim(mi.base.font, str_, dim);
 }
 
 
-void MathStringInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathStringInset::draw(PainterInfo & pi, int x, int y) const
 {
        //lyxerr << "drawing '" << str_ << "' code: " << code_ << endl;
        drawStr(pi, pi.base.font, x, y, str_);