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/qmljseditor/qmljssemantichighlighter.cpp

@@ -270,11 +270,10 @@ protected:
 
     bool visit(UiObjectDefinition *ast)
     {
-        if (m_scopeChain.document()->bind()->isGroupedPropertyBinding(ast)) {
+        if (m_scopeChain.document()->bind()->isGroupedPropertyBinding(ast))
             processBindingName(ast->qualifiedTypeNameId);
-        } else {
+        else
             processTypeId(ast->qualifiedTypeNameId);
-        }
         scopedAccept(ast, ast->initializer);
         return false;
     }
@@ -342,9 +341,8 @@ protected:
             return false;
 
         const QString &value = ast->value.toString();
-        if (m_stateNames.contains(value)) {
+        if (m_stateNames.contains(value))
             addUse(ast->literalToken, SemanticHighlighter::LocalStateNameType);
-        }
 
         return false;
     }