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>

src/libs/qmljs/qmljsindenter.cpp

@@ -147,11 +147,10 @@ int QmlJSIndenter::columnForIndex(const QString &t, int index) const
         index = t.length();
 
     for (int i = 0; i < index; i++) {
-        if (t.at(i) == QLatin1Char('\t')) {
+        if (t.at(i) == QLatin1Char('\t'))
             col = ((col / ppHardwareTabSize) + 1) * ppHardwareTabSize;
-        } else {
+        else
             col++;
-        }
     }
     return col;
 }
@@ -288,11 +287,10 @@ int QmlJSIndenter::indentForContinuationLine()
                     delimiters.
                 */
                 if (braceDepth == -1) {
-                    if (j < yyLine->length() - 1) {
+                    if (j < yyLine->length() - 1)
                         hook = j;
-                    } else {
+                    else
                         return 0; // shouldn't happen
-                    }
                 }
                 break;
             case '=':
@@ -587,17 +585,15 @@ int QmlJSIndenter::indentForBottomLine(QTextBlock begin, QTextBlock end, QChar t
             smartly, unless the user has already played around with it,
             in which case it's better to leave her stuff alone.
         */
-        if (isOnlyWhiteSpace(bottomLine)) {
+        if (isOnlyWhiteSpace(bottomLine))
             indent = indentWhenBottomLineStartsInMultiLineComment();
-        } else {
+        else
             indent = indentOfLine(bottomLine);
-        }
     } else {
-        if (isUnfinishedLine()) {
+        if (isUnfinishedLine())
             indent = indentForContinuationLine();
-        } else {
+        else
             indent = indentForStandaloneLine();
-        }
 
         if ((okay(typedIn, QLatin1Char('}')) && firstCh == QLatin1Char('}'))
             || (okay(typedIn, QLatin1Char(']')) && firstCh == QLatin1Char(']'))) {