[LyX/master] Squash some warnings.

[Richard Heck]

commit bc1672f6a0fc8ae64f7938cf2905071987bcb138
Author: Richard Heck <rgh...@lyx.org>
Date:   Sat Jul 2 14:12:34 2016 -0400

    Squash some warnings.
---
 src/Changes.cpp             |    7 ++++---
 src/RowPainter.cpp          |    3 ++-
 src/insets/InsetCaption.cpp |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Changes.cpp b/src/Changes.cpp
index 97596b4..d83d782 100644
--- a/src/Changes.cpp
+++ b/src/Changes.cpp
@@ -558,8 +558,8 @@ void Change::paintCue(PainterInfo & pi, double const x1, 
double const y,
                return;
        // Calculate 1/3 height of font
        FontMetrics const & fm = theFontMetrics(font);
-       int const y_bar = deleted() ? y - fm.maxAscent() / 3
-               : y + 2 * pi.base.solidLineOffset() + 
pi.base.solidLineThickness();
+       int const y_bar = int(deleted() ? y - fm.maxAscent() / 3
+               : y + 2 * pi.base.solidLineOffset() + 
pi.base.solidLineThickness());
        pi.pain.line(int(x1), y_bar, int(x2), y_bar, color(),
                     Painter::line_solid, pi.base.solidLineThickness());
 }
@@ -588,7 +588,8 @@ void Change::paintCue(PainterInfo & pi, double const x1, 
double const y1,
                y = y1;
                break;
        }
-       pi.pain.line(x1, y2, x2, y, color(), Painter::line_solid,
+       pi.pain.line(int(x1), int(y2), int(x2), int(y), 
+                    color(), Painter::line_solid,
                     pi.base.solidLineThickness());
 }
 
diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index a50d8f8..d6caa26 100644
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -204,7 +204,8 @@ void RowPainter::paintMisspelledMark(Row::Element const & 
e) const
                if (x1 > x2)
                        swap(x1, x2);
 
-               pi_.pain.line(x_ + x1, y, x_ + x2, y, Color_error,
+               pi_.pain.line(int(x_ + x1), y, int(x_ + x2), y, 
+                             Color_error,
                              Painter::line_onoffdash, thickness);
                pos = range.last + 1;
        }
diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index fbb55fc..05b7dc7 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -302,7 +302,7 @@ docstring InsetCaption::xhtml(XHTMLStream & xs, 
OutputParams const & rp) const
                string const our_class = "float-caption-" + type_;
                size_t const loc = attr.find("class='");
                if (loc != string::npos)
-                       attr.insert(loc + 7, our_class+ " ");
+                       attr.insert(loc + 7, our_class + " ");
                else
                        attr = attr + " class='" + our_class + "'";
        }