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>

1 files changed, 8 insertions, 14 deletions

diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 30196e5565..016002a8c8 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -856,11 +856,10 @@ QList<ProjectNode::ProjectAction> Qt4PriFileNode::supportedActions(Node *node) c
         // work on a subset of the file types according to project type.
 
         actions << AddNewFile;
-        if (m_recursiveEnumerateFiles.contains(Utils::FileName::fromString(node->path()))) {
+        if (m_recursiveEnumerateFiles.contains(Utils::FileName::fromString(node->path())))
             actions << EraseFile;
-        } else {
+        else
             actions << RemoveFile;
-        }
 
         bool addExistingFiles = true;
         if (node->nodeType() == ProjectExplorer::VirtualFolderNodeType) {
@@ -1530,9 +1529,8 @@ void Qt4ProFileNode::emitProFileUpdatedRecursive()
             emit qt4Watcher->proFileUpdated(this, m_validParse, m_parseInProgress);
 
     foreach (ProjectNode *subNode, subProjectNodes()) {
-        if (Qt4ProFileNode *node = qobject_cast<Qt4ProFileNode *>(subNode)) {
+        if (Qt4ProFileNode *node = qobject_cast<Qt4ProFileNode *>(subNode))
             node->emitProFileUpdatedRecursive();
-        }
     }
 }
 
@@ -1540,9 +1538,8 @@ void Qt4ProFileNode::setParseInProgressRecursive(bool b)
 {
     setParseInProgress(b);
     foreach (ProjectNode *subNode, subProjectNodes()) {
-        if (Qt4ProFileNode *node = qobject_cast<Qt4ProFileNode *>(subNode)) {
+        if (Qt4ProFileNode *node = qobject_cast<Qt4ProFileNode *>(subNode))
             node->setParseInProgressRecursive(b);
-        }
     }
 }
 
@@ -1560,9 +1557,8 @@ void Qt4ProFileNode::setValidParseRecursive(bool b)
 {
     setValidParse(b);
     foreach (ProjectNode *subNode, subProjectNodes()) {
-        if (Qt4ProFileNode *node = qobject_cast<Qt4ProFileNode *>(subNode)) {
+        if (Qt4ProFileNode *node = qobject_cast<Qt4ProFileNode *>(subNode))
             node->setValidParseRecursive(b);
-        }
     }
 }
 
@@ -2041,9 +2037,8 @@ QStringList Qt4ProFileNode::libDirectories(QtSupport::ProFileReader *reader) con
 {
     QStringList result;
     foreach (const QString &str, reader->values(QLatin1String("LIBS"))) {
-        if (str.startsWith(QLatin1String("-L"))) {
+        if (str.startsWith(QLatin1String("-L")))
             result.append(str.mid(2));
-        }
     }
     return result;
 }
@@ -2077,11 +2072,10 @@ QStringList Qt4ProFileNode::subDirsPaths(QtSupport::ProFileReader *reader, QStri
         realDir = info.filePath();
 
         QString realFile;
-        if (info.isDir()) {
+        if (info.isDir())
             realFile = QString::fromLatin1("%1/%2.pro").arg(realDir, info.fileName());
-        } else {
+        else
             realFile = realDir;
-        }
 
         if (QFile::exists(realFile)) {
             realFile = QDir::cleanPath(realFile);