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/libs/qmljs/qmljslink.cpp

@@ -460,11 +460,10 @@ bool LinkPrivate::importLibrary(Document::Ptr doc,
             // all but no-uri module apis become available for import
             QList<ModuleApiInfo> noUriModuleApis;
             foreach (const ModuleApiInfo &moduleApi, libraryInfo.moduleApis()) {
-                if (moduleApi.uri.isEmpty()) {
+                if (moduleApi.uri.isEmpty())
                     noUriModuleApis += moduleApi;
-                } else {
+                else
                     importableModuleApis[moduleApi.uri] += moduleApi;
-                }
             }
 
             // if a module api has no uri, it shares the same name
@@ -501,9 +500,8 @@ void LinkPrivate::loadQmldirComponents(ObjectValue *import, ComponentVersion ver
                                 const LibraryInfo &libraryInfo, const QString &libraryPath)
 {
     // if the version isn't valid, import the latest
-    if (!version.isValid()) {
+    if (!version.isValid())
         version = ComponentVersion(ComponentVersion::MaxVersion, ComponentVersion::MaxVersion);
-    }
 
 
     QSet<QString> importedTypes;
@@ -535,9 +533,8 @@ void LinkPrivate::loadImplicitDirectoryImports(Imports *imports, Document::Ptr d
         if (directoryImport.object)
             importCache.insert(ImportCacheKey(implcitDirectoryImportInfo), directoryImport);
     }
-    if (directoryImport.object) {
+    if (directoryImport.object)
         imports->append(directoryImport);
-    }
 }
 
 void LinkPrivate::loadImplicitDefaultImports(Imports *imports)