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/qt4projectmanager/qt4buildconfiguration.cpp

@@ -503,11 +503,10 @@ FileName Qt4BuildConfiguration::extractSpecFromArguments(QString *args,
     // if it is the former we need to get the canonical form
     // for the other one we don't need to do anything
     if (parsedSpec.toFileInfo().isRelative()) {
-        if (QFileInfo(directory + QLatin1Char('/') + parsedSpec.toString()).exists()) {
+        if (QFileInfo(directory + QLatin1Char('/') + parsedSpec.toString()).exists())
             parsedSpec = FileName::fromUserInput(directory + QLatin1Char('/') + parsedSpec.toString());
-        } else {
+        else
             parsedSpec = FileName::fromUserInput(baseMkspecDir.toString() + QLatin1Char('/') + parsedSpec.toString());
-        }
     }
 
     QFileInfo f2 = parsedSpec.toFileInfo();
@@ -521,9 +520,8 @@ FileName Qt4BuildConfiguration::extractSpecFromArguments(QString *args,
     } else {
         FileName sourceMkSpecPath = FileName::fromString(version->sourcePath().toString()
                                                          + QLatin1String("/mkspecs"));
-        if (parsedSpec.isChildOf(sourceMkSpecPath)) {
+        if (parsedSpec.isChildOf(sourceMkSpecPath))
             parsedSpec = parsedSpec.relativeChildPath(sourceMkSpecPath);
-        }
     }
     return parsedSpec;
 }