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 aa37571a984822bc667c02cf8e65611b19919e8a..8c603178c846fa3166292c9f1e546636668486f9 100644 (file)
--- a/src/mathed/math_fontoldinset.C
+++ b/src/mathed/math_fontoldinset.C
@@ -1,8 +1,5 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_fontoldinset.h"
 #include "math_mathmlstream.h"
@@ -10,8 +7,10 @@
 #include "math_support.h"
 #include "math_parser.h"
 #include "textpainter.h"
+#include "support/LOstream.h"
 #include "frontends/Painter.h"
 
+using std::auto_ptr;
 
 
 MathFontOldInset::MathFontOldInset(latexkeys const * key)
@@ -21,37 +20,38 @@ 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_ = xcell(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());
-       xcell(0).draw(pi, x + 1, y);
+       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_ = xcell(0).metricsT(mi);
+       cell(0).metricsT(mi, dim);
 }
 
 
 void MathFontOldInset::drawT(TextPainter & pain, int x, int y) const
 {
-       xcell(0).drawT(pain, x, y);
+       cell(0).drawT(pain, x, y);
 }
 
 
@@ -63,7 +63,7 @@ void MathFontOldInset::write(WriteStream & os) const
 
 void MathFontOldInset::normalize(NormalStream & os) const
 {
-       os << "[font " << key_->name << " " << cell(0) << "]";
+       os << "[font " << key_->name << ' ' << cell(0) << ']';
 }