Remove braces for single lines of conditions

#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/plugins/projectexplorer/targetselector.cpp b/src/plugins/projectexplorer/targetselector.cpp
index cd58c4ca0b..9219eebdbb 100644
--- a/src/plugins/projectexplorer/targetselector.cpp
+++ b/src/plugins/projectexplorer/targetselector.cpp
@@ -259,9 +259,8 @@ void TargetSelector::getControlAt(int x, int y, int *buttonIndex, int *targetInd
     int tx = NAVBUTTON_WIDTH + 3;
     int index;
     for (index = m_startIndex; index < m_targets.size(); ++index) {
-        if (x <= tx) {
+        if (x <= tx)
             break;
-        }
         tx += targetWidth() + 1;
     }
     --index;
@@ -405,11 +404,10 @@ void TargetSelector::paintEvent(QPaintEvent *event)
         bool buildSelected = target.currentSubIndex == 0;
         if (index == m_currentTargetIndex) {
             p.setPen(QColor(255, 255, 255));
-            if (buildSelected) {
+            if (buildSelected)
                 image = m_buildselected;
-            } else {
+            else
                 image = m_runselected;
-            }
         } else {
             p.setPen(Qt::black);
         }