diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-12-07 06:52:42 +0100 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-12-09 14:45:49 +0000 |
| commit | 5003f644ac4f0b3ac6cfcf0174363647af0011d2 (patch) | |
| tree | c2177ce47027824d55a3ca7a989c80e4e6353440 /src/plugins/diffeditor | |
| parent | aae3056b336ae05de72f9a1f3e61eea2006484ba (diff) | |
| download | qt-creator-5003f644ac4f0b3ac6cfcf0174363647af0011d2.tar.gz | |
SideDiffEditorWidget: Fix Clang semantic warnings
Change-Id: I0f92993aa6152836237f7429c66761c22692075d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor')
| -rw-r--r-- | src/plugins/diffeditor/sidebysidediffeditorwidget.cpp | 4 |
1 files 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, |