further code uglification to make Jean-Marc's compiler happy

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

diff --git a/src/mathed/math_spaceinset.C b/src/mathed/math_spaceinset.C
index 6ddc32d9d4f0020d57652c9e3f6defcbfe03e12b..46408f177e2f8e6e49c3d6c8a0ab2dfbf39f7960 100644 (file)
--- a/src/mathed/math_spaceinset.C
+++ b/src/mathed/math_spaceinset.C
@@ -1,28 +1,27 @@
-#include <config.h>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "math_spaceinset.h"
+#include "support.h"
 #include "LColor.h"
 #include "Painter.h"
-#include "mathed/support.h"
 #include "support/LOstream.h"
 
 
-MathSpaceInset::MathSpaceInset(int sp, short ot)
-       : MathInset("", ot), space_(sp)
+
+MathSpaceInset::MathSpaceInset(int sp)
+       : space_(sp)
 {}
 
 
-MathInset * MathSpaceInset::Clone() const
+MathInset * MathSpaceInset::clone() const
 {
        return new MathSpaceInset(*this);
 }
 
 
-void MathSpaceInset::draw(Painter & pain, int x, int y)
+void MathSpaceInset::draw(Painter & pain, int x, int y) const
 { 
        
 // XPoint p[4] = {{++x, y-3}, {x, y}, {x+width-2, y}, {x+width-2, y-3}};
@@ -37,46 +36,38 @@ void MathSpaceInset::draw(Painter & pain, int x, int y)
        xp[2] = x + width_ - 2;  yp[2] = y;
        xp[3] = x + width_ - 2;  yp[3] = y - 3;
        
-       pain.lines(xp, yp, 4, (space_) ? LColor::latex : LColor::math);
+       pain.lines(xp, yp, 4, space_ ? LColor::latex : LColor::math);
 }
 
 
-void MathSpaceInset::Write(std::ostream & os, bool /* fragile */) const
+void MathSpaceInset::write(std::ostream & os, bool /* fragile */) const
 {
-       if (space_ >= 0 && space_ < 6) {
+       if (space_ >= 0 && space_ < 6)
                os << '\\' << latex_mathspace[space_] << ' ';
-       }
 }
 
 
-void MathSpaceInset::WriteNormal(std::ostream & os) const
+void MathSpaceInset::writeNormal(std::ostream & os) const
 {
        os << "[space " << space_ << "] ";
 }
 
 
-void MathSpaceInset::Metrics(MathStyles st)
+void MathSpaceInset::metrics(MathStyles st) const
 {
-       size_ = st;
+       size_  = st;
        width_ = space_ ? space_ * 2 : 2;
        if (space_ > 3)
                width_ *= 2;
        if (space_ == 5)
                width_ *= 2;
-       width_ += 4;
-       ascent_ = 4;
+       width_  += 4;
+       ascent_  = 4;
        descent_ = 0;
 }
 
 
-void MathSpaceInset::SetSpace(int sp)
-{ 
-       space_ = sp;
-       Metrics(size_);
-}
-
-
-int MathSpaceInset::GetSpace()
+void MathSpaceInset::incSpace()
 {
-       return space_;
+       space_ = (space_ + 1) % 6;
 }