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/texteditor/basefilefind.cpp

@@ -104,9 +104,8 @@ QStringList BaseFileFind::fileNameFilters() const
         const QStringList parts = m_filterCombo->currentText().split(QLatin1Char(','));
         foreach (const QString &part, parts) {
             const QString filter = part.trimmed();
-            if (!filter.isEmpty()) {
+            if (!filter.isEmpty())
                 filters << filter;
-            }
         }
     }
     return filters;
@@ -280,11 +279,10 @@ void BaseFileFind::updateComboEntries(QComboBox *combo, bool onTop)
 {
     int index = combo->findText(combo->currentText());
     if (index < 0) {
-        if (onTop) {
+        if (onTop)
             combo->insertItem(0, combo->currentText());
-        } else {
+        else
             combo->addItem(combo->currentText());
-        }
         combo->setCurrentIndex(combo->findText(combo->currentText()));
     }
 }