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/utils/filenamevalidatinglineedit.cpp

@@ -114,11 +114,10 @@ bool FileNameValidatingLineEdit::validateFileName(const QString &name,
         if (name.contains(QLatin1Char(*c))) {
             if (errorMessage) {
                 const QChar qc = QLatin1Char(*c);
-                if (qc.isSpace()) {
+                if (qc.isSpace())
                     *errorMessage = tr("Name contains white space.");
-                } else {
+                else
                     *errorMessage = tr("Invalid character '%1'.").arg(qc);
-                }
             }
             return false;
         }
@@ -171,17 +170,15 @@ bool FileNameValidatingLineEdit::validateFileNameExtension(const QString &fileNa
     if (!requiredExtensions.isEmpty()) {
         foreach (const QString &requiredExtension, requiredExtensions) {
             QString extension = QLatin1String(".") + requiredExtension;
-            if (fileName.endsWith(extension, Qt::CaseSensitive) && extension.count() < fileName.count()) {
+            if (fileName.endsWith(extension, Qt::CaseSensitive) && extension.count() < fileName.count())
                 return true;
-            }
         }
 
         if (errorMessage) {
-            if (requiredExtensions.count() == 1) {
+            if (requiredExtensions.count() == 1)
                 *errorMessage = tr("File extension %1 is required:").arg(requiredExtensions.first());
-            } else {
+            else
                 *errorMessage = tr("File extensions %1 are required:").arg(requiredExtensions.join(QLatin1String(", ")));
-            }
         }
 
         return false;