architectural changes to tex2lyx

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

diff --git a/src/mathed/math_boxinset.C b/src/mathed/math_boxinset.C
index 61a1bf1f2b8948cb40a5bd141f457a3ea03c5e1c..28b3da4f45098bbe937b0e0e10e38d2798f48928 100644 (file)
--- a/src/mathed/math_boxinset.C
+++ b/src/mathed/math_boxinset.C
@@ -1,30 +1,28 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "math_boxinset.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "support/LOstream.h"
 
+using std::auto_ptr;
+
 
 MathBoxInset::MathBoxInset(string const & name)
        : MathNestInset(1), name_(name)
 {}
 
 
-MathInset * MathBoxInset::clone() const
+auto_ptr<InsetBase> MathBoxInset::clone() const
 {
-       return new MathBoxInset(*this);
+       return auto_ptr<InsetBase>(new MathBoxInset(*this));
 }
 
 
 void MathBoxInset::write(WriteStream & os) const
 {
-       os << "\\" << name_ << "{" << cell(0) << "}";
+       os << '\\' << name_ << '{' << cell(0) << '}';
 }
 
 
@@ -36,20 +34,20 @@ void MathBoxInset::normalize(NormalStream & os) const
 }
 
 
-void MathBoxInset::metrics(MathMetricsInfo & mi) const
+void MathBoxInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       MathFontSetChanger dummy(mi.base, "textnormal");
-       cell(0).metrics(mi);
-       dim_ = cell(0).dim();
-       metricsMarkers2();
+       FontSetChanger dummy(mi.base, "textnormal");
+       cell(0).metrics(mi, dim_);
+       metricsMarkers();
+       dim = dim_;
 }
 
 
-void MathBoxInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathBoxInset::draw(PainterInfo & pi, int x, int y) const
 {
-       MathFontSetChanger dummy(pi.base, "textnormal");
+       FontSetChanger dummy(pi.base, "textnormal");
        cell(0).draw(pi, x, y);
-       drawMarkers2(pi, x + 1, y);
+       drawMarkers(pi, x, y);
 }