r37919 - lyx-devel/trunk/src

[vfr]

Author: vfr
Date: Sun Mar 13 22:06:16 2011
New Revision: 37919
URL: http://www.lyx.org/trac/changeset/37919

Log:
*rowpainter.cpp: Squeeze warnings.

Modified:
   lyx-devel/trunk/src/rowpainter.cpp

Modified: lyx-devel/trunk/src/rowpainter.cpp
==============================================================================
--- lyx-devel/trunk/src/rowpainter.cpp  Sun Mar 13 21:29:52 2011        (r37918)
+++ lyx-devel/trunk/src/rowpainter.cpp  Sun Mar 13 22:06:16 2011        (r37919)
@@ -378,10 +378,10 @@
 {
        // if changed the misspelled marker gets placed slightly lower than 
normal
        // to avoid drawing at the same vertical offset
-       int const y = yo_ + solid_line_offset_ + solid_line_thickness_
+       float const y = yo_ + solid_line_offset_ + solid_line_thickness_
                + (changed ? solid_line_thickness_ + 1 : 0)
                + dotted_line_offset_;
-       pi_.pain.line(int(orig_x), y, int(x_), y, Color_error,
+       pi_.pain.line(int(orig_x), int(y), int(x_), int(y), Color_error,
                Painter::line_onoffdash, dotted_line_thickness_);
 }
 
@@ -893,9 +893,9 @@
                        // Calculate 1/3 height of the buffer's default font
                        FontMetrics const & fm
                                = 
theFontMetrics(pi_.base.bv->buffer().params().getFont());
-                       int const y_bar = change_running.deleted() ?
+                       float const y_bar = change_running.deleted() ?
                                yo_ - fm.maxAscent() / 3 : yo_ + 2 * 
solid_line_offset_ + solid_line_thickness_;
-                       pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
+                       pi_.pain.line(change_last_x, int(y_bar), int(x_), 
int(y_bar),
                                change_running.color(), Painter::line_solid, 
solid_line_thickness_);
 
                        // Change might continue with a different author or type
@@ -953,9 +953,9 @@
        if (change_running.changed()) {
                FontMetrics const & fm
                        = 
theFontMetrics(pi_.base.bv->buffer().params().getFont());
-               int const y_bar = change_running.deleted() ?
+               float const y_bar = change_running.deleted() ?
                                yo_ - fm.maxAscent() / 3 : yo_ + 2 * 
solid_line_offset_ + solid_line_thickness_;
-               pi_.pain.line(change_last_x, y_bar, int(x_), y_bar,
+               pi_.pain.line(change_last_x, int(y_bar), int(x_), int(y_bar),
                        change_running.color(), Painter::line_solid, 
solid_line_thickness_);
                change_running.setUnchanged();
        }