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, 4 insertions, 8 deletions

diff --git a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
index b9a0979ee8..3193ec2e90 100644
--- a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
+++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
@@ -312,9 +312,8 @@ QVariant DataModel::data(const QModelIndex &index, int role) const
         return ret;
     }
 
-    if (role == FunctionRole) {
+    if (role == FunctionRole)
         return QVariant::fromValue(func);
-    }
 
     if (role == ParentCostRole) {
         const quint64 totalCost = d->m_data->totalCost(d->m_event);
@@ -326,18 +325,15 @@ QVariant DataModel::data(const QModelIndex &index, int role) const
         const quint64 totalCost = d->m_data->totalCost(d->m_event);
         if (index.column() == SelfCostColumn)
             return double(func->selfCost(d->m_event)) / totalCost;
-        if (index.column() == InclusiveCostColumn) {
+        if (index.column() == InclusiveCostColumn)
             return double(func->inclusiveCost(d->m_event)) / totalCost;
-        }
     }
 
-    if (role == LineNumberRole) {
+    if (role == LineNumberRole)
         return func->lineNumber();
-    }
 
-    if (role == FileNameRole) {
+    if (role == FileNameRole)
         return func->file();
-    }
 
     if (role == Qt::TextAlignmentRole) {
         if (index.column() == CalledColumn)