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

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

diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C
index 9b662a8792104104f7063e65d36be637e50e0813..56c5cb9c42bedad6c5ce0b2d45db04c25f37d544 100644 (file)
--- a/src/mathed/math_macro.C
+++ b/src/mathed/math_macro.C
@@ -72,7 +72,7 @@ void MathMacro::metrics(MathStyles st) const
                int lwid;
                mathed_string_dim(LM_TC_TEXTRM, size_, "#1: ", lasc, ldes, lwid);
 
-               for (int i = 0; i < nargs(); ++i) {
+               for (unsigned int i = 0; i < nargs(); ++i) {
                        MathXArray const & c = xcell(i);
                        c.metrics(st);
                        width_    = std::max(width_, c.width() + lwid);
@@ -98,7 +98,7 @@ void MathMacro::draw(Painter & pain, int x, int y) const
 
        metrics(size());
 
-       LColor::color col;
+       //LColor::color col;
 
        if (mathcursor && mathcursor->isInside(this)) {
 
@@ -114,7 +114,7 @@ void MathMacro::draw(Painter & pain, int x, int y) const
                int lwid;
                mathed_string_dim(LM_TC_TEXTRM, size_, "#1: ", lasc, ldes, lwid);
 
-               for (int i = 0; i < nargs(); ++i) {
+               for (unsigned int i = 0; i < nargs(); ++i) {
                        MathXArray const & c = xcell(i);
                        h += std::max(c.ascent(), lasc) + 5;
                        c.draw(pain, x + lwid, h);
@@ -123,10 +123,10 @@ void MathMacro::draw(Painter & pain, int x, int y) const
                        drawStr(pain, LM_TC_TEX, size(), x + 3, h, str);
                        h += std::max(c.descent(), ldes) + 5;
                }
-               col = LColor::red;
+               //col = LColor::red;
        } else {
                expanded_.draw(pain, x + 3, y);
-               col = LColor::black;
+               //col = LColor::black;
        }
 
        //if (nargs() > 0)
@@ -134,20 +134,20 @@ void MathMacro::draw(Painter & pain, int x, int y) const
 }
 
 
-void MathMacro::dump(std::ostream & os) const
+void MathMacro::dump() const
 {
        MathMacroTable::dump();
-       os << "\n macro: '" << this << "'\n";
-       os << " name: '" << name() << "'\n";
-       os << " template: '" << tmplate_ << "'\n";
-       os << " template: '" << *tmplate_ << "'\n";
-       os << endl;
+       lyxerr << "\n macro: '" << this << "'\n";
+       lyxerr << " name: '" << name() << "'\n";
+       lyxerr << " template: '" << tmplate_ << "'\n";
+       lyxerr << " template: '" << *tmplate_ << "'\n";
+       lyxerr << endl;
 }
 
 void MathMacro::write(std::ostream & os, bool fragile) const
 {
        os << '\\' << name();
-       for (int i = 0; i < nargs(); ++i) {
+       for (unsigned int i = 0; i < nargs(); ++i) {
                os << '{';
                cell(i).write(os, fragile);
                os << '}';
@@ -160,7 +160,7 @@ void MathMacro::write(std::ostream & os, bool fragile) const
 void MathMacro::writeNormal(std::ostream & os) const
 {
        os << "[macro " << name() << " ";
-       for (int i = 0; i < nargs(); ++i) {
+       for (unsigned int i = 0; i < nargs(); ++i) {
                cell(i).writeNormal(os);
                os << ' ';
        }
@@ -168,25 +168,25 @@ void MathMacro::writeNormal(std::ostream & os) const
 }
 
 
-bool MathMacro::idxUp(int & idx, int & pos) const
+bool MathMacro::idxUp(unsigned int & idx, unsigned int & pos) const
 {
        return MathNestInset::idxLeft(idx, pos);
 }
 
 
-bool MathMacro::idxDown(int & idx, int & pos) const
+bool MathMacro::idxDown(unsigned int & idx, unsigned int & pos) const
 {
        return MathNestInset::idxRight(idx, pos);
 }
 
 
-bool MathMacro::idxLeft(int &, int &) const
+bool MathMacro::idxLeft(unsigned int &, unsigned int &) const
 {
        return false;
 }
 
 
-bool MathMacro::idxRight(int &, int &) const
+bool MathMacro::idxRight(unsigned int &, unsigned int &) const
 {
        return false;
 }