* src/inset/InsetNomencl.cpp:

[lyx.git] / src / Row.cpp

diff --git a/src/Row.cpp b/src/Row.cpp
index c965210e7a1c258494a2f8af0a2c3e20bd65d2d7..975940310c41b346b90342597a8c907b81190e34 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -17,34 +17,34 @@
 #include <config.h>
 
 #include "Row.h"
-#include "debug.h"
+
+#include "support/debug.h"
 
 
 namespace lyx {
 
 
 Row::Row()
-       : separator(0), hfill(0), label_hfill(0), x(0),
+       : separator(0), label_hfill(0), x(0),
        sel_beg(-1), sel_end(-1), changed_(false), crc_(0), pos_(0), end_(0)
 {}
 
 
 Row::Row(pos_type pos)
-       : separator(0), hfill(0), label_hfill(0), x(0),
+       : separator(0), label_hfill(0), x(0),
        sel_beg(-1), sel_end(-1), changed_(false), crc_(0), pos_(pos), end_(0)
 {}
 
 
-void Row::setCrc(size_type crc)
+void Row::setCrc(size_type crc) const
 {
-       changed_ |= crc != crc_;
+       changed_ = crc != crc_;
        crc_ = crc;
 }
 
 
 void Row::setDimension(Dimension const & dim)
 {
-       changed_ |= dim != dim_;
        dim_ = dim;
 }
 
@@ -61,9 +61,8 @@ void Row::endpos(pos_type p)
 }
 
 
-void Row::setSelection(pos_type beg, pos_type end)
+void Row::setSelection(pos_type beg, pos_type end) const
 {
-       pos_type sel_beg_b = sel_beg;
        if (pos_ >= beg && pos_ <= end)
                sel_beg = pos_;
        else if (beg > pos_ && beg <= end_)
@@ -71,31 +70,21 @@ void Row::setSelection(pos_type beg, pos_type end)
        else
                sel_beg = -1;
 
-       pos_type sel_end_b = sel_end;
        if (end_ >= beg && end_ <= end)
                sel_end = end_;
        else if (end < end_ && end >= pos_)
                sel_end = end;
        else
                sel_end = -1;
-/*
-                       && ((rit->pos() >= beg.pos() && rit->pos() <= end.pos())
-                               || (rit->endpos() >= beg.pos() && rit->endpos() <= end.pos())
-                               || (beg.pos() >= rit->pos() && beg.pos() <= rit->endpos())
-                               || (end.pos() >= rit->pos() && end.pos() <= rit->endpos()));
-*/
-       changed_ |= sel_beg_b != sel_beg;
-       changed_ |= sel_end_b != sel_end;
 }
 
 
 void Row::dump(char const * s) const
 {
-       lyxerr << s << " pos: " << pos_ << " end: " << end_
+       LYXERR0(s << " pos: " << pos_ << " end: " << end_
                << " width: " << dim_.wid
                << " ascent: " << dim_.asc
-               << " descent: " << dim_.des
-               << std::endl;
+               << " descent: " << dim_.des);
 }