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>

6 files changed, 12 insertions, 23 deletions

diff --git a/src/plugins/valgrind/callgrind/callgrindcallmodel.cpp b/src/plugins/valgrind/callgrind/callgrindcallmodel.cpp
index 6e299bc931..eececba9dc 100644
--- a/src/plugins/valgrind/callgrind/callgrindcallmodel.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcallmodel.cpp
@@ -188,9 +188,8 @@ QVariant CallModel::data(const QModelIndex &index, int role) const
         return parentCost;
     }
 
-    if (role == FunctionCallRole) {
+    if (role == FunctionCallRole)
         return QVariant::fromValue(call);
-    }
 
     if (role == RelativeTotalCostRole) {
         const quint64 totalCost = d->m_data->totalCost(d->m_event);
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)
diff --git a/src/plugins/valgrind/callgrind/callgrindfunction.cpp b/src/plugins/valgrind/callgrind/callgrindfunction.cpp
index e91610d71a..50fd33bbba 100644
--- a/src/plugins/valgrind/callgrind/callgrindfunction.cpp
+++ b/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()
diff --git a/src/plugins/valgrind/callgrind/callgrindparsedata.cpp b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp
index c8db1fe1f7..1cae230073 100644
--- a/src/plugins/valgrind/callgrind/callgrindparsedata.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp
@@ -137,9 +137,8 @@ void ParseData::Private::addCompressedString(NameLookupTable &lookup, const QStr
 
 void ParseData::Private::cycleDetection()
 {
-    if (m_cycleCacheValid) {
+    if (m_cycleCacheValid)
         return;
-    }
     cleanupFunctionCycles();
     Internal::CycleDetection algorithm(m_q);
     m_cycleCache = algorithm.run(m_functions);
diff --git a/src/plugins/valgrind/callgrind/callgrindparser.cpp b/src/plugins/valgrind/callgrind/callgrindparser.cpp
index 219068490e..1a4f76c783 100644
--- a/src/plugins/valgrind/callgrind/callgrindparser.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindparser.cpp
@@ -537,9 +537,8 @@ void Parser::Private::parseCostItem(const char *begin, const char *end)
         skipSpace(&current, end);
     }
 
-    if (call) {
+    if (call)
         call->setCosts(costItem->costs());
-    }
 
     currentFunction->addCostItem(costItem);
 }
diff --git a/src/plugins/valgrind/callgrind/callgrindproxymodel.cpp b/src/plugins/valgrind/callgrind/callgrindproxymodel.cpp
index 79ce7d7fd6..51fa38ae68 100644
--- a/src/plugins/valgrind/callgrind/callgrindproxymodel.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindproxymodel.cpp
@@ -116,9 +116,8 @@ bool DataProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_
         return false;
 
     // if the filter regexp is a non-empty string, ignore our filters
-    if (!filterRegExp().isEmpty()) {
+    if (!filterRegExp().isEmpty())
         return QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent);
-    }
 
     // check max rows
     if (m_maxRows > 0 && source_row > m_maxRows)
@@ -141,9 +140,8 @@ bool DataProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_
                 break;
             }
         }
-        if (!isValid) {
+        if (!isValid)
             return false;
-        }
     }
 
     // check minimum inclusive costs