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/projectexplorer/taskwindow.cpp

@@ -384,11 +384,10 @@ void TaskWindow::setCategoryVisibility(const Core::Id &categoryId, bool visible)
 
     QList<Core::Id> categories = d->m_filter->filteredCategories();
 
-    if (visible) {
+    if (visible)
         categories.removeOne(categoryId);
-    } else {
+    else
         categories.append(categoryId);
-    }
 
     d->m_filter->setFilteredCategories(categories);
 
@@ -612,9 +611,8 @@ void TaskWindow::setFocus()
 {
     if (d->m_filter->rowCount()) {
         d->m_listview->setFocus();
-        if (d->m_listview->currentIndex() == QModelIndex()) {
+        if (d->m_listview->currentIndex() == QModelIndex())
             d->m_listview->setCurrentIndex(d->m_filter->index(0,0, QModelIndex()));
-        }
     }
 }