small cleanup, doxygen, formatting changes

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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index 9e4bbcaf3a160f4c9d811d0995f8a82d57c7a3ef..0f340feeb222b08dbf1247a19b2a40ea23fa9462 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -6,34 +6,38 @@
 #include "LColor.h"
 #include "Painter.h"
 #include "mathed/support.h"
+#include "support/LOstream.h"
+
+using std::ostream;
 
 
 MathDelimInset::MathDelimInset(int l, int r, short st)
-       : MathParInset(st, "", LM_OT_DELIM), left(l), right(r) {}
+       : MathParInset(st, "", LM_OT_DELIM), left_(l), right_(r) {}
 
 
 MathedInset * MathDelimInset::Clone()
 {   
-       MathDelimInset * p = new MathDelimInset(left, right, GetStyle());
+       MathDelimInset * p = new MathDelimInset(left_, right_, GetStyle());
        MathedIter it(array);
-       p->SetData(it.Copy());
+       p->setData(it.Copy());
        return p;
 }
 
 
-
 void MathDelimInset::Write(ostream & os, bool fragile)
 {
-       latexkeys * l = (left != '|') ? lm_get_key_by_id(left, LM_TK_SYM): 0;
-       latexkeys * r = (right != '|') ? lm_get_key_by_id(right, LM_TK_SYM): 0;
+       latexkeys const * l = (left_ != '|') ?
+               lm_get_key_by_id(left_, LM_TK_SYM) : 0;
+       latexkeys const * r = (right_ != '|') ?
+               lm_get_key_by_id(right_, LM_TK_SYM) : 0;
        os << "\\left";
        if (l) {
                os << '\\' << l->name << ' ';
        } else {
-               if (left == '{' || left == '}') {
-                       os << '\\' << char(left) << ' ';
+               if (left_ == '{' || left_ == '}') {
+                       os << '\\' << char(left_) << ' ';
                } else {
-                       os << char(left) << ' ';
+                       os << char(left_) << ' ';
                }
        }
        MathParInset::Write(os, fragile);
@@ -41,50 +45,50 @@ void MathDelimInset::Write(ostream & os, bool fragile)
        if (r) {
                os << '\\' << r->name << ' ';
        } else {
-               if (right == '{' || right == '}') {
-                       os << '\\' << char(right) << ' ';
+               if (right_ == '{' || right_ == '}') {
+                       os << '\\' << char(right_) << ' ';
                } else {
-                       os << char(right) << ' ';
+                       os << char(right_) << ' ';
                }
        }
 }
 
 
-
 void
 MathDelimInset::draw(Painter & pain, int x, int y)
 { 
-       xo = x;  yo = y; 
-       MathParInset::draw(pain, x + dw + 2, y - dh); 
+       xo(x);
+       yo(y); 
+       MathParInset::draw(pain, x + dw_ + 2, y - dh_); 
        
-       if (left == '.') {
-               pain.line(x + 4, yo - ascent,
-                         x + 4, yo + descent,
+       if (left_ == '.') {
+               pain.line(x + 4, yo() - ascent,
+                         x + 4, yo() + descent,
                          LColor::mathcursor, Painter::line_onoffdash);
        } else
-               mathed_draw_deco(pain, x, y - ascent, dw, Height(), left);
-       x += Width() - dw - 2;
-       if (right == '.') {
-               pain.line(x + 4, yo - ascent,
-                         x + 4, yo + descent,
+               mathed_draw_deco(pain, x, y - ascent, dw_, Height(), left_);
+       x += Width() - dw_ - 2;
+       if (right_ == '.') {
+               pain.line(x + 4, yo() - ascent,
+                         x + 4, yo() + descent,
                          LColor::mathcursor, Painter::line_onoffdash);
        } else
-               mathed_draw_deco(pain, x, y-ascent, dw, Height(), right);
+               mathed_draw_deco(pain, x, y - ascent, dw_, Height(), right_);
 }
 
 
 void
 MathDelimInset::Metrics()
 {
-   MathParInset::Metrics();
-   int d;
-   
-   mathed_char_height(LM_TC_CONST, size, 'I', d, dh);
-   dh /= 2;
-   ascent += 2 + dh;
-   descent += 2 - dh;
-   dw = Height()/5;
-   if (dw > 15) dw = 15;
-   if (dw<6) dw = 6;
-   width += 2*dw+4;
+       MathParInset::Metrics();
+       int d;
+       
+       mathed_char_height(LM_TC_CONST, size(), 'I', d, dh_);
+       dh_ /= 2;
+       ascent += 2 + dh_;
+       descent += 2 - dh_;
+       dw_ = Height()/5;
+       if (dw_ > 15) dw_ = 15;
+       if (dw_ < 6) dw_ = 6;
+       width += 2 * dw_ + 4;
 }