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/cvs/cvsutils.cpp

@@ -130,11 +130,10 @@ QList<CvsLogEntry> parseLogEntries(const QString &o,
     // Purge out files with no matching commits
     if (!filterCommitId.isEmpty()) {
         for (QList<CvsLogEntry>::iterator it = rc.begin(); it != rc.end(); ) {
-            if (it->revisions.empty()) {
+            if (it->revisions.empty())
                 it = rc.erase(it);
-            } else {
+            else
                 ++it;
-            }
         }
     }
     return rc;
@@ -152,11 +151,10 @@ QString fixDiffOutput(QString d)
         if (endOfLinePos == -1)
             break;
         const int nextLinePos = endOfLinePos + 1;
-        if (d.at(pos) == questionMark) {
+        if (d.at(pos) == questionMark)
             d.remove(pos, nextLinePos - pos);
-        } else {
+        else
             pos = nextLinePos;
-        }
     }
     return d;
 }