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/qmldesigner/components/integration/componentview.cpp

@@ -154,11 +154,10 @@ void ComponentView::searchForComponentAndAddToList(const ModelNode &node)
                 QString description;
                 ModelNode parentNode = node.parentProperty().parentModelNode();
                 if (parentNode.isValid()) {
-                    if (parentNode.id().isEmpty()) {
+                    if (parentNode.id().isEmpty())
                         description = parentNode.simplifiedTypeName() + QLatin1Char(' ');
-                    } else {
+                    else
                         description = parentNode.id() + QLatin1Char(' ');
-                    }
                 }
                 description += node.parentProperty().name();
                 QStandardItem *item = new QStandardItem(description);
@@ -183,9 +182,8 @@ void ComponentView::searchForComponentAndRemoveFromList(const ModelNode &node)
 
 
     foreach (const ModelNode &childNode, nodeList) {
-        if (childNode.nodeSourceType() == ModelNode::NodeWithComponentSource) {
+        if (childNode.nodeSourceType() == ModelNode::NodeWithComponentSource)
             removeSingleNodeFromList(childNode);
-        }
     }
 }