small cleanup, doxygen, formatting changes

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

diff --git a/src/mathed/math_sqrtinset.C b/src/mathed/math_sqrtinset.C
index 388c4711d6a40eeac3e578c4b169d33308497a42..fb29a477e6cf1c94798d6dff88448207db1752ce 100644 (file)
--- a/src/mathed/math_sqrtinset.C
+++ b/src/mathed/math_sqrtinset.C
@@ -17,33 +17,34 @@ MathedInset * MathSqrtInset::Clone()
 {   
        MathSqrtInset * p = new MathSqrtInset(GetStyle());
        MathedIter it(array);
-       p->SetData(it.Copy());
+       p->setData(it.Copy());
        return p;
 }
 
 
 bool MathSqrtInset::Inside(int x, int y) 
 {
-       return x >= xo - hmax
-               && x <= xo + width - hmax
-               && y <= yo + descent
-               && y >= yo - ascent;
+       return x >= xo() - hmax_
+               && x <= xo() + width - hmax_
+               && y <= yo() + descent
+               && y >= yo() - ascent;
 }
 
 
 void
 MathSqrtInset::draw(Painter & pain, int x, int y)
 { 
-       MathParInset::draw(pain, x + hmax + 2, y); 
-       int h = ascent;
-       int d = descent;
-       int h2 = Height() / 2;
-       int w2 = (Height() > 4 * hmax) ? hmax : hmax / 2; 
-       int xp[4], yp[4];
-       xp[0] = x + hmax + wbody; yp[0] = y - h;
-       xp[1] = x + hmax;         yp[1] = y - h;
-       xp[2] = x + w2;           yp[2] = y + d;
-       xp[3] = x;                yp[3] = y + d - h2;
+       MathParInset::draw(pain, x + hmax_ + 2, y); 
+       int const h = ascent;
+       int const d = descent;
+       int const h2 = Height() / 2;
+       int const w2 = (Height() > 4 * hmax_) ? hmax_ : hmax_ / 2; 
+       int xp[4];
+       int yp[4];
+       xp[0] = x + hmax_ + wbody_; yp[0] = y - h;
+       xp[1] = x + hmax_;          yp[1] = y - h;
+       xp[2] = x + w2;             yp[2] = y + d;
+       xp[3] = x;                  yp[3] = y + d - h2;
        pain.lines(xp, yp, 4, LColor::mathline);
 }
 
@@ -54,11 +55,12 @@ MathSqrtInset::Metrics()
        MathParInset::Metrics();
        ascent += 4;
        descent += 2;
-       int a, b;
-       hmax = mathed_char_height(LM_TC_VAR, size, 'I', a, b);
-       if (hmax < 10) hmax = 10;
-       wbody = width + 4;
-       width += hmax + 4;
+       int a;
+       int b;
+       hmax_ = mathed_char_height(LM_TC_VAR, size(), 'I', a, b);
+       if (hmax_ < 10) hmax_ = 10;
+       wbody_ = width + 4;
+       width += hmax_ + 4;
 }