Braces cleanup

Change-Id: I8413252c90a1487d291f15d92837c30ab697b245
Reviewed-by: hjk <hjk121@nokiamail.com>

4 files changed, 12 insertions, 20 deletions

diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp
index 6bbf6cfbef..0cab237c1c 100644
--- a/src/plugins/diffeditor/diffeditorplugin.cpp
+++ b/src/plugins/diffeditor/diffeditorplugin.cpp
@@ -128,9 +128,8 @@ void DiffEditorPlugin::diff()
 QString DiffEditorPlugin::getFileContents(const QString &fileName, QTextCodec *codec) const
 {
     QFile file(fileName);
-    if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+    if (file.open(QIODevice::ReadOnly | QIODevice::Text))
         return codec->toUnicode(file.readAll());
-    }
     return QString();
 }
 
diff --git a/src/plugins/diffeditor/diffeditorwidget.cpp b/src/plugins/diffeditor/diffeditorwidget.cpp
index 7146b6099d..ede54a4425 100644
--- a/src/plugins/diffeditor/diffeditorwidget.cpp
+++ b/src/plugins/diffeditor/diffeditorwidget.cpp
@@ -1051,11 +1051,10 @@ ChunkData DiffEditorWidget::calculateOriginalData(const QList<Diff> &diffList) c
         const QStringList lines = diff.text.split(QLatin1Char('\n'));
 
         const bool equal = isEqual(diffList, i);
-        if (diff.command == Diff::Insert) {
+        if (diff.command == Diff::Insert)
             lastRightLineEqual = lastRightLineEqual && equal;
-        } else if (diff.command == Diff::Delete) {
+        else if (diff.command == Diff::Delete)
             lastLeftLineEqual = lastLeftLineEqual && equal;
-        }
 
         const int lastLeftPos = currentLeftPos;
         const int lastRightPos = currentRightPos;
diff --git a/src/plugins/diffeditor/differ.cpp b/src/plugins/diffeditor/differ.cpp
index 5a30d9fe5b..f8b034efbb 100644
--- a/src/plugins/diffeditor/differ.cpp
+++ b/src/plugins/diffeditor/differ.cpp
@@ -405,11 +405,10 @@ QList<Diff> Differ::diffMyers(const QString &text1, const QString &text2)
              k <= qMin(d, kMaxForward - qAbs(d + kMaxForward) % 2);
              k = k + 2) {
             int x;
-            if (k == -d || (k < d && forwardV[k + vShift - 1] < forwardV[k + vShift + 1])) {
+            if (k == -d || (k < d && forwardV[k + vShift - 1] < forwardV[k + vShift + 1]))
                 x = forwardV[k + vShift + 1]; // copy vertically from diagonal k + 1, y increases, y may exceed the graph
-            } else {
+            else
                 x = forwardV[k + vShift - 1] + 1; // copy horizontally from diagonal k - 1, x increases, x may exceed the graph
-            }
             int y = x - k;
 
             if (x > n) {
@@ -441,11 +440,10 @@ QList<Diff> Differ::diffMyers(const QString &text1, const QString &text2)
              k <= qMin(d, kMaxReverse - qAbs(d + kMaxReverse) % 2);
              k = k + 2) {
             int x;
-            if (k == -d || (k < d && reverseV[k + vShift - 1] < reverseV[k + vShift + 1])) {
+            if (k == -d || (k < d && reverseV[k + vShift - 1] < reverseV[k + vShift + 1]))
                 x = reverseV[k + vShift + 1];
-            } else {
+            else
                 x = reverseV[k + vShift - 1] + 1;
-            }
             int y = x - k;
 
             if (x > n) {
@@ -559,9 +557,8 @@ int Differ::findSubtextEnd(const QString &text,
 {
     if (m_currentDiffMode == Differ::LineMode) {
         int subtextEnd = text.indexOf(QLatin1Char('\n'), subtextStart);
-        if (subtextEnd == -1) {
+        if (subtextEnd == -1)
             subtextEnd = text.count() - 1;
-        }
         return ++subtextEnd;
     } else if (m_currentDiffMode == Differ::WordMode) {
         if (!text.at(subtextStart).isLetter())
@@ -732,9 +729,8 @@ QList<Diff> Differ::cleanupSemantics(const QList<Diff> &diffList)
             }
             equalitiesToBeSplit.insert(data.equalityIndex, true);
             equalities.removeAt(i);
-            if (i > 0) {
+            if (i > 0)
                 i--; // reexamine previous equality
-            }
         } else {
             i++;
         }
@@ -807,9 +803,8 @@ QList<Diff> Differ::cleanupSemanticsLossless(const QList<Diff> &diffList)
             thisDiff.text = bestEdit;
             nextDiff.text = bestEquality2;
 
-            if (!bestEquality1.isEmpty()) {
+            if (!bestEquality1.isEmpty())
                 newDiffList.append(prevDiff); // append modified equality1
-            }
             if (bestEquality2.isEmpty()) {
                 i++;
                 if (i < diffList.count())
diff --git a/src/plugins/diffeditor/diffshoweditor.cpp b/src/plugins/diffeditor/diffshoweditor.cpp
index 3cc595f902..cee56cb306 100644
--- a/src/plugins/diffeditor/diffshoweditor.cpp
+++ b/src/plugins/diffeditor/diffshoweditor.cpp
@@ -163,11 +163,10 @@ QWidget *DiffShowEditor::toolBar()
 
 void DiffShowEditor::setDescriptionVisible(bool visible)
 {
-    if (visible) {
+    if (visible)
         m_toggleDescriptionButton->setToolTip(tr("Hide Change Description"));
-    } else {
+    else
         m_toggleDescriptionButton->setToolTip(tr("Show Change Description"));
-    }
     m_diffShowWidget->setVisible(visible);
 }