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, 2 insertions, 3 deletions

diff --git a/src/plugins/vcsbase/submitfieldwidget.cpp b/src/plugins/vcsbase/submitfieldwidget.cpp
index 3bd9f004c9..170c2f5578 100644
--- a/src/plugins/vcsbase/submitfieldwidget.cpp
+++ b/src/plugins/vcsbase/submitfieldwidget.cpp
@@ -344,11 +344,10 @@ void SubmitFieldWidget::slotComboIndexChanged(int comboIndex)
         return;
     // Accept new index or reset combo to previous value?
     int &previousIndex = d->fieldEntries[pos].comboIndex;
-    if (comboIndexChange(pos, comboIndex)) {
+    if (comboIndexChange(pos, comboIndex))
         previousIndex = comboIndex;
-    } else {
+    else
         setComboBlocked(d->fieldEntries.at(pos).combo, previousIndex);
-    }
     if (debug)
         qDebug() << '<' << Q_FUNC_INFO << pos;
 }