fix #1073

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

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index 6b6c5f8202ecea8304e6c69e6f5caa273f309072..f19371233c01d1c75ea36eb1b2b5505adb73c4fa 100644 (file)
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -1,8 +1,5 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_charinset.h"
 #include "LColor.h"
@@ -58,17 +55,17 @@ MathInset * MathCharInset::clone() const
 }
 
 
-void MathCharInset::metrics(MathMetricsInfo & mi) const
+void MathCharInset::metrics(MetricsInfo & mi) const
 {
 #if 1
        if (char_ == '=' && has_math_fonts) {
-               MathFontSetChanger dummy(mi.base, "cmr");
+               FontSetChanger dummy(mi.base, "cmr");
                mathed_char_dim(mi.base.font, char_, dim_);
        } else if ((char_ == '>' || char_ == '<') && has_math_fonts) {
-               MathFontSetChanger dummy(mi.base, "cmm");
+               FontSetChanger dummy(mi.base, "cmm");
                mathed_char_dim(mi.base.font, char_, dim_);
        } else if (slanted(char_) && mi.base.fontname == "mathnormal") {
-               MathShapeChanger dummy(mi.base.font, LyXFont::ITALIC_SHAPE);
+               ShapeChanger dummy(mi.base.font, LyXFont::ITALIC_SHAPE);
                mathed_char_dim(mi.base.font, char_, dim_);
        } else {
                mathed_char_dim(mi.base.font, char_, dim_);
@@ -88,7 +85,7 @@ void MathCharInset::metrics(MathMetricsInfo & mi) const
 }
 
 
-void MathCharInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathCharInset::draw(PainterInfo & pi, int x, int y) const
 {
        //lyxerr << "drawing '" << char_ << "' font: " << pi.base.fontname << endl;
        int const em = mathed_char_width(pi.base.font, 'M');
@@ -98,13 +95,13 @@ void MathCharInset::draw(MathPainterInfo & pi, int x, int y) const
                x += static_cast<int>(0.0833*em+0.5);
 #if 1
        if (char_ == '=' && has_math_fonts) {
-               MathFontSetChanger dummy(pi.base, "cmr");
+               FontSetChanger dummy(pi.base, "cmr");
                pi.draw(x, y, char_);
        } else if ((char_ == '>' || char_ == '<') && has_math_fonts) {
-               MathFontSetChanger dummy(pi.base, "cmm");
+               FontSetChanger dummy(pi.base, "cmm");
                pi.draw(x, y, char_);
        } else if (slanted(char_) && pi.base.fontname == "mathnormal") {
-               MathShapeChanger dummy(pi.base.font, LyXFont::ITALIC_SHAPE);
+               ShapeChanger dummy(pi.base.font, LyXFont::ITALIC_SHAPE);
                pi.draw(x, y, char_);
        } else {
                pi.draw(x, y, char_);
@@ -138,11 +135,11 @@ void MathCharInset::write(WriteStream & os) const
 
 void MathCharInset::normalize(NormalStream & os) const
 {
-       os << "[char " << char_ << " " << "mathalpha" << "]";
+       os << "[char " << char_ << ' ' << "mathalpha]";
 }
 
 
-void MathCharInset::octavize(OctaveStream & os) const
+void MathCharInset::octave(OctaveStream & os) const
 {
        os << char_;
 }