fix #1073

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

diff --git a/src/mathed/math_fontoldinset.C b/src/mathed/math_fontoldinset.C
index 440d8944aba38ad2449892a1a73069146e04407f..11bf5f153c96a0e944f09c263cc30f7517747f35 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"
@@ -28,31 +25,31 @@ MathInset * MathFontOldInset::clone() const
 }
 
 
-void MathFontOldInset::metrics(MathMetricsInfo & mi) const
+void MathFontOldInset::metrics(MetricsInfo & mi) const
 {
-       MathFontSetChanger dummy(mi.base, key_->name.c_str());
-       dim_ = xcell(0).metrics(mi);
+       FontSetChanger dummy(mi.base, key_->name.c_str());
+       dim_ = cell(0).metrics(mi);
        metricsMarkers();
 }
 
 
-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
 {
-       dim_ = xcell(0).metricsT(mi);
+       dim_ = cell(0).metricsT(mi);
 }
 
 
 void MathFontOldInset::drawT(TextPainter & pain, int x, int y) const
 {
-       xcell(0).drawT(pain, x, y);
+       cell(0).drawT(pain, x, y);
 }
 
 
@@ -64,7 +61,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) << ']';
 }