feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SideDiffEditorWidget: Fix Clang semantic warnings

Browse Source 
Change-Id: I0f92993aa6152836237f7429c66761c22692075d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2017-12-07 06:52:42 +01:00
committed by André Hartmann
parent aae3056b33
commit 5003f644ac
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
View File

@@ -396,10 +396,10 @@ void SideDiffEditorWidget::paintSeparator(QPainter &painter,
const QString replacementText = " {" + foldReplacementText(block) + "}; "; const QString replacementText = " {" + foldReplacementText(block) + "}; ";
const int replacementTextWidth = fontMetrics().width(replacementText) + 24; const int replacementTextWidth = fontMetrics().width(replacementText) + 24;
int x = replacementTextWidth + offset.x(); int x = replacementTextWidth + int(offset.x());
if (x < document()->documentMargin() if (x < document()->documentMargin()
|| !TextDocumentLayout::isFolded(block)) { || !TextDocumentLayout::isFolded(block)) {
x = document()->documentMargin(); x = int(document()->documentMargin());
} }
const QString elidedText = fontMetrics().elidedText(text, const QString elidedText = fontMetrics().elidedText(text,
Qt::ElideRight, Qt::ElideRight,