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/valgrind/callgrind/callgrindfunction.cpp

@@ -201,9 +201,8 @@ QString Function::location() const
 
     if (!f.isEmpty()) {
         QFileInfo info(f);
-        if (info.exists()) {
+        if (info.exists())
             f = info.canonicalFilePath();
-        }
     }
 
     QString o = object();
@@ -287,11 +286,10 @@ void Function::addCostItem(const CostItem *item)
     d->m_costItems.append(item);
 
     // accumulate costs
-    if (item->call()) {
+    if (item->call())
         d->accumulateCost(d->m_inclusiveCost, item->costs());
-    } else {
+    else
         d->accumulateCost(d->m_selfCost, item->costs());
-    }
 }
 
 void Function::finalize()