architectural changes to tex2lyx

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

diff --git a/src/mathed/math_numberinset.C b/src/mathed/math_numberinset.C
index 3051703c4a7d42ae0a4c84c072dff5beb4f49e9f..249221153ef3b79ac9ff1395f57a47240feab776 100644 (file)
--- a/src/mathed/math_numberinset.C
+++ b/src/mathed/math_numberinset.C
@@ -1,8 +1,5 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_numberinset.h"
 #include "math_mathmlstream.h"
@@ -10,25 +7,27 @@
 #include "math_support.h"
 #include "debug.h"
 
+using std::auto_ptr;
+
 
 MathNumberInset::MathNumberInset(string const & s)
        : str_(s)
 {}
 
 
-MathInset * MathNumberInset::clone() const
+auto_ptr<InsetBase> MathNumberInset::clone() const
 {
-       return new MathNumberInset(*this);
+       return auto_ptr<InsetBase>(new MathNumberInset(*this));
 }
 
 
-void MathNumberInset::metrics(MathMetricsInfo & mi) const
+void MathNumberInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       mathed_string_dim(mi.base.font, str_, dim_);
+       mathed_string_dim(mi.base.font, str_, dim);
 }
 
 
-void MathNumberInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathNumberInset::draw(PainterInfo & pi, int x, int y) const
 {
        //lyxerr << "drawing '" << str_ << "' code: " << code_ << endl;
        drawStr(pi, pi.base.font, x, y, str_);
@@ -41,13 +40,13 @@ void MathNumberInset::normalize(NormalStream & os) const
 }
 
 
-void MathNumberInset::maplize(MapleStream & os) const
+void MathNumberInset::maple(MapleStream & os) const
 {
        os << str_;
 }
 
 
-void MathNumberInset::octavize(OctaveStream & os) const
+void MathNumberInset::octave(OctaveStream & os) const
 {
        os << str_;
 }