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/plugins/debugger/cdb/cdbparsehelpers.cpp

@@ -385,11 +385,10 @@ QString debugByteArray(const QByteArray &a)
             str << "\\r";
             break;
         default:
-            if (uc >=32 && uc < 128) {
+            if (uc >=32 && uc < 128)
                 str << a.at(i);
-            } else {
+            else
                 str << '<' << unsigned(uc) << '>';
-            }
             break;
         }
     }
@@ -614,9 +613,8 @@ DisassemblerLines parseCdbDisassembler(const QList<QByteArray> &a)
             }
             // Determine address of function from the first assembler line after a
             // function header line.
-            if (!functionAddress && disassemblyLine.address) {
+            if (!functionAddress && disassemblyLine.address)
                 functionAddress = disassemblyLine.address - functionOffset;
-            }
             if (functionAddress && disassemblyLine.address)
                 disassemblyLine.offset = disassemblyLine.address - functionAddress;
             disassemblyLine.function = currentFunction;