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/watchutils.cpp

@@ -407,11 +407,10 @@ static void blockRecursion(const CPlusPlus::Overview &overview,
             // the already seen occurrences in a hash.
             const QString name = overview.prettyName(symbol->name());
             SeenHash::iterator it = seenHash->find(name);
-            if (it == seenHash->end()) {
+            if (it == seenHash->end())
                 it = seenHash->insert(name, 0);
-            } else {
+            else
                 ++(it.value());
-            }
             // Is the declaration on or past the current line, that is,
             // the variable not initialized.
             if (symbol->line() >= line)