get rid of MSVC warning (signed/unsigned comparison)

[lyx.git] / src / lyxrow.C

diff --git a/src/lyxrow.C b/src/lyxrow.C
index 40adfda74840f3bb25ce44dd84b84cacde57e842..179354bad84b0770f3799ff8075a4a9b6f33696e 100644 (file)
--- a/src/lyxrow.C
+++ b/src/lyxrow.C
@@ -4,8 +4,12 @@
  * Licence details can be found in the file COPYING.
  *
  * \author unknown
+ * \author Lars Gullik Bjønnes
+ * \author John Levon
+ * \author André Pönitz
+ * \author Jürgen Vigna
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
  * Metrics for an on-screen text row.
  */
@@ -15,39 +19,23 @@
 #include "lyxrow.h"
 #include "debug.h"
 
-using lyx::pos_type;
 
-using std::max;
-using std::min;
+namespace lyx {
 
-Row::Row()
-       : pos_(0), end_(0), fill_(0), height_(0), width_(0), y_(0),
-         ascent_of_text_(0), baseline_(0)
-{}
 
-
-Row::Row(pos_type pos)
-       : pos_(pos), end_(0), fill_(0), height_(0), width_(0), y_(0),
-         ascent_of_text_(0), baseline_(0)
+RowMetrics::RowMetrics()
+       : separator(0), hfill(0), label_hfill(0), x(0)
 {}
 
 
-void Row::y(unsigned int newy)
-{
-       y_ = newy;
-}
-
-
-unsigned int Row::y() const
-{
-       return y_;
-}
+Row::Row()
+       : pos_(0), end_(0), ascent_(0), descent_(0), width_(0)
+{}
 
 
-unsigned short Row::height() const
-{
-       return height_;
-}
+Row::Row(pos_type pos)
+       : pos_(pos), end_(0), ascent_(0), descent_(0), width_(0)
+{}
 
 
 void Row::pos(pos_type p)
@@ -62,97 +50,50 @@ pos_type Row::pos() const
 }
 
 
-void Row::end(pos_type p)
+void Row::endpos(pos_type p)
 {
        end_ = p;
 }
 
 
-pos_type Row::end() const
+pos_type Row::endpos() const
 {
        return end_;
 }
 
 
-void Row::fill(int f)
-{
-       fill_ = f;
-}
-
-
-int Row::fill() const
-{
-       return fill_;
-}
-
-
-void Row::height(unsigned short h)
-{
-       height_ = h;
-}
-
-
-void Row::width(unsigned int w)
+void Row::width(int w)
 {
        width_ = w;
 }
 
 
-unsigned int Row::width() const
+int Row::width() const
 {
        return width_;
 }
 
 
-void Row::ascent_of_text(unsigned short a)
-{
-       ascent_of_text_ = a;
-}
-
-
-unsigned short Row::ascent_of_text() const
-{
-       return ascent_of_text_;
-}
-
-
-void Row::top_of_text(unsigned int top)
-{
-       top_of_text_ = top;
-}
-
-
-unsigned int Row::top_of_text() const
-{
-       return top_of_text_;
-}
-
-
-void Row::baseline(unsigned int b)
-{
-       baseline_ = b;
-}
-
-
-unsigned int Row::baseline() const
+void Row::ascent(int b)
 {
-       return baseline_;
+       ascent_ = b;
 }
 
 
-bool Row::isParStart() const
+int Row::ascent() const
 {
-       return !pos();
+       return ascent_;
 }
 
 
 void Row::dump(const char * s) const
 {
-       lyxerr << s << " pos: " << pos_ << " width: " << width_
-               << " height: " << height_
-               << " fill: " << fill_
-               << " ascent_of_text: " << ascent_of_text_
-               << " top_of_text: " << top_of_text_
-               << " y: " << y_ << std::endl;
+       lyxerr << s << " pos: " << pos_ << " end: " << end_
+               << " width: " << width_
+               << " ascent: " << ascent_
+               << " descent: " << descent_
+               << std::endl;
 }
 
+
+} // namespace lyx