Refactor InsetQuotes.h enums

[lyx.git] / src / Row.cpp

diff --git a/src/Row.cpp b/src/Row.cpp
index 0d92c94199642d1e5e58036b6fa12bf9a50eb9a0..02923d1dd190217a76a2bd329df27749b8db30e0 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -26,8 +26,9 @@
 #include "support/debug.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
-#include "support/lyxalgo.h"
+#include "support/lyxlib.h"
 
+#include <algorithm>
 #include <ostream>
 
 using namespace std;
@@ -161,7 +162,6 @@ pos_type Row::Element::right_pos() const
 
 Row::Row()
        : separator(0), label_hfill(0), left_margin(0), right_margin(0),
-         top_padding(0), bottom_padding(0),
          sel_beg(-1), sel_end(-1),
          begin_margin_sel(false), end_margin_sel(false),
          changed_(true),
@@ -298,7 +298,7 @@ int Row::left_x() const
                x += cit->full_width();
                ++cit;
        }
-       return int(x + 0.5);
+       return support::iround(x);
 }
 
 
@@ -314,7 +314,7 @@ int Row::right_x() const
                else
                        break;
        }
-       return int(x + 0.5);
+       return support::iround(x);
 }