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/textfileformat.cpp

@@ -103,13 +103,12 @@ TextFileFormat TextFileFormat::detect(const QByteArray &data)
     }
     // end code taken from qtextstream
     const int newLinePos = data.indexOf('\n');
-    if (newLinePos == -1) {
+    if (newLinePos == -1)
         result.lineTerminationMode = NativeLineTerminator;
-    } else if (newLinePos == 0) {
+    else if (newLinePos == 0)
         result.lineTerminationMode = LFLineTerminator;
-    } else {
+    else
         result.lineTerminationMode = data.at(newLinePos - 1) == '\r' ? CRLFLineTerminator : LFLineTerminator;
-    }
     return result;
 }
 
@@ -286,11 +285,10 @@ bool TextFileFormat::writeFile(const QString &fileName, QString plainText, QStri
     // let QFile do the work, else manually add.
     QIODevice::OpenMode fileMode = QIODevice::NotOpen;
     if (lineTerminationMode == CRLFLineTerminator) {
-        if (NativeLineTerminator == CRLFLineTerminator) {
+        if (NativeLineTerminator == CRLFLineTerminator)
             fileMode |= QIODevice::Text;
-        } else {
+        else
             plainText.replace(QLatin1Char('\n'), QLatin1String("\r\n"));
-        }
     }
 
     Utils::FileSaver saver(fileName, fileMode);