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, 6 deletions

diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp
index 9af51c1367..10e251925b 100644
--- a/src/plugins/git/gerrit/gerritmodel.cpp
+++ b/src/plugins/git/gerrit/gerritmodel.cpp
@@ -354,11 +354,10 @@ void QueryContext::errorTermination(const QString &msg)
 void QueryContext::processError(QProcess::ProcessError e)
 {
     const QString msg = tr("Error running %1: %2").arg(m_binary, m_process.errorString());
-    if (e == QProcess::FailedToStart) {
+    if (e == QProcess::FailedToStart)
         errorTermination(msg);
-    } else {
+    else
         VcsBase::VcsBaseOutputWindow::instance()->appendError(msg);
-    }
 }
 
 void QueryContext::processFinished(int exitCode, QProcess::ExitStatus es)
@@ -413,11 +412,10 @@ void QueryContext::timeout()
     box.exec();
     if (m_process.state() != QProcess::Running)
         return;
-    if (box.clickedButton() == terminateButton) {
+    if (box.clickedButton() == terminateButton)
         Utils::SynchronousProcess::stopProcess(m_process);
-    } else {
+    else
         m_timer.start();
-    }
 }
 
 GerritModel::GerritModel(const QSharedPointer<GerritParameters> &p, QObject *parent)