From 5003f644ac4f0b3ac6cfcf0174363647af0011d2 Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Thu, 7 Dec 2017 06:52:42 +0100
Subject: [PATCH] SideDiffEditorWidget: Fix Clang semantic warnings

Change-Id: I0f92993aa6152836237f7429c66761c22692075d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/diffeditor/sidebysidediffeditorwidget.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index 7a8501d8a7..cdaad44d0b 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -396,10 +396,10 @@ void SideDiffEditorWidget::paintSeparator(QPainter &painter,
 
     const QString replacementText = " {" + foldReplacementText(block) + "}; ";
     const int replacementTextWidth = fontMetrics().width(replacementText) + 24;
-    int x = replacementTextWidth + offset.x();
+    int x = replacementTextWidth + int(offset.x());
     if (x < document()->documentMargin()
             || !TextDocumentLayout::isFolded(block)) {
-        x = document()->documentMargin();
+        x = int(document()->documentMargin());
     }
     const QString elidedText = fontMetrics().elidedText(text,
                                                         Qt::ElideRight,
-- 
GitLab